Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KLocale changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-23 07:54:40 +03:00
parent 84fc233313
commit e54eac2633
42 changed files with 0 additions and 601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

173
kcontrol/locale/kcmlocale.cpp
View file

@ -74,11 +74,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
connect( m_ui->m_buttonDefaultCountry, SIGNAL( clicked() ), connect( m_ui->m_buttonDefaultCountry, SIGNAL( clicked() ),
this, SLOT( defaultCountry() ) ); this, SLOT( defaultCountry() ) );
connect( m_ui->m_comboCountryDivision, SIGNAL( activated( int ) ),
this, SLOT( changedCountryDivisionIndex( int ) ) );
connect( m_ui->m_buttonDefaultCountryDivision, SIGNAL( clicked() ),
this, SLOT( defaultCountryDivision() ) );
// Translations tab // Translations tab
// User has changed the translations selection in some way // User has changed the translations selection in some way
@ -158,21 +153,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
connect( m_ui->m_buttonDefaultWeekStartDay, SIGNAL( clicked() ), connect( m_ui->m_buttonDefaultWeekStartDay, SIGNAL( clicked() ),
this, SLOT( defaultWeekStartDay() ) ); this, SLOT( defaultWeekStartDay() ) );
connect( m_ui->m_comboWorkingWeekStartDay, SIGNAL( currentIndexChanged( int ) ),
this, SLOT( changedWorkingWeekStartDayIndex( int ) ) );
connect( m_ui->m_buttonDefaultWorkingWeekStartDay, SIGNAL( clicked() ),
this, SLOT( defaultWorkingWeekStartDay() ) );
connect( m_ui->m_comboWorkingWeekEndDay, SIGNAL( currentIndexChanged( int ) ),
this, SLOT( changedWorkingWeekEndDayIndex( int ) ) );
connect( m_ui->m_buttonDefaultWorkingWeekEndDay, SIGNAL( clicked() ),
this, SLOT( defaultWorkingWeekEndDay() ) );
connect( m_ui->m_comboWeekDayOfPray, SIGNAL( currentIndexChanged( int ) ),
this, SLOT( changedWeekDayOfPrayIndex( int ) ) );
connect( m_ui->m_buttonDefaultWeekDayOfPray, SIGNAL( clicked() ),
this, SLOT( defaultWeekDayOfPray() ) );
// Date / Time tab // Date / Time tab
connect( m_ui->m_comboTimeFormat, SIGNAL( editTextChanged( const QString & ) ), connect( m_ui->m_comboTimeFormat, SIGNAL( editTextChanged( const QString & ) ),
@ -443,7 +423,6 @@ void KCMLocale::defaults()
void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KConfig::WriteConfigFlags flags ) void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KConfig::WriteConfigFlags flags )
{ {
copySetting( fromGroup, toGroup, "Country", flags ); copySetting( fromGroup, toGroup, "Country", flags );
copySetting( fromGroup, toGroup, "CountryDivision", flags );
copySetting( fromGroup, toGroup, "Language", flags ); copySetting( fromGroup, toGroup, "Language", flags );
copySetting( fromGroup, toGroup, "DecimalPlaces", flags ); copySetting( fromGroup, toGroup, "DecimalPlaces", flags );
copySetting( fromGroup, toGroup, "DecimalSymbol", flags ); copySetting( fromGroup, toGroup, "DecimalSymbol", flags );
@ -466,9 +445,6 @@ void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KC
copySetting( fromGroup, toGroup, "DateMonthNamePossessive", flags ); copySetting( fromGroup, toGroup, "DateMonthNamePossessive", flags );
copySetting( fromGroup, toGroup, "WeekNumberSystem", flags ); copySetting( fromGroup, toGroup, "WeekNumberSystem", flags );
copySetting( fromGroup, toGroup, "WeekStartDay", flags ); copySetting( fromGroup, toGroup, "WeekStartDay", flags );
copySetting( fromGroup, toGroup, "WorkingWeekStartDay", flags );
copySetting( fromGroup, toGroup, "WorkingWeekEndDay", flags );
copySetting( fromGroup, toGroup, "WeekDayOfPray", flags );
copySetting( fromGroup, toGroup, "DateTimeDigitSet", flags ); copySetting( fromGroup, toGroup, "DateTimeDigitSet", flags );
copySetting( fromGroup, toGroup, "BinaryUnitDialect", flags ); copySetting( fromGroup, toGroup, "BinaryUnitDialect", flags );
copySetting( fromGroup, toGroup, "PageSize", flags ); copySetting( fromGroup, toGroup, "PageSize", flags );
@ -618,7 +594,6 @@ void KCMLocale::initAllWidgets()
//Country tab //Country tab
initCountry(); initCountry();
initCountryDivision();
//Translations tab //Translations tab
initTranslations(); initTranslations();
@ -665,7 +640,6 @@ void KCMLocale::initResetButtons()
//Country tab //Country tab
m_ui->m_buttonDefaultCountry->setGuiItem( defaultItem ); m_ui->m_buttonDefaultCountry->setGuiItem( defaultItem );
m_ui->m_buttonDefaultCountryDivision->setGuiItem( defaultItem );
//Translations tab //Translations tab
m_ui->m_buttonDefaultTranslations->setGuiItem( defaultItem ); m_ui->m_buttonDefaultTranslations->setGuiItem( defaultItem );
@ -685,9 +659,6 @@ void KCMLocale::initResetButtons()
m_ui->m_buttonDefaultShortYearWindow->setGuiItem( defaultItem ); m_ui->m_buttonDefaultShortYearWindow->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWeekNumberSystem->setGuiItem( defaultItem ); m_ui->m_buttonDefaultWeekNumberSystem->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWeekStartDay->setGuiItem( defaultItem ); m_ui->m_buttonDefaultWeekStartDay->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWorkingWeekStartDay->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWorkingWeekEndDay->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWeekDayOfPray->setGuiItem( defaultItem );
//Date/Time tab //Date/Time tab
m_ui->m_buttonDefaultTimeFormat->setGuiItem( defaultItem ); m_ui->m_buttonDefaultTimeFormat->setGuiItem( defaultItem );
@ -1026,44 +997,6 @@ void KCMLocale::setCountry( const QString &newValue )
m_ui->m_comboCountry, m_ui->m_buttonDefaultCountry ); m_ui->m_comboCountry, m_ui->m_buttonDefaultCountry );
} }
void KCMLocale::initCountryDivision()
{
m_ui->m_comboCountryDivision->blockSignals( true );
m_ui->m_labelCountryDivision->setText( ki18n( "Subdivision:" ).toString( m_kcmLocale ) );
QString helpText = ki18n( "<p>This is the country subdivision where you live, e.g. your state "
"or province. The KDE Workspace will use this setting for local "
"information services such as holidays.</p>" ).toString( m_kcmLocale );
m_ui->m_comboCountryDivision->setToolTip( helpText );
m_ui->m_comboCountryDivision->setWhatsThis( helpText );
setCountryDivision( m_kcmSettings.readEntry( "CountryDivision", QString() ) );
m_ui->m_labelCountryDivision->setHidden( true );
m_ui->m_comboCountryDivision->setHidden( true );
m_ui->m_buttonDefaultCountryDivision->setEnabled( false );
m_ui->m_buttonDefaultCountryDivision->setHidden( true );
m_ui->m_comboCountryDivision->blockSignals( false );
}
void KCMLocale::defaultCountryDivision()
{
setCountryDivision( m_defaultSettings.readEntry( "CountryDivision", QString() ) );
}
void KCMLocale::changedCountryDivisionIndex( int index )
{
setCountryDivision( m_ui->m_comboCountryDivision->itemData( index ).toString() );
}
void KCMLocale::setCountryDivision( const QString &newValue )
{
setComboItem( "CountryDivision", newValue,
m_ui->m_comboCountryDivision, m_ui->m_buttonDefaultCountryDivision );
m_kcmLocale->setCountryDivisionCode( m_kcmSettings.readEntry( "CountryDivision", QString() ) );
}
void KCMLocale::initTranslations() void KCMLocale::initTranslations()
{ {
m_ui->m_selectTranslations->blockSignals( true ); m_ui->m_selectTranslations->blockSignals( true );
@ -1541,9 +1474,6 @@ void KCMLocale::setCalendarSystem( const QString &newValue )
initShortYearWindow(); initShortYearWindow();
initWeekNumberSystem(); initWeekNumberSystem();
initWeekStartDay(); initWeekStartDay();
initWorkingWeekStartDay();
initWorkingWeekEndDay();
initWeekDayOfPray();
updateSample(); updateSample();
} }
@ -1730,109 +1660,6 @@ void KCMLocale::setWeekStartDay( int newValue )
m_kcmLocale->setWeekStartDay( m_kcmSettings.readEntry( "WeekStartDay", 0 ) ); m_kcmLocale->setWeekStartDay( m_kcmSettings.readEntry( "WeekStartDay", 0 ) );
} }
void KCMLocale::initWorkingWeekStartDay()
{
m_ui->m_comboWorkingWeekStartDay->blockSignals( true );
m_ui->m_labelWorkingWeekStartDay->setText( ki18n( "First working day of week:" ).toString( m_kcmLocale ) );
QString helpText = ki18n( "<p>This option determines which day will be considered as the first "
"working day of the week.</p>" ).toString( m_kcmLocale );
m_ui->m_comboWorkingWeekStartDay->setToolTip( helpText );
m_ui->m_comboWorkingWeekStartDay->setWhatsThis( helpText );
initWeekDayCombo( m_ui->m_comboWorkingWeekStartDay );
setWorkingWeekStartDay( m_kcmSettings.readEntry( "WorkingWeekStartDay", 0 ) );
m_ui->m_comboWorkingWeekStartDay->blockSignals( false );
}
void KCMLocale::defaultWorkingWeekStartDay()
{
setWorkingWeekStartDay( m_defaultSettings.readEntry( "WorkingWeekStartDay", 0 ) );
}
void KCMLocale::changedWorkingWeekStartDayIndex( int index )
{
setWorkingWeekStartDay( m_ui->m_comboWorkingWeekStartDay->itemData( index ).toInt() );
}
void KCMLocale::setWorkingWeekStartDay( int newValue )
{
setComboItem( "WorkingWeekStartDay", newValue,
m_ui->m_comboWorkingWeekStartDay, m_ui->m_buttonDefaultWorkingWeekStartDay );
m_kcmLocale->setWorkingWeekStartDay( m_kcmSettings.readEntry( "WorkingWeekStartDay", 0 ) );
}
void KCMLocale::initWorkingWeekEndDay()
{
m_ui->m_comboWorkingWeekEndDay->blockSignals( true );
m_ui->m_labelWorkingWeekEndDay->setText( ki18n( "Last working day of week:" ).toString( m_kcmLocale ) );
QString helpText = ki18n( "<p>This option determines which day will be considered as the last "
"working day of the week.</p>" ).toString( m_kcmLocale );
m_ui->m_comboWorkingWeekEndDay->setToolTip( helpText );
m_ui->m_comboWorkingWeekEndDay->setWhatsThis( helpText );
initWeekDayCombo( m_ui->m_comboWorkingWeekEndDay );
setWorkingWeekEndDay( m_kcmSettings.readEntry( "WorkingWeekEndDay", 0 ) );
m_ui->m_comboWorkingWeekEndDay->blockSignals( false );
}
void KCMLocale::defaultWorkingWeekEndDay()
{
setWorkingWeekEndDay( m_defaultSettings.readEntry( "WorkingWeekEndDay", 0 ) );
}
void KCMLocale::changedWorkingWeekEndDayIndex( int index )
{
setWorkingWeekEndDay( m_ui->m_comboWorkingWeekEndDay->itemData( index ).toInt() );
}
void KCMLocale::setWorkingWeekEndDay( int newValue )
{
setComboItem( "WorkingWeekEndDay", newValue,
m_ui->m_comboWorkingWeekEndDay, m_ui->m_buttonDefaultWorkingWeekEndDay );
m_kcmLocale->setWorkingWeekEndDay( m_kcmSettings.readEntry( "WorkingWeekEndDay", 0 ) );
}
void KCMLocale::initWeekDayOfPray()
{
m_ui->m_comboWeekDayOfPray->blockSignals( true );
m_ui->m_labelWeekDayOfPray->setText( ki18n( "Week day for special religious observance:" ).toString( m_kcmLocale ) );
QString helpText = ki18n( "<p>This option determines which day if any will be considered as "
"the day of the week for special religious observance.</p>" ).toString( m_kcmLocale );
m_ui->m_comboWeekDayOfPray->setToolTip( helpText );
m_ui->m_comboWeekDayOfPray->setWhatsThis( helpText );
initWeekDayCombo( m_ui->m_comboWeekDayOfPray );
m_ui->m_comboWeekDayOfPray->insertItem( 0, ki18nc( "Day name list, option for no special day of religious observance", "None / None in particular" ).toString( m_kcmLocale ) );
setWeekDayOfPray( m_kcmSettings.readEntry( "WeekDayOfPray", 0 ) );
m_ui->m_comboWeekDayOfPray->blockSignals( false );
}
void KCMLocale::defaultWeekDayOfPray()
{
setWeekDayOfPray( m_defaultSettings.readEntry( "WeekDayOfPray", 0 ) );
}
void KCMLocale::changedWeekDayOfPrayIndex( int index )
{
setWeekDayOfPray( m_ui->m_comboWeekDayOfPray->itemData( index ).toInt() );
}
void KCMLocale::setWeekDayOfPray( int newValue )
{
setComboItem( "WeekDayOfPray", newValue,
m_ui->m_comboWeekDayOfPray, m_ui->m_buttonDefaultWeekDayOfPray );
m_kcmLocale->setWeekDayOfPray( m_kcmSettings.readEntry( "WeekDayOfPray", 0 ) );
}
void KCMLocale::initTimeFormat() void KCMLocale::initTimeFormat()
{ {
m_ui->m_comboTimeFormat->blockSignals( true ); m_ui->m_comboTimeFormat->blockSignals( true );

24
kcontrol/locale/kcmlocale.h
View file

@ -150,9 +150,6 @@ private:
void initCountry(); void initCountry();
void setCountry( const QString &newValue ); void setCountry( const QString &newValue );
void initCountryDivision();
void setCountryDivision( const QString &newValue );
//Translations/Languages tab //Translations/Languages tab
void initTranslations(); void initTranslations();
@ -198,15 +195,6 @@ private:
void initWeekStartDay(); void initWeekStartDay();
void setWeekStartDay( int newValue ); void setWeekStartDay( int newValue );
void initWorkingWeekStartDay();
void setWorkingWeekStartDay( int newValue );
void initWorkingWeekEndDay();
void setWorkingWeekEndDay( int newValue );
void initWeekDayOfPray();
void setWeekDayOfPray( int newValue );
//Date/Time tab //Date/Time tab
void initTimeFormat(); void initTimeFormat();
@ -247,9 +235,6 @@ private Q_SLOTS:
void defaultCountry(); void defaultCountry();
void changedCountryIndex( int index ); void changedCountryIndex( int index );
void defaultCountryDivision();
void changedCountryDivisionIndex( int index );
//Translations/Languages tab //Translations/Languages tab
void defaultTranslations(); void defaultTranslations();
@ -297,15 +282,6 @@ private Q_SLOTS:
void defaultWeekStartDay(); void defaultWeekStartDay();
void changedWeekStartDayIndex( int index ); void changedWeekStartDayIndex( int index );
void defaultWorkingWeekStartDay();
void changedWorkingWeekStartDayIndex( int index );
void defaultWorkingWeekEndDay();
void changedWorkingWeekEndDayIndex( int index );
void defaultWeekDayOfPray();
void changedWeekDayOfPrayIndex( int index );
//Date/Time tab //Date/Time tab
void defaultTimeFormat(); void defaultTimeFormat();

156
kcontrol/locale/kcmlocalewidget.ui
View file

@ -60,43 +60,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="m_labelCountryDivision">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Subdivision:</string>
</property>
<property name="buddy">
<cstring>m_comboCountryDivision</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_34">
<item>
<widget class="KComboBox" name="m_comboCountryDivision">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_buttonDefaultCountryDivision">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="m_tabTranslations"> <widget class="QWidget" name="m_tabTranslations">
@ -630,123 +593,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="m_labelWorkingWeekStartDay">
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
<property name="text">
<string>First working day of week:</string>
</property>
<property name="buddy">
<cstring>m_comboWorkingWeekStartDay</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="KComboBox" name="m_comboWorkingWeekStartDay">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_buttonDefaultWorkingWeekStartDay"/>
</item>
</layout>
</item>
<item row="6" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<widget class="KComboBox" name="m_comboWorkingWeekEndDay">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_buttonDefaultWorkingWeekEndDay"/>
</item>
</layout>
</item>
<item row="6" column="0">
<widget class="QLabel" name="m_labelWorkingWeekEndDay">
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
<property name="text">
<string>Last working day of week:</string>
</property>
<property name="buddy">
<cstring>m_comboWorkingWeekEndDay</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_26">
<item>
<widget class="KComboBox" name="m_comboWeekDayOfPray">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_buttonDefaultWeekDayOfPray"/>
</item>
</layout>
</item>
<item row="7" column="0">
<widget class="QLabel" name="m_labelWeekDayOfPray">
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
<property name="text">
<string>Week day for special religious observance:</string>
</property>
<property name="buddy">
<cstring>m_comboWeekDayOfPray</cstring>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="m_tabDateTime"> <widget class="QWidget" name="m_tabDateTime">
@ -1265,8 +1111,6 @@
<tabstop>m_tabWidgetSettings</tabstop> <tabstop>m_tabWidgetSettings</tabstop>
<tabstop>m_comboCountry</tabstop> <tabstop>m_comboCountry</tabstop>
<tabstop>m_buttonDefaultCountry</tabstop> <tabstop>m_buttonDefaultCountry</tabstop>
<tabstop>m_comboCountryDivision</tabstop>
<tabstop>m_buttonDefaultCountryDivision</tabstop>
<tabstop>m_buttonDefaultThousandsSeparator</tabstop> <tabstop>m_buttonDefaultThousandsSeparator</tabstop>
<tabstop>m_buttonDefaultDecimalSymbol</tabstop> <tabstop>m_buttonDefaultDecimalSymbol</tabstop>
<tabstop>m_intDecimalPlaces</tabstop> <tabstop>m_intDecimalPlaces</tabstop>

4
l10n/C/entry.desktop
View file

@ -95,7 +95,6 @@ Name[zh_TW]=預設
Region= Region=
Languages=en_US Languages=en_US
NounDeclension=false
LanguageSensitiveDigits=true LanguageSensitiveDigits=true
DecimalPlaces=2 DecimalPlaces=2
@ -114,9 +113,6 @@ DateFormat=%A %d %B %Y
DateFormatShort=%Y-%m-%d DateFormatShort=%Y-%m-%d
DateMonthNamePossessive=false DateMonthNamePossessive=false
WeekStartDay=1 WeekStartDay=1
WorkingWeekStartDay=1
WorkingWeekEndDay=5
WeekDayOfPray=7
WeekNumberSystem=0 WeekNumberSystem=0
DateTimeDigitSet=0 DateTimeDigitSet=0

19
l10n/README
View file

@ -193,25 +193,6 @@ between the entry name and the value.
Default: 1 Default: 1
* WorkingWeekStartDay
This defines which day is the first working day of the week. Accepted
value is an integer number where 1 means Monday, 2 Tuesday, and so on.
Default: 1
* WorkingWeekEndDay
This defines which day is the last working day of the week. Accepted
value is an integer number where 1 means Monday, 2 Tuesday, and so on.
Default: 5
* WeekDayOfPray
This defines which day is the day of the week for religious observance.
Accepted value is an integer number where 1 means Monday, 2 Tuesday,
and so on. A special value of 0 means no day of religious observance.
Default: 7
* MeasureSystem * MeasureSystem
This defines which measure system we should use. There are two This defines which measure system we should use. There are two
values here, 0 for Metric and 1 for Imperial. Metric would give values here, 0 for Metric and 1 for Imperial. Metric would give

3
l10n/af/entry.desktop
View file

@ -101,9 +101,6 @@ Region=centralasia
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
WorkingWeekStartDay=6
WorkingWeekEndDay=4
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/az/entry.desktop
View file

@ -103,7 +103,4 @@ DateFormat[az]=%A %d %B %Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%d-%m-%Y DateFormatShort=%d-%m-%Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/bd/entry.desktop
View file

@ -99,7 +99,4 @@ DateFormatShort=%d/%m/%Y
TimeFormat=%l:%M:%S %p TimeFormat=%l:%M:%S %p
PageSize=0 PageSize=0
MeasureSystem=1 MeasureSystem=1
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/bh/entry.desktop
View file

@ -96,7 +96,4 @@ Region=middleeast
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=7
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/bn/entry.desktop
View file

@ -102,9 +102,6 @@ Languages=ms,zn_CN
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
WorkingWeekStartDay=1
WorkingWeekEndDay=6
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/cn/entry.desktop
View file

@ -106,9 +106,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%Y-%m-%d DateFormatShort=%Y-%m-%d
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
WeekStartDay=1 WeekStartDay=1
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
MeasureSystem=0 MeasureSystem=0
PageSize=0 PageSize=0
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/country.template
View file

@ -15,9 +15,6 @@
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
#WeekDayOfPray=
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#CalendarSystem= #CalendarSystem=

1
l10n/cz/entry.desktop
View file

@ -97,7 +97,6 @@ DateFormat[cs]=%a %e. %B %Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e. %n. %Y DateFormatShort=%e. %n. %Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
NounDeclension=true
DateMonthNamePossessive=true DateMonthNamePossessive=true
AddressFormat=%0(%cm\n)%0(%n\n)%0(p. p. %p\n)%0(%s\n)%z%w%w%l AddressFormat=%0(%cm\n)%0(%n\n)%0(p. p. %p\n)%0(%s\n)%z%w%w%l
AddressCountryPosition=BELOW AddressCountryPosition=BELOW

3
l10n/dj/entry.desktop
View file

@ -96,7 +96,4 @@ Region=northafrica
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=6
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/dz/entry.desktop
View file

@ -96,7 +96,4 @@ Region=northafrica
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=6
WorkingWeekEndDay=3
WeekDayOfPray=7
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/eg/entry.desktop
View file

@ -96,7 +96,4 @@ Region=northafrica
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=6
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/gm/entry.desktop
View file

@ -101,9 +101,6 @@ Languages=en_GB
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=7
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/gn/entry.desktop
View file

@ -101,9 +101,6 @@ Languages=fr
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

1
l10n/gr/entry.desktop
View file

@ -98,7 +98,6 @@ DecimalSymbol=,
ThousandsSeparator=. ThousandsSeparator=.
PositiveSign= PositiveSign=
NegativeSign=- NegativeSign=-
NounDeclension=true
DateMonthNamePossessive=true DateMonthNamePossessive=true
DateFormat[el]=%a %d %b %Y DateFormat[el]=%a %d %b %Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y

3
l10n/gw/entry.desktop
View file

@ -101,9 +101,6 @@ Languages=es
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/hk/entry.desktop
View file

@ -98,9 +98,6 @@ Languages=zh_TW,en_GB
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
PageSize=0 PageSize=0
MeasureSystem=0 MeasureSystem=0
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/id/entry.desktop
View file

@ -102,7 +102,4 @@ DateFormat[id]=%A, %d %B %Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e/%m/%Y DateFormatShort=%e/%m/%Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/il/entry.desktop
View file

@ -104,9 +104,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e/%n/%Y DateFormatShort=%e/%n/%Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
WeekStartDay=7 WeekStartDay=7
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=6
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#Civil calendar is Gregorian, religious is Hebrew #Civil calendar is Gregorian, religious is Hebrew

3
l10n/in/entry.desktop
View file

@ -98,9 +98,6 @@ DateFormat=%A %d %b %Y
DateFormatShort=%d/%m/%Y DateFormatShort=%d/%m/%Y
TimeFormat=%l:%M:%S %p TimeFormat=%l:%M:%S %p
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
PageSize=0 PageSize=0
MeasureSystem=0 MeasureSystem=0
#DecimalPlaces=2 #DecimalPlaces=2

2
l10n/iq/entry.desktop
View file

@ -97,6 +97,4 @@ Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WeekStartDay=7 WeekStartDay=7
WorkingWeekStartDay=4
WorkingWeekEndDay=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/ir/entry.desktop
View file

@ -103,8 +103,5 @@ TimeFormat=%H:%M:%S
MeasureSystem=0 MeasureSystem=0
PageSize=0 PageSize=0
WeekStartDay=6 WeekStartDay=6
WorkingWeekStartDay=6
WorkingWeekEndDay=4
WeekDayOfPray=5
CalendarSystem=jalali CalendarSystem=jalali
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/jo/entry.desktop
View file

@ -96,7 +96,4 @@ Region=middleeast
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/jp/entry.desktop
View file

@ -103,9 +103,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%Y-%m-%d DateFormatShort=%Y-%m-%d
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
WeekStartDay=7 WeekStartDay=7
WorkingWeekStartDay=1
WorkingWeekEndDay=5
WeekDayOfPray=0
PageSize=0 PageSize=0
MeasureSystem=0 MeasureSystem=0
AddressFormat=%0(%z%w%r)%w%l%0(\n%s)%0(\n%cm)%0(\n%n) AddressFormat=%0(%z%w%r)%w%l%0(\n%s)%0(\n%cm)%0(\n%n)

3
l10n/kg/entry.desktop
View file

@ -101,9 +101,6 @@ Languages=ru
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/km/entry.desktop
View file

@ -101,9 +101,6 @@ Languages=fr,ar
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/kp/entry.desktop
View file

@ -96,7 +96,4 @@ DateFormat[ko]=%Y %B %e %A
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
#DateFormatShort= #DateFormatShort=
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/kr/entry.desktop
View file

@ -99,7 +99,4 @@ NegativeSign=-
DateFormat=%Y년 %B %e일 %A DateFormat=%Y년 %B %e일 %A
DateFormatShort=%Y. %n. %e DateFormatShort=%Y. %n. %e
TimeFormat=%p %l:%M:%S TimeFormat=%p %l:%M:%S
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/kw/entry.desktop
View file

@ -96,7 +96,4 @@ Region=middleeast
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/la/entry.desktop
View file

@ -100,9 +100,6 @@ Languages=fr,en
#DateFormatShort= #DateFormatShort=
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=0
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/lb/entry.desktop
View file

@ -96,7 +96,4 @@ Region=middleeast
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
#WorkingWeekStartDay=
#WorkingWeekEndDay=
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/ly/entry.desktop
View file

@ -95,7 +95,4 @@ Region=northafrica
Languages=ar Languages=ar
DecimalSymbol=, DecimalSymbol=,
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
WorkingWeekStartDay=7
WorkingWeekEndDay=4
WeekDayOfPray=5
#DecimalPlaces=2 #DecimalPlaces=2

1
l10n/pl/entry.desktop
View file

@ -102,6 +102,5 @@ DateFormat[pl]=%A, %e %B %Y
DateFormatShort=%d/%m/%Y DateFormatShort=%d/%m/%Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
NounDeclension=true
DateMonthNamePossessive=true DateMonthNamePossessive=true
#DecimalPlaces=2 #DecimalPlaces=2

3
l10n/ps/entry.desktop
View file

@ -98,9 +98,6 @@ ThousandsSeparator=.
DateFormatShort=%y/%m/%d DateFormatShort=%y/%m/%d
#TimeFormat= #TimeFormat=
#WeekStartDay= #WeekStartDay=
WorkingWeekStartDay=6
WorkingWeekEndDay=4
WeekDayOfPray=5
#PageSize= #PageSize=
#MeasureSystem= #MeasureSystem=
#DecimalPlaces=2 #DecimalPlaces=2

2
l10n/si/entry.desktop
View file

@ -103,8 +103,6 @@ DateFormat[sl]=%A, %e. %B %Y
DateFormat[eo]=%A, la %ea de %B %Y DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%d. %m. %y DateFormatShort=%d. %m. %y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
WeekDayOfPray=0
NounDeclension=true
DateMonthNamePossessive=true DateMonthNamePossessive=true
#DecimalPlaces=2 #DecimalPlaces=2
AddressFormat=%n\n%s\n%0(p.p. %p\n)%z %l AddressFormat=%n\n%s\n%0(p.p. %p\n)%z %l

1
l10n/tr/entry.desktop
View file

@ -102,5 +102,4 @@ DateFormat[tr]=%d %B %Y %A
DateFormat[eo]=%A,la %ea de %B %Y DateFormat[eo]=%A,la %ea de %B %Y
DateFormatShort=%d-%m-%Y DateFormatShort=%d-%m-%Y
TimeFormat=%H:%M:%S TimeFormat=%H:%M:%S
WeekDayOfPray=0
#DecimalPlaces=2 #DecimalPlaces=2

45
plasma/declarativeimports/locale/locale.cpp
View file

@ -30,13 +30,6 @@ Locale::Locale(QObject* parent)
m_locale = KGlobal::locale(); m_locale = KGlobal::locale();
} }
bool Locale::setCountryDivisionCode(const QString &countryDivisionCode)
{
bool ok = m_locale->setCountryDivisionCode(countryDivisionCode);
emit countryDivisionCodeChanged();
return ok;
}
bool Locale::isApplicationTranslatedInto(const QString &lang) bool Locale::isApplicationTranslatedInto(const QString &lang)
{ {
return m_locale->isApplicationTranslatedInto(lang); return m_locale->isApplicationTranslatedInto(lang);
@ -58,11 +51,6 @@ QString Locale::country() const
return m_locale->country(); return m_locale->country();
} }
QString Locale::countryDivisionCode() const
{
return m_locale->countryDivisionCode();
}
QString Locale::translateQt(const char *context, const char *sourceText) const QString Locale::translateQt(const char *context, const char *sourceText) const
{ {
return m_locale->translateQt(context, sourceText); return m_locale->translateQt(context, sourceText);
@ -99,21 +87,6 @@ int Locale::weekStartDay() const
return m_locale->weekStartDay(); return m_locale->weekStartDay();
} }
int Locale::workingWeekStartDay() const
{
return m_locale->workingWeekStartDay();
}
int Locale::workingWeekEndDay() const
{
return m_locale->workingWeekEndDay();
}
int Locale::weekDayOfPray() const
{
return m_locale->weekDayOfPray();
}
int Locale::decimalPlaces() const int Locale::decimalPlaces() const
{ {
return m_locale->decimalPlaces(); return m_locale->decimalPlaces();
@ -266,24 +239,6 @@ void Locale::setWeekStartDay(int day)
emit weekStartDayChanged(); emit weekStartDayChanged();
} }
void Locale::setWorkingWeekStartDay(int day)
{
m_locale->setWorkingWeekStartDay(day);
emit workingWeekStartDayChanged();
}
void Locale::setWorkingWeekEndDay(int day)
{
m_locale->setWorkingWeekEndDay(day);
emit workingWeekEndDayChanged();
}
void Locale::setWeekDayOfPray(int day)
{
m_locale->setWeekDayOfPray(day);
emit weekDayOfPrayChanged();
}
QString Locale::dateFormat() const QString Locale::dateFormat() const
{ {
return m_locale->dateFormat(); return m_locale->dateFormat();

85
plasma/declarativeimports/locale/locale_p.h
View file

@ -82,7 +82,6 @@ Q_ENUMS(WeekNumberSystem)
Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged) Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged)
Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged) Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged)
Q_PROPERTY(QString country READ country CONSTANT) //read-only Q_PROPERTY(QString country READ country CONSTANT) //read-only
Q_PROPERTY(QString countryDivisionCode READ countryDivisionCode WRITE setCountryDivisionCode NOTIFY countryDivisionCodeChanged)
Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat NOTIFY dateFormatChanged) Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat NOTIFY dateFormatChanged)
Q_PROPERTY(QString dateFormatShort READ dateFormatShort WRITE setDateFormat NOTIFY dateFormatShortChanged) Q_PROPERTY(QString dateFormatShort READ dateFormatShort WRITE setDateFormat NOTIFY dateFormatShortChanged)
Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat NOTIFY timeFormatChanged) Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat NOTIFY timeFormatChanged)
@ -97,11 +96,8 @@ Q_PROPERTY(QString negativeSign READ negativeSign WRITE setNegativeSign NOTIFY n
Q_PROPERTY(int pageSize READ pageSize WRITE setPageSize NOTIFY pageSizeChanged) Q_PROPERTY(int pageSize READ pageSize WRITE setPageSize NOTIFY pageSizeChanged)
Q_PROPERTY(QString positiveSign READ positiveSign WRITE setPositiveSign NOTIFY positiveSignChanged) Q_PROPERTY(QString positiveSign READ positiveSign WRITE setPositiveSign NOTIFY positiveSignChanged)
Q_PROPERTY(QString thousandsSeparator READ thousandsSeparator WRITE setThousandsSeparator NOTIFY thousandsSeparatorChanged) Q_PROPERTY(QString thousandsSeparator READ thousandsSeparator WRITE setThousandsSeparator NOTIFY thousandsSeparatorChanged)
Q_PROPERTY(int weekDayOfPray READ weekDayOfPray WRITE setWeekDayOfPray NOTIFY weekDayOfPrayChanged)
Q_PROPERTY(Locale::WeekNumberSystem weekNumberSystem READ weekNumberSystem WRITE setWeekNumberSystem NOTIFY WeekNumberSystemChanged) Q_PROPERTY(Locale::WeekNumberSystem weekNumberSystem READ weekNumberSystem WRITE setWeekNumberSystem NOTIFY WeekNumberSystemChanged)
Q_PROPERTY(int weekStartDay READ weekStartDay WRITE setWeekStartDay NOTIFY weekStartDayChanged) Q_PROPERTY(int weekStartDay READ weekStartDay WRITE setWeekStartDay NOTIFY weekStartDayChanged)
Q_PROPERTY(int workingWeekEndDay READ workingWeekEndDay WRITE setWorkingWeekEndDay NOTIFY workingWeekEndDayChanged)
Q_PROPERTY(int workingWeekStartDay READ workingWeekStartDay WRITE setWorkingWeekStartDay NOTIFY workingWeekStartDayChanged)
Q_PROPERTY(bool use12Clock READ use12Clock CONSTANT) Q_PROPERTY(bool use12Clock READ use12Clock CONSTANT)
Q_PROPERTY(QString defaultLanguage READ defaultLanguage CONSTANT)//read-only Q_PROPERTY(QString defaultLanguage READ defaultLanguage CONSTANT)//read-only
Q_PROPERTY(QString defaultCountry READ defaultCountry CONSTANT)//read-only Q_PROPERTY(QString defaultCountry READ defaultCountry CONSTANT)//read-only
@ -662,27 +658,6 @@ public:
*/ */
int weekStartDay() const; int weekStartDay() const;
/**
* Use this to determine which day is the first working day of the week.
*
* @return an integer (Monday=1..Sunday=7)
*/
int workingWeekStartDay() const;
/**
* Use this to determine which day is the last working day of the week.
*
* @return an integer (Monday=1..Sunday=7)
*/
int workingWeekEndDay() const;
/**
* Use this to determine which day is reserved for religious observance
*
* @return day number (None = 0, Monday = 1, ..., Sunday = 7)
*/
int weekDayOfPray() const;
/** /**
* *
* Returns the type of Calendar System used in this Locale * Returns the type of Calendar System used in this Locale
@ -843,25 +818,6 @@ public:
*/ */
QString country() const; QString country() const;
/**
*
* Returns the Country Division Code of the Country where the user lives.
* When no value is set, then the Country Code will be returned.
*
* The returned code complies with the ISO 3166-2 standard.
* See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
*
* Note that unlike country() this method will return the correct case,
* i.e. normally uppercase..
*
* In KDE 4.6 it is the apps responsibility to obtain a translation for the
* code, translation and other services will be priovided in KDE 4.7.
*
* @return the Country Division Code for the user
* @see setCountryDivisionCode
*/
QString countryDivisionCode() const;
/** /**
* Returns the language codes selected by user, ordered by decreasing * Returns the language codes selected by user, ordered by decreasing
* priority. * priority.
@ -967,27 +923,6 @@ public:
*/ */
void setWeekStartDay(int day); void setWeekStartDay(int day);
/**
* Changes how KLocale defines the first working day in week.
*
* @param day first working day of the week (Monday=1..Sunday=7) as integer
*/
void setWorkingWeekStartDay(int day);
/**
* Changes how KLocale defines the last working day in week.
*
* @param day last working day of the week (Monday=1..Sunday=7) as integer
*/
void setWorkingWeekEndDay(int day);
/**
* Changes how KLocale defines the day reserved for religious observance.
*
* @param day day of the week for religious observance (None=0,Monday=1..Sunday=7) as integer
*/
void setWeekDayOfPray(int day);
/** /**
* Returns the currently selected date format. * Returns the currently selected date format.
* *
@ -1213,22 +1148,6 @@ public:
*/ */
Q_INVOKABLE bool isApplicationTranslatedInto(const QString & language); Q_INVOKABLE bool isApplicationTranslatedInto(const QString & language);
/**
*
* Sets the Country Division Code of the Country where the user lives.
*
* The code must comply with the ISO 3166-2 standard.
* See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
*
* In KDE 4.6 it is the apps responsibility to validate the input,
* full validation and other services will be provided in KDE 4.7.
*
* @param countryDivision the Country Division Code for the user
* @return @c true on success, @c false on failure
* @see countryDivisionCode
*/
bool setCountryDivisionCode(const QString & countryDivision);
/** /**
* *
* Removes accelerator marker from a UI text label. * Removes accelerator marker from a UI text label.
@ -1279,7 +1198,6 @@ private:
Q_SIGNALS: Q_SIGNALS:
void binaryUnitDialectChanged(); void binaryUnitDialectChanged();
void calendarSystemChanged(); void calendarSystemChanged();
void countryDivisionCodeChanged();
void decimalSymbolChanged(); void decimalSymbolChanged();
void dateFormatChanged(); void dateFormatChanged();
void dateFormatShortChanged(); void dateFormatShortChanged();
@ -1293,11 +1211,8 @@ Q_SIGNALS:
void positiveSignChanged(); void positiveSignChanged();
void thousandsSeparatorChanged(); void thousandsSeparatorChanged();
void timeFormatChanged(); void timeFormatChanged();
void weekDayOfPrayChanged();
void WeekNumberSystemChanged(); void WeekNumberSystemChanged();
void weekStartDayChanged(); void weekStartDayChanged();
void workingWeekEndDayChanged();
void workingWeekStartDayChanged();
}; };
#endif #endif