summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/language/language.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index 7707452..81d6717 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -75,50 +75,51 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl
75 ownName = conf.readEntryDirect( "Name" ); 75 ownName = conf.readEntryDirect( "Name" );
76 if ( !ownName.isEmpty() && ownName != langName ) 76 if ( !ownName.isEmpty() && ownName != langName )
77 langName = langName + " [" + ownName + "]"; 77 langName = langName + " [" + ownName + "]";
78 languages->insertItem( langName ); 78 languages->insertItem( langName );
79 79
80 } 80 }
81 } 81 }
82 if ( langAvail. find ( "en" ) == -1 ) { 82 if ( langAvail. find ( "en" ) == -1 ) {
83 langAvail. prepend ( "" ); // no tr 83 langAvail. prepend ( "" ); // no tr
84 languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 ); 84 languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 );
85 } 85 }
86 86
87 dl = new QPEDialogListener(this); 87 dl = new QPEDialogListener(this);
88 reset(); 88 reset();
89} 89}
90 90
91LanguageSettings::~LanguageSettings() 91LanguageSettings::~LanguageSettings()
92{} 92{}
93 93
94void LanguageSettings::accept() 94void LanguageSettings::accept()
95{ 95{
96 Config c( "qpe" ); 96 Config c( "qpe" );
97 c.setGroup( "Startup" ); 97 c.setGroup( "Startup" );
98 if ( ( c.readNumEntry( "FirstUse", 42 ) == 0 ) && 98 if ( ( c.readNumEntry( "FirstUse", 42 ) == 0 ) &&
99 ( QMessageBox::warning( this, "Language", "Attention, all windows will be closed\nby changing the language\n" 99 ( QMessageBox::warning( this, tr("Language"), tr("<qt>Attention, all windows will be closed by changing the language\n"
100 "without saving the Data.\n\nGo on?", "Ok", "Cancel", 0, 0, 1 ) ) ) 100 "without saving the Data.<br><br>Go on?</qt>"), 1, 2) )
101 == QMessageBox::Cancel )
101 return; 102 return;
102 applyLanguage(); 103 applyLanguage();
103 QDialog::accept(); 104 QDialog::accept();
104} 105}
105 106
106void LanguageSettings::applyLanguage() 107void LanguageSettings::applyLanguage()
107{ 108{
108 setLanguage ( langAvail. at ( languages-> currentItem ( ))); 109 setLanguage ( langAvail. at ( languages-> currentItem ( )));
109} 110}
110 111
111 112
112void LanguageSettings::reject() 113void LanguageSettings::reject()
113{ 114{
114 reset(); 115 reset();
115 QDialog::reject(); 116 QDialog::reject();
116} 117}
117 118
118void LanguageSettings::reset() 119void LanguageSettings::reset()
119{ 120{
120 QString l = getenv("LANG"); 121 QString l = getenv("LANG");
121 Config config("locale"); 122 Config config("locale");
122 config.setGroup("Language"); 123 config.setGroup("Language");
123 l = config.readEntry( "Language", l ); 124 l = config.readEntry( "Language", l );
124 actualLanguage = l; 125 actualLanguage = l;