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

Rename wxLANGUAGE_CAMBODIAN to wxLANGUAGE_KHMER.

Browse Source 
Keep the old name for compatibility.

See https://github.com/wxWidgets/wxWidgets/pull/2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-11 02:52:17 +00:00
parent 4736f13d79
commit 60a3e0cc54
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/language.h
View File

@@ -78,7 +78,6 @@ enum wxLanguage
wxLANGUAGE_BRETON, wxLANGUAGE_BRETON,
wxLANGUAGE_BULGARIAN, wxLANGUAGE_BULGARIAN,
wxLANGUAGE_BURMESE, wxLANGUAGE_BURMESE,
wxLANGUAGE_CAMBODIAN,
wxLANGUAGE_CATALAN, wxLANGUAGE_CATALAN,
wxLANGUAGE_CHINESE, wxLANGUAGE_CHINESE,
wxLANGUAGE_CHINESE_SIMPLIFIED, wxLANGUAGE_CHINESE_SIMPLIFIED,
@@ -154,6 +153,7 @@ enum wxLanguage
wxLANGUAGE_KASHMIRI_INDIA, wxLANGUAGE_KASHMIRI_INDIA,
wxLANGUAGE_KAZAKH, wxLANGUAGE_KAZAKH,
wxLANGUAGE_KERNEWEK, wxLANGUAGE_KERNEWEK,
wxLANGUAGE_KHMER,
wxLANGUAGE_KINYARWANDA, wxLANGUAGE_KINYARWANDA,
wxLANGUAGE_KIRGHIZ, wxLANGUAGE_KIRGHIZ,
wxLANGUAGE_KIRUNDI, wxLANGUAGE_KIRUNDI,
@@ -270,6 +270,9 @@ enum wxLanguage
wxLANGUAGE_ZHUANG, wxLANGUAGE_ZHUANG,
wxLANGUAGE_ZULU, wxLANGUAGE_ZULU,
/// Obsolete synonym.
wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER,
/// For custom, user-defined languages. /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED wxLANGUAGE_USER_DEFINED
}; };

5
interface/wx/language.h
View File

@@ -63,7 +63,6 @@ enum wxLanguage
wxLANGUAGE_BRETON, wxLANGUAGE_BRETON,
wxLANGUAGE_BULGARIAN, wxLANGUAGE_BULGARIAN,
wxLANGUAGE_BURMESE, wxLANGUAGE_BURMESE,
wxLANGUAGE_CAMBODIAN,
wxLANGUAGE_CATALAN, wxLANGUAGE_CATALAN,
wxLANGUAGE_CHINESE, wxLANGUAGE_CHINESE,
wxLANGUAGE_CHINESE_SIMPLIFIED, wxLANGUAGE_CHINESE_SIMPLIFIED,
@@ -139,6 +138,7 @@ enum wxLanguage
wxLANGUAGE_KASHMIRI_INDIA, wxLANGUAGE_KASHMIRI_INDIA,
wxLANGUAGE_KAZAKH, wxLANGUAGE_KAZAKH,
wxLANGUAGE_KERNEWEK, wxLANGUAGE_KERNEWEK,
wxLANGUAGE_KHMER,
wxLANGUAGE_KINYARWANDA, wxLANGUAGE_KINYARWANDA,
wxLANGUAGE_KIRGHIZ, wxLANGUAGE_KIRGHIZ,
wxLANGUAGE_KIRUNDI, wxLANGUAGE_KIRUNDI,
@@ -255,6 +255,9 @@ enum wxLanguage
wxLANGUAGE_ZHUANG, wxLANGUAGE_ZHUANG,
wxLANGUAGE_ZULU, wxLANGUAGE_ZULU,
/// Obsolete synonym.
wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER,
/// For custom, user-defined languages. /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED wxLANGUAGE_USER_DEFINED
}; };

3
misc/languages/genlang.py
View File

@@ -48,6 +48,9 @@ enum wxLanguage
f.write(' %s,\n' % i[0]) f.write(' %s,\n' % i[0])
knownLangs.append(i[0]) knownLangs.append(i[0])
f.write(""" f.write("""
/// Obsolete synonym.
wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER,
/// For custom, user-defined languages. /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED wxLANGUAGE_USER_DEFINED
}; };

2
misc/languages/langtabl.txt
View File

