diff --git a/docs/latex/wx/langcodes.tex b/docs/latex/wx/langcodes.tex index ecd2f791ab..46b2624203 100644 --- a/docs/latex/wx/langcodes.tex +++ b/docs/latex/wx/langcodes.tex @@ -168,6 +168,7 @@ in \helpref{wxLocale::Init}{wxlocaleinit} and are returned by \twocolitem{wxLANGUAGE\_ROMANIAN}{} \twocolitem{wxLANGUAGE\_RUSSIAN}{} \twocolitem{wxLANGUAGE\_RUSSIAN\_UKRAINE}{} +\twocolitem{wxLANGUAGE\_SAMI}{} \twocolitem{wxLANGUAGE\_SAMOAN}{} \twocolitem{wxLANGUAGE\_SANGHO}{} \twocolitem{wxLANGUAGE\_SANSKRIT}{} diff --git a/include/wx/intl.h b/include/wx/intl.h index 321479c564..f0fbcc518d 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -236,6 +236,7 @@ enum wxLanguage wxLANGUAGE_ROMANIAN, wxLANGUAGE_RUSSIAN, wxLANGUAGE_RUSSIAN_UKRAINE, + wxLANGUAGE_SAMI, wxLANGUAGE_SAMOAN, wxLANGUAGE_SANGHO, wxLANGUAGE_SANSKRIT, diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt index 94a34cbbc3..bf7ab86408 100644 --- a/misc/languages/langtabl.txt +++ b/misc/languages/langtabl.txt @@ -154,6 +154,7 @@ wxLANGUAGE_RHAETO_ROMANCE rm - - wxLANGUAGE_ROMANIAN ro_RO LANG_ROMANIAN SUBLANG_DEFAULT LTR "Romanian" wxLANGUAGE_RUSSIAN ru_RU LANG_RUSSIAN SUBLANG_DEFAULT LTR "Russian" wxLANGUAGE_RUSSIAN_UKRAINE ru_UA - - LTR "Russian (Ukraine)" +wxLANGUAGE_SAMI se_NO LANG_SAMI SUBLANG_DEFAULT LTR "Northern Sami" wxLANGUAGE_SAMOAN sm - - LTR "Samoan" wxLANGUAGE_SANGHO sg - - LTR "Sangho" wxLANGUAGE_SANSKRIT sa LANG_SANSKRIT SUBLANG_DEFAULT LTR "Sanskrit" diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 74bafc2ce9..a79904e894 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2181,7 +2181,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix) lc = wxT("lv_LV") ; break ; case verSami: - // not known + lc = wxT("se_NO") ; break ; case verFaroeIsl: lc = wxT("fo_FO") ; @@ -3197,6 +3197,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule) #ifndef LANG_RUSSIAN #define LANG_RUSSIAN (0) #endif +#ifndef LANG_SAMI +#define LANG_SAMI (0) +#endif #ifndef LANG_SANSKRIT #define LANG_SANSKRIT (0) #endif @@ -3695,6 +3698,7 @@ 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_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)")