[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3567 - in trunk/pingus/src: . tinygettext
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3567 - in trunk/pingus/src: . tinygettext |
Date: |
Mon, 24 Mar 2008 21:32:39 +0100 |
Author: grumbel
Date: 2008-03-24 21:32:38 +0100 (Mon, 24 Mar 2008)
New Revision: 3567
Modified:
trunk/pingus/src/option_menu.cpp
trunk/pingus/src/tinygettext/language_def.cpp
Log:
- fixed little crash caused by zh_TW in the option menu
Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp 2008-03-24 20:05:28 UTC (rev 3566)
+++ trunk/pingus/src/option_menu.cpp 2008-03-24 20:32:38 UTC (rev 3567)
@@ -68,7 +68,11 @@
ChoiceBox* language_box = new ChoiceBox(Rect());
std::set<std::string> lst = dictionary_manager.get_languages();
for (std::set<std::string>::iterator i = lst.begin(); i != lst.end(); ++i)
- language_box->add_choice(TinyGetText::get_language_def(*i)->name);
+ {
+ LanguageDef* lang = TinyGetText::get_language_def(*i);
+ if (lang)
+ language_box->add_choice(lang->name);
+ }
ChoiceBox* scroll_box = new ChoiceBox(Rect());
scroll_box->add_choice("Drag&Drop");
Modified: trunk/pingus/src/tinygettext/language_def.cpp
===================================================================
--- trunk/pingus/src/tinygettext/language_def.cpp 2008-03-24 20:05:28 UTC
(rev 3566)
+++ trunk/pingus/src/tinygettext/language_def.cpp 2008-03-24 20:32:38 UTC
(rev 3567)
@@ -67,7 +67,8 @@
LanguageDef lang_sk("sk", "Slovak", 3, plural3_sk); // "nplurals=3;
plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
LanguageDef lang_pl("pl", "Polish", 3, plural3_pl); // "nplurals=3;
plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
LanguageDef lang_sl("sl", "Slovenian", 3, plural3_sl); // "nplurals=4;
plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
-LanguageDef lang_sr("sr", "Serbian", 2, plural2_2); // "nplurals=2;
plural=n>1;\n"
+LanguageDef lang_sr("sr", "Serbian", 2, plural2_2); // "nplurals=2;
plural=n>1;"
+LanguageDef lang_zh_TW("zh_TW", "Chinese (traditional)", 1, plural1); //
"nplurals=1; plural=0;"
//*}
LanguageDef*
@@ -107,6 +108,7 @@
else if (name == "pl") return &lang_pl;
else if (name == "sl") return &lang_sl;
else if (name == "sr") return &lang_sr;
+ else if (name == "zh_TW") return &lang_zh_TW;
else return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3567 - in trunk/pingus/src: . tinygettext,
grumbel at BerliOS <=