From: Vadim Zeitlin Date: Fri, 28 Jul 2006 23:55:17 +0000 (+0000) Subject: removed wxLANGUAGE_SERBIAN, we must explicitly use either or wxLANGUAGE_SERBIAN_CYRIL... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1a8e309166de13278b719b3dd8b9db73d4750bb2 removed wxLANGUAGE_SERBIAN, we must explicitly use either or wxLANGUAGE_SERBIAN_CYRILLIC/LATIN variants alone as just wxLANGUAGE_SERBIA is equivalent to wXLANGUAGE_CROATION under Windows resulting in unwelcome confusion; and there is no default sublanguage for Serbian anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt index f6276a205e..b3225c626b 100644 --- a/misc/languages/langtabl.txt +++ b/misc/languages/langtabl.txt @@ -158,7 +158,6 @@ wxLANGUAGE_SAMOAN sm - - wxLANGUAGE_SANGHO sg - - "Sangho" wxLANGUAGE_SANSKRIT sa LANG_SANSKRIT SUBLANG_DEFAULT "Sanskrit" wxLANGUAGE_SCOTS_GAELIC gd - - "Scots Gaelic" -wxLANGUAGE_SERBIAN sr_YU LANG_SERBIAN SUBLANG_DEFAULT "Serbian" wxLANGUAGE_SERBIAN_CYRILLIC sr_YU LANG_SERBIAN SUBLANG_SERBIAN_CYRILLIC "Serbian (Cyrillic)" wxLANGUAGE_SERBIAN_LATIN sr_YU LANG_SERBIAN SUBLANG_SERBIAN_LATIN "Serbian (Latin)" wxLANGUAGE_SERBO_CROATIAN sh - - "Serbo-Croatian" diff --git a/src/common/intl.cpp b/src/common/intl.cpp index c51372ac9e..a5e863883e 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -3557,7 +3557,6 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_SANGHO, "sg" , 0 , 0 , "Sangho") LNG(wxLANGUAGE_SANSKRIT, "sa" , LANG_SANSKRIT , SUBLANG_DEFAULT , "Sanskrit") LNG(wxLANGUAGE_SCOTS_GAELIC, "gd" , 0 , 0 , "Scots Gaelic") - LNG(wxLANGUAGE_SERBIAN, "sr_YU", LANG_SERBIAN , SUBLANG_DEFAULT , "Serbian") LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , "Serbian (Cyrillic)") LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , "Serbian (Latin)") LNG(wxLANGUAGE_SERBO_CROATIAN, "sh" , 0 , 0 , "Serbo-Croatian")