@@ -39,7 +39,6 @@ wxLANGUAGE_BOSNIAN bs LANG_BOSNIAN SUBLANG_BOSNIAN_B
wxLANGUAGE_BRETON br - - LTR "Breton" wxLANGUAGE_BRETON br - - LTR "Breton"
wxLANGUAGE_BULGARIAN bg_BG LANG_BULGARIAN SUBLANG_DEFAULT LTR "Bulgarian" wxLANGUAGE_BULGARIAN bg_BG LANG_BULGARIAN SUBLANG_DEFAULT LTR "Bulgarian"
wxLANGUAGE_BURMESE my - - LTR "Burmese" wxLANGUAGE_BURMESE my - - LTR "Burmese"
wxLANGUAGE_CAMBODIAN km - - LTR "Cambodian"
wxLANGUAGE_CATALAN ca_ES LANG_CATALAN SUBLANG_DEFAULT LTR "Catalan" wxLANGUAGE_CATALAN ca_ES LANG_CATALAN SUBLANG_DEFAULT LTR "Catalan"
wxLANGUAGE_CHINESE zh_TW LANG_CHINESE SUBLANG_DEFAULT LTR "Chinese" wxLANGUAGE_CHINESE zh_TW LANG_CHINESE SUBLANG_DEFAULT LTR "Chinese"
wxLANGUAGE_CHINESE_SIMPLIFIED zh_CN LANG_CHINESE SUBLANG_CHINESE_SIMPLIFIED LTR "Chinese (Simplified)" wxLANGUAGE_CHINESE_SIMPLIFIED zh_CN LANG_CHINESE SUBLANG_CHINESE_SIMPLIFIED LTR "Chinese (Simplified)"
@@ -115,6 +114,7 @@ wxLANGUAGE_KASHMIRI ks LANG_KASHMIRI SUBLANG_DEFAULT
wxLANGUAGE_KASHMIRI_INDIA ks_IN LANG_KASHMIRI SUBLANG_KASHMIRI_INDIA LTR "Kashmiri (India)" wxLANGUAGE_KASHMIRI_INDIA ks_IN LANG_KASHMIRI SUBLANG_KASHMIRI_INDIA LTR "Kashmiri (India)"
wxLANGUAGE_KAZAKH kk LANG_KAZAK SUBLANG_DEFAULT LTR "Kazakh" wxLANGUAGE_KAZAKH kk LANG_KAZAK SUBLANG_DEFAULT LTR "Kazakh"
wxLANGUAGE_KERNEWEK kw_GB - - LTR "Kernewek" wxLANGUAGE_KERNEWEK kw_GB - - LTR "Kernewek"
wxLANGUAGE_KHMER km - - LTR "Khmer"
wxLANGUAGE_KINYARWANDA rw - - LTR "Kinyarwanda" wxLANGUAGE_KINYARWANDA rw - - LTR "Kinyarwanda"
wxLANGUAGE_KIRGHIZ ky - - LTR "Kirghiz" wxLANGUAGE_KIRGHIZ ky - - LTR "Kirghiz"
wxLANGUAGE_KIRUNDI rn - - LTR "Kirundi" wxLANGUAGE_KIRUNDI rn - - LTR "Kirundi"

2
src/common/languageinfo.cpp
View File

@@ -592,7 +592,6 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_BRETON, "br" , 0 , 0 , wxLayout_LeftToRight, "Breton") LNG(wxLANGUAGE_BRETON, "br" , 0 , 0 , wxLayout_LeftToRight, "Breton")
LNG(wxLANGUAGE_BULGARIAN, "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Bulgarian") LNG(wxLANGUAGE_BULGARIAN, "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Bulgarian")
LNG(wxLANGUAGE_BURMESE, "my" , 0 , 0 , wxLayout_LeftToRight, "Burmese") LNG(wxLANGUAGE_BURMESE, "my" , 0 , 0 , wxLayout_LeftToRight, "Burmese")
LNG(wxLANGUAGE_CAMBODIAN, "km" , 0 , 0 , wxLayout_LeftToRight, "Cambodian")
LNG(wxLANGUAGE_CATALAN, "ca_ES", LANG_CATALAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Catalan") LNG(wxLANGUAGE_CATALAN, "ca_ES", LANG_CATALAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Catalan")
LNG(wxLANGUAGE_CHINESE, "zh_TW", LANG_CHINESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Chinese") LNG(wxLANGUAGE_CHINESE, "zh_TW", LANG_CHINESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Chinese")
LNG(wxLANGUAGE_CHINESE_SIMPLIFIED, "zh_CN", LANG_CHINESE , SUBLANG_CHINESE_SIMPLIFIED , wxLayout_LeftToRight, "Chinese (Simplified)") LNG(wxLANGUAGE_CHINESE_SIMPLIFIED, "zh_CN", LANG_CHINESE , SUBLANG_CHINESE_SIMPLIFIED , wxLayout_LeftToRight, "Chinese (Simplified)")
@@ -668,6 +667,7 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)") LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)")
LNG(wxLANGUAGE_KAZAKH, "kk" , LANG_KAZAK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kazakh") LNG(wxLANGUAGE_KAZAKH, "kk" , LANG_KAZAK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kazakh")
LNG(wxLANGUAGE_KERNEWEK, "kw_GB", 0 , 0 , wxLayout_LeftToRight, "Kernewek") LNG(wxLANGUAGE_KERNEWEK, "kw_GB", 0 , 0 , wxLayout_LeftToRight, "Kernewek")
LNG(wxLANGUAGE_KHMER, "km" , 0 , 0 , wxLayout_LeftToRight, "Khmer")
LNG(wxLANGUAGE_KINYARWANDA, "rw" , 0 , 0 , wxLayout_LeftToRight, "Kinyarwanda") LNG(wxLANGUAGE_KINYARWANDA, "rw" , 0 , 0 , wxLayout_LeftToRight, "Kinyarwanda")
LNG(wxLANGUAGE_KIRGHIZ, "ky" , 0 , 0 , wxLayout_LeftToRight, "Kirghiz") LNG(wxLANGUAGE_KIRGHIZ, "ky" , 0 , 0 , wxLayout_LeftToRight, "Kirghiz")
LNG(wxLANGUAGE_KIRUNDI, "rn" , 0 , 0 , wxLayout_LeftToRight, "Kirundi") LNG(wxLANGUAGE_KIRUNDI, "rn" , 0 , 0 , wxLayout_LeftToRight, "Kirundi")