From 03d7d36ba9c71650104c21cdb7ab5d371ec59c95 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Dec 2008 19:50:17 +0000 Subject: [PATCH] correct Serbian locale name: should be sr_RS, not sr_SR (fixes #10295) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- misc/languages/langtabl.txt | 6 +++--- src/common/intl.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt index 290d609dfd..e7d0c58110 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 896533d2a4..bffac09ffd 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -3465,9 +3465,9 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_SANGHO, "sg" , 0 , 0 , wxLayout_LeftToRight, "Sangho") LNG(wxLANGUAGE_SANSKRIT, "sa" , LANG_SANSKRIT , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Sanskrit") LNG(wxLANGUAGE_SCOTS_GAELIC, "gd" , 0 , 0 , wxLayout_LeftToRight, "Scots Gaelic") - 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") -- 2.45.2