diff --git a/docs/changes.txt b/docs/changes.txt index 65303bce4d..1163d46776 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -98,6 +98,7 @@ All: - Correct bug in wxTimeSpan::Format() for negative spans. - Added Vietnamese translation (Tran Ngoc Quan). - Updated Slovenian translation (Martin Srebotnjak). +- Corrected Serbian locale name (Cody Precord). All (GUI): diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt index bf7ab86408..e1e3ac5d7b 100644 --- a/misc/languages/langtabl.txt +++ b/misc/languages/langtabl.txt @@ -159,9 +159,9 @@ wxLANGUAGE_SAMOAN sm - - wxLANGUAGE_SANGHO sg - - LTR "Sangho" wxLANGUAGE_SANSKRIT sa LANG_SANSKRIT SUBLANG_DEFAULT LTR "Sanskrit" wxLANGUAGE_SCOTS_GAELIC gd - - LTR "Scots Gaelic" -wxLANGUAGE_SERBIAN sr_SR LANG_SERBIAN SUBLANG_DEFAULT LTR "Serbian" -wxLANGUAGE_SERBIAN_CYRILLIC sr_SR LANG_SERBIAN SUBLANG_SERBIAN_CYRILLIC LTR "Serbian (Cyrillic)" -wxLANGUAGE_SERBIAN_LATIN sr_SR@latin LANG_SERBIAN SUBLANG_SERBIAN_LATIN LTR "Serbian (Latin)" +wxLANGUAGE_SERBIAN sr_RS LANG_SERBIAN SUBLANG_DEFAULT LTR "Serbian" +wxLANGUAGE_SERBIAN_CYRILLIC sr_RS LANG_SERBIAN SUBLANG_SERBIAN_CYRILLIC LTR "Serbian (Cyrillic)" +wxLANGUAGE_SERBIAN_LATIN sr_RS@latin LANG_SERBIAN SUBLANG_SERBIAN_LATIN LTR "Serbian (Latin)" wxLANGUAGE_SERBIAN_CYRILLIC sr_YU LANG_SERBIAN SUBLANG_SERBIAN_CYRILLIC LTR "Serbian (Cyrillic)" wxLANGUAGE_SERBIAN_LATIN sr_YU@latin LANG_SERBIAN SUBLANG_SERBIAN_LATIN LTR "Serbian (Latin)" wxLANGUAGE_SERBO_CROATIAN sh - - LTR "Serbo-Croatian" diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 710eb1747e..a0478b891d 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -3705,9 +3705,9 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_SANSKRIT, "sa" , LANG_SANSKRIT , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Sanskrit") LNG(wxLANGUAGE_SCOTS_GAELIC, "gd" , 0 , 0 , wxLayout_LeftToRight, "Scots Gaelic") LNG(wxLANGUAGE_SAMI, "se_NO", LANG_SAMI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Northern Sami") - LNG(wxLANGUAGE_SERBIAN, "sr_SR", LANG_SERBIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Serbian") - LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_SR", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)") - LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_SR@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)") + LNG(wxLANGUAGE_SERBIAN, "sr_RS", LANG_SERBIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Serbian") + LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_RS", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)") + LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_RS@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)") LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)") LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_YU@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)") LNG(wxLANGUAGE_SERBO_CROATIAN, "sh" , 0 , 0 , wxLayout_LeftToRight, "Serbo-Croatian")