add ka_GE, ku_TR and ne_NP; some cleanup and better handling of sr_XX (patch 1858926)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/langcodes.tex b/docs/latex/wx/langcodes.tex
index 65febd20197ede8f26bda576e2a976e938ebbe37..ecd2f791ab7516d8f5408378bffbff1b38aa9b74 100644 (file)
--- a/docs/latex/wx/langcodes.tex
+++ b/docs/latex/wx/langcodes.tex
@@ -231,6 +231,7 @@ in \helpref{wxLocale::Init}{wxlocaleinit} and are returned by
 \twocolitem{wxLANGUAGE\_UZBEK}{}
 \twocolitem{wxLANGUAGE\_UZBEK\_CYRILLIC}{}
 \twocolitem{wxLANGUAGE\_UZBEK\_LATIN}{}
+\twocolitem{wxLANGUAGE\_VALENCIAN}{}
 \twocolitem{wxLANGUAGE\_VIETNAMESE}{}
 \twocolitem{wxLANGUAGE\_VOLAPUK}{}
 \twocolitem{wxLANGUAGE\_WELSH}{}

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 8b02196d99d945861f43ff76f335dda1526e13fc..54c1b9734fff4a575d6759f9aca97f751922e15c 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -10,6 +10,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// WARNING: Parts of this file are generated. See misc/languages/README for
+// details.
+
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
@@ -296,6 +299,7 @@ enum wxLanguage
     wxLANGUAGE_UZBEK,
     wxLANGUAGE_UZBEK_CYRILLIC,
     wxLANGUAGE_UZBEK_LATIN,
+    wxLANGUAGE_VALENCIAN,
     wxLANGUAGE_VIETNAMESE,
     wxLANGUAGE_VOLAPUK,
     wxLANGUAGE_WELSH,

diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py
index c2765d10d26fb46bdb475c89da065e3dfd2612e7..878dfd37da0c1a007e1e4c84d8a8ff07e33c6c93 100755 (executable)
--- a/misc/languages/genlang.py
+++ b/misc/languages/genlang.py
@@ -33,8 +33,11 @@ enum wxLanguage
     wxLANGUAGE_UNKNOWN, 
     
 """);
+   knownLangs = []
    for i in table:
-       f.write('    %s,\n' % i[0])
+       if i[0] not in knownLangs:
+          f.write('    %s,\n' % i[0])
+          knownLangs.append(i[0])
    f.write("""
     // for custom, user-defined languages:
     wxLANGUAGE_USER_DEFINED
@@ -54,16 +57,17 @@ def GenDocs(table):
 
 %% This enum is generated by misc/languages/genlang.py
 %% When making changes, please put them into misc/languages/langtabl.txt
