author | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
commit | a7e015198a8c5ad3b6e144a9032b059086253e00 (patch) (unidiff) | |
tree | b712b6f11310d88744fe393a92b3160b741a7efe /noncore/settings/language | |
parent | beba0e73306815337bf04dee39502233595e9739 (diff) | |
download | opie-a7e015198a8c5ad3b6e144a9032b059086253e00.zip opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.gz opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | noncore/settings/language/language.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp index 8985fd5..d30a041 100644 --- a/noncore/settings/language/language.cpp +++ b/noncore/settings/language/language.cpp | |||
@@ -106,27 +106,27 @@ void LanguageSettings::applyLanguage() | |||
106 | void LanguageSettings::reject() | 106 | void LanguageSettings::reject() |
107 | { | 107 | { |
108 | reset(); | 108 | reset(); |
109 | QDialog::reject(); | 109 | QDialog::reject(); |
110 | } | 110 | } |
111 | 111 | ||
112 | void LanguageSettings::reset() | 112 | void LanguageSettings::reset() |
113 | { | 113 | { |
114 | QString l = getenv("LANG"); | 114 | QString l = getenv("LANG"); |
115 | Config config("locale"); | 115 | Config config("locale"); |
116 | config.setGroup("Language"); | 116 | config.setGroup("Language"); |
117 | l = config.readEntry( "Language", l ); | 117 | l = config.readEntry( "Language", l ); |
118 | actualLanguage = l; | ||
118 | if (l.isEmpty()) | 119 | if (l.isEmpty()) |
119 | l = "en"; | 120 | l = "en"; |
120 | actualLanguage = l; | ||
121 | 121 | ||
122 | int n = langAvail.find( l ); | 122 | int n = langAvail.find( l ); |
123 | languages->setCurrentItem( n ); | 123 | languages->setCurrentItem( n ); |
124 | } | 124 | } |
125 | 125 | ||
126 | QString LanguageSettings::actualLanguage; | 126 | QString LanguageSettings::actualLanguage; |
127 | 127 | ||
128 | void LanguageSettings::setLanguage(const QString& lang) | 128 | void LanguageSettings::setLanguage(const QString& lang) |
129 | { | 129 | { |
130 | if ( lang != actualLanguage ) { | 130 | if ( lang != actualLanguage ) { |
131 | Config config("locale"); | 131 | Config config("locale"); |
132 | config.setGroup( "Language" ); | 132 | config.setGroup( "Language" ); |