summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/language/language.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index 8dff063..7707452 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -72,63 +72,56 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl
72 QString langName = conf.readEntry( "Name" ); 72 QString langName = conf.readEntry( "Name" );
73 QString ownName = conf.readEntryDirect( "Name[" + name + "]" ); 73 QString ownName = conf.readEntryDirect( "Name[" + name + "]" );
74 if ( ownName.isEmpty() ) 74 if ( ownName.isEmpty() )
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 switch( QMessageBox::warning( this, "Language", 96 Config c( "qpe" );
97 "Attention, all windows will be closed\n" 97 c.setGroup( "Startup" );
98 "by changing the language\n" 98 if ( ( c.readNumEntry( "FirstUse", 42 ) == 0 ) &&
99 "without saving the Data.\n\n" 99 ( QMessageBox::warning( this, "Language", "Attention, all windows will be closed\nby changing the language\n"
100 "Go on?", 100 "without saving the Data.\n\nGo on?", "Ok", "Cancel", 0, 0, 1 ) ) )
101 "Ok", "Cancel", 0, 101 return;
102 0, 1 )) 102 applyLanguage();
103 { 103 QDialog::accept();
104 case 0: // OK
105 applyLanguage();
106 QDialog::accept();
107 break;
108 case 1: // Abbruch
109 break;
110 }
111} 104}
112 105
113void LanguageSettings::applyLanguage() 106void LanguageSettings::applyLanguage()
114{ 107{
115 setLanguage ( langAvail. at ( languages-> currentItem ( ))); 108 setLanguage ( langAvail. at ( languages-> currentItem ( )));
116} 109}
117 110
118 111
119void LanguageSettings::reject() 112void LanguageSettings::reject()
120{ 113{
121 reset(); 114 reset();
122 QDialog::reject(); 115 QDialog::reject();
123} 116}
124 117
125void LanguageSettings::reset() 118void LanguageSettings::reset()
126{ 119{
127 QString l = getenv("LANG"); 120 QString l = getenv("LANG");
128 Config config("locale"); 121 Config config("locale");
129 config.setGroup("Language"); 122 config.setGroup("Language");
130 l = config.readEntry( "Language", l ); 123 l = config.readEntry( "Language", l );
131 actualLanguage = l; 124 actualLanguage = l;
132 if (l.isEmpty()) 125 if (l.isEmpty())
133 l = "en"; 126 l = "en";
134 127