summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:39:07 (UTC)
committer zecke <zecke>2004-09-10 11:39:07 (UTC)
commit77ebc6898d1828b8c728838813c5ddd2bc25a424 (patch) (unidiff)
tree5bb26d9b0ca4a7ccd5854557b1d1572c0787675b
parenteadf5111822801f02c71930e707ae5758a97712c (diff)
downloadopie-77ebc6898d1828b8c728838813c5ddd2bc25a424.zip
opie-77ebc6898d1828b8c728838813c5ddd2bc25a424.tar.gz
opie-77ebc6898d1828b8c728838813c5ddd2bc25a424.tar.bz2
The messagebox can be translated now, use QMessageBox::Ok and
QMessageBox::Cancel so the translator only needs to translate the string once
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
@@ -51,98 +51,99 @@
51 51
52 52
53LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) 53LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl )
54 : LanguageSettingsBase( parent, name, TRUE, fl ) 54 : LanguageSettingsBase( parent, name, TRUE, fl )
55{ 55{
56 if ( FontManager::hasUnicodeFont() ) 56 if ( FontManager::hasUnicodeFont() )
57 languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); 57 languages->setFont(FontManager::unicodeFont(FontManager::Proportional));
58 58
59 59
60 QString tfn = QPEApplication::qpeDir() + "/i18n/"; 60 QString tfn = QPEApplication::qpeDir() + "/i18n/";
61 QDir langDir = tfn; 61 QDir langDir = tfn;
62 QStringList list = langDir.entryList("*", QDir::Dirs ); 62 QStringList list = langDir.entryList("*", QDir::Dirs );
63 63
64 QStringList::Iterator it; 64 QStringList::Iterator it;
65 65
66 for ( it = list.begin(); it != list.end(); ++it ) { 66 for ( it = list.begin(); it != list.end(); ++it ) {
67 QString name = (*it); 67 QString name = (*it);
68 QFileInfo desktopFile( tfn + "/" + name + "/.directory" ); 68 QFileInfo desktopFile( tfn + "/" + name + "/.directory" );
69 if ( desktopFile.exists() ) { 69 if ( desktopFile.exists() ) {
70 langAvail.append(name); 70 langAvail.append(name);
71 Config conf( desktopFile.filePath(), Config::File ); 71 Config conf( desktopFile.filePath(), Config::File );
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 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;
125 if (l.isEmpty()) 126 if (l.isEmpty())
126 l = "en"; 127 l = "en";
127 128
128 int n = langAvail.find( l ); 129 int n = langAvail.find( l );
129 languages->setCurrentItem( n ); 130 languages->setCurrentItem( n );
130} 131}
131 132
132QString LanguageSettings::actualLanguage; 133QString LanguageSettings::actualLanguage;
133 134
134void LanguageSettings::setLanguage(const QString& lang) 135void LanguageSettings::setLanguage(const QString& lang)
135{ 136{
136 if ( lang != actualLanguage ) { 137 if ( lang != actualLanguage ) {
137 Config config("locale"); 138 Config config("locale");
138 config.setGroup( "Language" ); 139 config.setGroup( "Language" );
139 if ( lang. isEmpty ( )) 140 if ( lang. isEmpty ( ))
140 config. removeEntry ( "Language" ); 141 config. removeEntry ( "Language" );
141 else 142 else
142 config.writeEntry( "Language", lang ); 143 config.writeEntry( "Language", lang );
143 config.write(); 144 config.write();
144 145
145#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 146#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
146 147
147 QCopEnvelope e("QPE/System", "language(QString)"); 148 QCopEnvelope e("QPE/System", "language(QString)");
148 e << lang; 149 e << lang;