-rw-r--r-- | noncore/settings/language/language.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp index 397d372..5c4284b 100644 --- a/noncore/settings/language/language.cpp +++ b/noncore/settings/language/language.cpp | |||
@@ -66,2 +66,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f | |||
66 | 66 | ||
67 | |||
67 | QString tfn = QPEApplication::qpeDir()+"/i18n/"; | 68 | QString tfn = QPEApplication::qpeDir()+"/i18n/"; |
@@ -88,2 +89,6 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f | |||
88 | } | 89 | } |
90 | if ( langAvail. find ( "en" ) == -1 ) { | ||
91 | langAvail. prepend ( "" ); // no tr | ||
92 | languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 ); | ||
93 | } | ||
89 | 94 | ||
@@ -94,4 +99,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f | |||
94 | LanguageSettings::~LanguageSettings() | 99 | LanguageSettings::~LanguageSettings() |
95 | { | 100 | {} |
96 | } | ||
97 | 101 | ||
@@ -105,4 +109,3 @@ void LanguageSettings::applyLanguage() | |||
105 | { | 109 | { |
106 | QString lang = langAvail.at( languages->currentItem() ); | 110 | setLanguage ( langAvail. at ( languages-> currentItem ( ))); |
107 | setLanguage( lang ); | ||
108 | } | 111 | } |
@@ -119,5 +122,7 @@ void LanguageSettings::reset() | |||
119 | QString l = getenv("LANG"); | 122 | QString l = getenv("LANG"); |
120 | Config config("language"); | 123 | Config config("locale"); |
124 | config.setGroup("Language"); | ||
121 | l = config.readEntry( "Language", l ); | 125 | l = config.readEntry( "Language", l ); |
122 | if(l.isEmpty()) l = "en"; | 126 | if (l.isEmpty()) |
127 | l = "en"; | ||
123 | actualLanguage = l; | 128 | actualLanguage = l; |
@@ -135,2 +140,5 @@ void LanguageSettings::setLanguage(const QString& lang) | |||
135 | config.setGroup( "Language" ); | 140 | config.setGroup( "Language" ); |
141 | if ( lang. isEmpty ( )) | ||
142 | config. removeEntry ( "Language" ); | ||
143 | else | ||
136 | config.writeEntry( "Language", lang ); | 144 | config.writeEntry( "Language", lang ); |
@@ -139,2 +147,3 @@ void LanguageSettings::setLanguage(const QString& lang) | |||
139 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 147 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
148 | |||
140 | QCopEnvelope e("QPE/System","language(QString)"); | 149 | QCopEnvelope e("QPE/System","language(QString)"); |
@@ -142,2 +151,3 @@ void LanguageSettings::setLanguage(const QString& lang) | |||
142 | #endif | 151 | #endif |
152 | |||
143 | } | 153 | } |