[vidalia-svn] r1225: Do the fix in r1224 a little cleaner. (in trunk/src: . lang)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-09-22 01:53:58 -0400 (Fri, 22 Sep 2006)
New Revision: 1225

Modified:
   trunk/src/lang/languagesupport.cpp
   trunk/src/lang/languagesupport.h
   trunk/src/main.cpp
Log:
Do the fix in r1224 a little cleaner.

Modified: trunk/src/lang/languagesupport.cpp
===================================================================
--- trunk/src/lang/languagesupport.cpp	2006-09-22 04:02:27 UTC (rev 1224)
+++ trunk/src/lang/languagesupport.cpp	2006-09-22 05:53:58 UTC (rev 1225)
@@ -29,30 +29,31 @@
 
 #include "languagesupport.h"
 
-/** Static list of supported languages and codes. */
-QMap<QString, QString> LanguageSupport::_languages;
 
 /** Initializes the list of available languages. */
-void
-LanguageSupport::initialize()
+QMap<QString, QString>
+LanguageSupport::languages()
 {
-  _languages.clear();
-  _languages.insert("en",    "English");
-  _languages.insert("bg",
-    QString::fromUtf8("\320\221\321\212\320\273\320\263\320"
-                      "\260\321\200\321\201\320\272\320\270"));
-  _languages.insert("de",    "Deutsch");
-  _languages.insert("fi",    "suomi");
-  _languages.insert("fr",    
-    QString::fromUtf8("fran\303\247ais"));
-  _languages.insert("hu",    "magyar nyelv");
-  _languages.insert("it",    "Italiano");
-  _languages.insert("nl",    "Nederlands");
-  _languages.insert("pl",    "Polski");
-  _languages.insert("ru",
-    QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271"));
-  _languages.insert("zh-cn", 
-    QString::fromUtf8("\347\256\200\344\275\223\345\255\227"));
+  static QMap<QString, QString> languages;
+  if (languages.isEmpty()) {
+    languages.insert("en",    "English");
+    languages.insert("bg",
+      QString::fromUtf8("\320\221\321\212\320\273\320\263\320"
+                        "\260\321\200\321\201\320\272\320\270"));
+    languages.insert("de",    "Deutsch");
+    languages.insert("fi",    "suomi");
+    languages.insert("fr",    
+      QString::fromUtf8("fran\303\247ais"));
+    languages.insert("hu",    "magyar nyelv");
+    languages.insert("it",    "Italiano");
+    languages.insert("nl",    "Nederlands");
+    languages.insert("pl",    "Polski");
+    languages.insert("ru",
+      QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271"));
+    languages.insert("zh-cn", 
+      QString::fromUtf8("\347\256\200\344\275\223\345\255\227"));
+  }
+  return languages;
 }
 
 /** Returns the default language code for the system locale. */
@@ -74,37 +75,30 @@
 QString
 LanguageSupport::languageCode(QString languageName)
 {
-  return _languages.key(languageName);
+  return languages().key(languageName);
 }
 
 /** Returns a list of all supported language codes. (e.g., "en"). */
 QStringList
 LanguageSupport::languageCodes()
 {
-  return _languages.keys();
+  return languages().keys();
 }
 
 /** Returns the language name for a given language code. */
 QString
 LanguageSupport::languageName(QString languageCode)
 {
-  return _languages.value(languageCode);
+  return languages().value(languageCode);
 }
 
 /** Returns a list of all supported language names (e.g., "English"). */
 QStringList
 LanguageSupport::languageNames()
 {
-  return _languages.values();
+  return languages().values();
 }
 
-/** Returns a list of all supported language codes and names. */
-QMap<QString, QString>
-LanguageSupport::languages()
-{
-  return _languages;
-}
-
 /** Returns true if we understand the given language code. */
 bool
 LanguageSupport::isValidLanguageCode(QString code)

Modified: trunk/src/lang/languagesupport.h
===================================================================
--- trunk/src/lang/languagesupport.h	2006-09-22 04:02:27 UTC (rev 1224)
+++ trunk/src/lang/languagesupport.h	2006-09-22 05:53:58 UTC (rev 1225)
@@ -35,8 +35,6 @@
 class LanguageSupport
 {
 public:
-  /** Initializes the list of supported languages. */
-  static void initialize();
   /** Returns the default language code for the system locale. */
   static QString defaultLanguageCode();
   /** Returns the language code for a given language name. */

Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp	2006-09-22 04:02:27 UTC (rev 1224)
+++ trunk/src/main.cpp	2006-09-22 05:53:58 UTC (rev 1225)
@@ -53,9 +53,6 @@
   Q_INIT_RESOURCE(vidalia_common);
   QStringList args = char_array_to_stringlist(argv+1, argc-1);
 
-  /* Initialize Vidalia's supported language translations */
-  LanguageSupport::initialize();
-
   /* Construct the application object. Qt strips any command-line arguments
    * that it recognizes in argv, so we'll pass a stringlist of the original
    * list of command-line arguments too. */