Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Norwegian Bokmal code to conform to new ISO 639-2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-04-30 22:48:01 +00:00
parent c0ef107e6b
commit cf5e94bc6d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/languages/langtabl.txt
View File

@@ -139,7 +139,7 @@ wxLANGUAGE_MONGOLIAN mn - -
wxLANGUAGE_NAURU na - - "Nauru"
wxLANGUAGE_NEPALI ne LANG_NEPALI SUBLANG_DEFAULT "Nepali"
wxLANGUAGE_NEPALI_INDIA ne_IN LANG_NEPALI SUBLANG_NEPALI_INDIA "Nepali (India)"
wxLANGUAGE_NORWEGIAN_BOKMAL no_NO LANG_NORWEGIAN SUBLANG_NORWEGIAN_BOKMAL "Norwegian (Bokmal)"
wxLANGUAGE_NORWEGIAN_BOKMAL nb_NO LANG_NORWEGIAN SUBLANG_NORWEGIAN_BOKMAL "Norwegian (Bokmal)"
wxLANGUAGE_NORWEGIAN_NYNORSK nn_NO LANG_NORWEGIAN SUBLANG_NORWEGIAN_NYNORSK "Norwegian (Nynorsk)"
wxLANGUAGE_OCCITAN oc - - "Occitan"
wxLANGUAGE_ORIYA or LANG_ORIYA SUBLANG_DEFAULT "Oriya"

18
src/common/intl.cpp
View File

@@ -696,6 +696,10 @@ bool wxLocale::Init(int language, int flags)
locale = wxT("in") + locale.Mid(3);
else if (mid == wxT("yi"))
locale = wxT("ji") + locale.Mid(3);
else if (mid == wxT("nb"))
locale = wxT("no_NO");
else if (mid == wxT("nn"))
locale = wxT("no_NY");
retloc = wxSetlocale(LC_ALL, locale);
}
@@ -892,10 +896,16 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
wxString lang;
if ( langOrig == wxT("iw"))
lang = _T("he");
else if ( langOrig == wxT("in") )
else if (langOrig == wxT("in"))
lang = wxT("id");
else if ( langOrig == wxT("ji") )
else if (langOrig == wxT("ji"))
lang = wxT("yi");
else if (langOrig == wxT("no_NO"))
lang = wxT("nb_NO");
else if (langOrig == wxT("no_NY"))
lang = wxT("nn_NO");
else if (langOrig == wxT("no"))
lang = wxT("nb_NO");
else
lang = langOrig;
@@ -991,7 +1001,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
lc = wxT("fr_CA") ;
break ;
case verNorway:
lc = wxT("no_NO") ;
lc = wxT("nb_NO") ;
break ;
case verIsrael:
lc = wxT("iw_IL") ;
@@ -2340,7 +2350,7 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_NAURU, "na" , 0 , 0 , "Nauru")
LNG(wxLANGUAGE_NEPALI, "ne" , LANG_NEPALI , SUBLANG_DEFAULT , "Nepali")
LNG(wxLANGUAGE_NEPALI_INDIA, "ne_IN", LANG_NEPALI , SUBLANG_NEPALI_INDIA , "Nepali (India)")
LNG(wxLANGUAGE_NORWEGIAN_BOKMAL, "no_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL , "Norwegian (Bokmal)")
LNG(wxLANGUAGE_NORWEGIAN_BOKMAL, "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL , "Norwegian (Bokmal)")
LNG(wxLANGUAGE_NORWEGIAN_NYNORSK, "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK , "Norwegian (Nynorsk)")
LNG(wxLANGUAGE_OCCITAN, "oc" , 0 , 0 , "Occitan")
LNG(wxLANGUAGE_ORIYA, "or" , LANG_ORIYA , SUBLANG_DEFAULT , "Oriya")