-\\begin{itemize}\\itemsep=0pt
-\\item wxLANGUAGE_DEFAULT -- user's default language as obtained from the operating system 
-\\item wxLANGUAGE_UNKNOWN -- returned by \\helpref{GetSystemLanguage}{wxlocalegetsystemlanguage}
-if it fails to detect the default language 
-\\item wxLANGUAGE_USER_DEFINED -- user defined languages' integer identifiers should start from
-this
+\\begin{twocollist}\\itemsep=0pt
+\\twocolitem{wxLANGUAGE\\_DEFAULT}{user's default language as obtained from the operating system}
+\\twocolitem{wxLANGUAGE\\_UNKNOWN}{returned by \\helpref{GetSystemLanguage}{wxlocalegetsystemlanguage} if it fails to detect the default language}
+\\twocolitem{wxLANGUAGE\\_USER\\_DEFINED}{user defined languages' integer identifiers should start from this}
 """);
+   knownLangs = []
    for i in table:
-       f.write('\\item %s\n' % (i[0].replace('_','\\_')))
-   f.write("""\\end{itemize}
+       if i[0] not in knownLangs:
+          f.write('\\twocolitem{%s}{}\n' % (i[0].replace('_','\\_')))
+          knownLangs.append(i[0])
+   f.write("""\\end{twocollist}\itemsep=0pt
 
 %% --- --- --- generated code ends here --- --- ---
 
@@ -112,7 +116,7 @@ def GenTable(table):
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 
-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__WXMICROWIN__)
 
 #define SETWINLANG(info,lang,sublang)
 
@@ -138,8 +142,8 @@ void wxLocale::InitLanguagesDB()
    wxLanguageInfo info;
    wxStringTokenizer tkn;
 
-   %s   
-};
+%s
+}
 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---

diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt
index 21224fc0d4066c4c366cf9ee3061d1a3f9da734b..94a34cbbc317199bc3f699bfeac788f66bd4a2fb 100644 (file)
--- a/misc/languages/langtabl.txt
+++ b/misc/languages/langtabl.txt
@@ -82,7 +82,7 @@ wxLANGUAGE_FRENCH_MONACO               fr_MC  LANG_FRENCH      SUBLANG_FRENCH_MO
 wxLANGUAGE_FRENCH_SWISS                fr_CH  LANG_FRENCH      SUBLANG_FRENCH_SWISS                LTR    "French (Swiss)"
 wxLANGUAGE_FRISIAN                     fy     -                -                                   LTR    "Frisian"
 wxLANGUAGE_GALICIAN                    gl_ES  -                -                                   LTR    "Galician"
-wxLANGUAGE_GEORGIAN                    ka     LANG_GEORGIAN    SUBLANG_DEFAULT                     LTR    "Georgian"
+wxLANGUAGE_GEORGIAN                    ka_GE  LANG_GEORGIAN    SUBLANG_DEFAULT                     LTR    "Georgian"
 wxLANGUAGE_GERMAN                      de_DE  LANG_GERMAN      SUBLANG_GERMAN                      LTR    "German"
 wxLANGUAGE_GERMAN_AUSTRIAN             de_AT  LANG_GERMAN      SUBLANG_GERMAN_AUSTRIAN             LTR    "German (Austrian)"
 wxLANGUAGE_GERMAN_BELGIUM              de_BE  -                -                                   LTR    "German (Belgium)"
@@ -118,7 +118,7 @@ wxLANGUAGE_KIRGHIZ                     ky     -                -
 wxLANGUAGE_KIRUNDI                     rn     -                -                                   LTR    "Kirundi"
 wxLANGUAGE_KONKANI                     -      LANG_KONKANI     SUBLANG_DEFAULT                     LTR    "Konkani"
 wxLANGUAGE_KOREAN                      ko_KR  LANG_KOREAN      SUBLANG_KOREAN                      LTR    "Korean"
-wxLANGUAGE_KURDISH                     ku     -                -                                   LTR    "Kurdish"
+wxLANGUAGE_KURDISH                     ku_TR  -                -                                   LTR    "Kurdish"
 wxLANGUAGE_LAOTHIAN                    lo     -                -                                   LTR    "Laothian"
 wxLANGUAGE_LATIN                       la     -                -                                   LTR    "Latin"
 wxLANGUAGE_LATVIAN                     lv_LV  LANG_LATVIAN     SUBLANG_DEFAULT                     LTR    "Latvian"
@@ -137,7 +137,7 @@ wxLANGUAGE_MARATHI                     mr_IN  LANG_MARATHI     SUBLANG_DEFAULT
 wxLANGUAGE_MOLDAVIAN                   mo     -                -                                   LTR    "Moldavian"
 wxLANGUAGE_MONGOLIAN                   mn     -                -                                   LTR    "Mongolian"
 wxLANGUAGE_NAURU                       na     -                -                                   LTR    "Nauru"
-wxLANGUAGE_NEPALI                      ne     LANG_NEPALI      SUBLANG_DEFAULT                     LTR    "Nepali"
+wxLANGUAGE_NEPALI                      ne_NP  LANG_NEPALI      SUBLANG_DEFAULT                     LTR    "Nepali"
 wxLANGUAGE_NEPALI_INDIA                ne_IN  LANG_NEPALI      SUBLANG_NEPALI_INDIA                LTR    "Nepali (India)"
 wxLANGUAGE_NORWEGIAN_BOKMAL            nb_NO  LANG_NORWEGIAN   SUBLANG_NORWEGIAN_BOKMAL            LTR    "Norwegian (Bokmal)"
 wxLANGUAGE_NORWEGIAN_NYNORSK           nn_NO  LANG_NORWEGIAN   SUBLANG_NORWEGIAN_NYNORSK           LTR    "Norwegian (Nynorsk)"
@@ -158,8 +158,11 @@ 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_CYRILLIC            sr_YU  LANG_SERBIAN     SUBLANG_SERBIAN_CYRILLIC            LTR    "Serbian (Cyrillic)"
-wxLANGUAGE_SERBIAN_LATIN               sr_YU  LANG_SERBIAN     SUBLANG_SERBIAN_LATIN               LTR    "Serbian (Latin)"
+wxLANGUAGE_SERBIAN_LATIN               sr_YU@latin LANG_SERBIAN SUBLANG_SERBIAN_LATIN              LTR    "Serbian (Latin)"
 wxLANGUAGE_SERBO_CROATIAN              sh     -                -                                   LTR    "Serbo-Croatian"
 wxLANGUAGE_SESOTHO                     st     -                -                                   LTR    "Sesotho"
 wxLANGUAGE_SETSWANA                    tn     -                -                                   LTR    "Setswana"
@@ -216,6 +219,7 @@ wxLANGUAGE_URDU_PAKISTAN               ur_PK  LANG_URDU        SUBLANG_URDU_PAKI
 wxLANGUAGE_UZBEK                       uz     LANG_UZBEK       SUBLANG_DEFAULT                     LTR    "Uzbek"
 wxLANGUAGE_UZBEK_CYRILLIC              uz     LANG_UZBEK       SUBLANG_UZBEK_CYRILLIC              LTR    "Uzbek (Cyrillic)"
 wxLANGUAGE_UZBEK_LATIN                 uz     LANG_UZBEK       SUBLANG_UZBEK_LATIN                 LTR    "Uzbek (Latin)"
+wxLANGUAGE_VALENCIAN                   ca_ES@valencia  LANG_VALENCIAN SUBLANG_DEFAULT              LTR    "Valencian"
 wxLANGUAGE_VIETNAMESE                  vi_VN  LANG_VIETNAMESE  SUBLANG_DEFAULT                     LTR    "Vietnamese"
 wxLANGUAGE_VOLAPUK                     vo     -                -                                   LTR    "Volapuk"
 wxLANGUAGE_WELSH                       cy     -                -                                   LTR    "Welsh"

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index dfc8eb3ad35ce8302ff50b93ae3793b6bfe9c78b..b224acf2d79752d81e305dbb7d4c60fc26b13b49 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -2986,6 +2986,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
 #ifndef LANG_UZBEK
 #define LANG_UZBEK (0)
 #endif
+#ifndef LANG_VALENCIAN
+#define LANG_VALENCIAN (0)
+#endif
 #ifndef LANG_VIETNAMESE
 #define LANG_VIETNAMESE (0)
 #endif
@@ -3357,7 +3360,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
    LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
    LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")
-   LNG(wxLANGUAGE_GEORGIAN,                   "ka"   , LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
+   LNG(wxLANGUAGE_GEORGIAN,                   "ka_GE", LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
    LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
    LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
    LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")
@@ -3393,7 +3396,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
    LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
    LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")
-   LNG(wxLANGUAGE_KURDISH,                    "ku"   , 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
+   LNG(wxLANGUAGE_KURDISH,                    "ku_TR", 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
    LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
    LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
    LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")
@@ -3412,7 +3415,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
    LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
    LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")
-   LNG(wxLANGUAGE_NEPALI,                     "ne"   , LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
+   LNG(wxLANGUAGE_NEPALI,                     "ne_NP", LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
    LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
    LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
    LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
@@ -3433,8 +3436,11 @@ 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_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
-   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
+   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")
    LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
    LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")
@@ -3491,6 +3497,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
    LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
    LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
+   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", LANG_VALENCIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Valencian")
    LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
    LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
    LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")