i18npool/inc/i18npool/lang.h | 1 + i18npool/source/isolang/isolang.cxx | 1 + i18npool/source/isolang/langid.pl | 4 ++-- i18npool/source/isolang/mslangid.cxx | 2 ++ scp2/source/ooo/file_ooo.scp | 1 + setup_native/source/win32/msi-encodinglist.txt | 3 ++- solenv/bin/modules/installer/globals.pm | 5 +++-- solenv/inc/langlist.mk | 2 ++ svtools/source/misc/langtab.src | 1 + 9 files changed, 15 insertions(+), 5 deletions(-)
New commits: commit d0bb67f5df45ed9ee1f152677d7104b7129052e8 Author: Eike Rathke <er...@redhat.com> Date: Wed Jan 4 14:40:39 2012 +0100 added Kyrgyz (China) [ky-CN] to language list diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index c2b733a..177d2a7 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -537,6 +537,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_ARAGONESE 0x0665 #define LANGUAGE_USER_KEYID 0x0666 /* key id pseudolanguage */ #define LANGUAGE_USER_PALI_LATIN 0x0667 +#define LANGUAGE_USER_KYRGYZ_CHINA 0x0668 /* not derived from LANGUAGE_KIRGHIZ as these may be different scripts, see http://www.omniglot.com/writing/kirghiz.htm */ #endif /* INCLUDED_I18NPOOL_LANG_H */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index f9f7b49..610ea7f 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -482,6 +482,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_ARAGONESE, "an", "ES" }, { LANGUAGE_USER_KEYID, "qtz", "" }, // key id pseudolanguage used for UI testing { LANGUAGE_USER_PALI_LATIN, "pli", "" }, // Pali with Latin script + { LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN" }, { LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 59a37ed..3cd877e 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -240,6 +240,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang ) case LANGUAGE_KASHMIRI & LANGUAGE_MASK_PRIMARY : case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY : case LANGUAGE_UIGHUR_CHINA & LANGUAGE_MASK_PRIMARY : + case LANGUAGE_USER_KYRGYZ_CHINA & LANGUAGE_MASK_PRIMARY : return true; default: @@ -344,6 +345,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang ) case LANGUAGE_USER_MAITHILI_INDIA: case LANGUAGE_UIGHUR_CHINA: case LANGUAGE_USER_LIMBU: + case LANGUAGE_USER_KYRGYZ_CHINA: nScript = ::com::sun::star::i18n::ScriptType::COMPLEX; break; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a3dd222..4876614 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -683,6 +683,7 @@ File gid_File_Share_Registry_Ctl_Xcd Name (he) = "ctl.xcd"; Name (hi) = "ctl.xcd"; Name (km) = "ctl.xcd"; + Name (ky-CN) = "ctl.xcd"; Name (lo) = "ctl.xcd"; Name (my) = "ctl.xcd"; Name (ne) = "ctl.xcd"; diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index ed21cac..936adb4 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -64,7 +64,8 @@ ko 949 1042 kok 0 1111 # Konkani ks 0 1120 # Kashmiri ku 0 1574 -ky 0 2100 +ky 0 1088 # Kyrgyz +ky-CN 0 1640 # Kyrgyz (China) lb 1252 1134 lo 0 1108 # Lao lt 1257 1063 # Lithuanian diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 8c08f43..ea352ba 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -95,10 +95,11 @@ BEGIN "ny", "so", "kab", - "tk" + "tk", + "ky-CN" ); @items_at_modules = ("Files", "Dirs", "Unixlinks"); - @rtllanguages = ("ar", "fa", "he", "ug"); + @rtllanguages = ("ar", "fa", "he", "ug", "ky-CN"); $ziplistname = ""; $pathfilename = ""; diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index f044711..aa4e9ed 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -76,6 +76,8 @@ ko \ kok \ ks \ ku \ +ky \ +ky-CN \ lb \ lo \ lt \ diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index b82e0f4..01b2846 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -343,6 +343,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Vili" ; LANGUAGE_USER_VILI ; > ; < "KeyID" ; LANGUAGE_USER_KEYID ; > ; < "Pali Latin" ; LANGUAGE_USER_PALI_LATIN ; > ; + < "Kyrgyz (China)" ; LANGUAGE_USER_KYRGYZ_CHINA ; > ; }; }; commit 898823e2decbbd41a674ac549e30d1d76b000283 Author: Eike Rathke <er...@redhat.com> Date: Wed Jan 4 14:27:42 2012 +0100 completelangiso is now in solenv/inc/langlist.mk diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl index 9787309..810e83f 100755 --- a/i18npool/source/isolang/langid.pl +++ b/i18npool/source/isolang/langid.pl @@ -39,7 +39,7 @@ sub Usage() "\n", "langid - a hackish utility to lookup lang.h language defines and LangIDs,\n", "isolang.cxx ISO639/ISO3166 mapping, locale data files, langtab.src language\n", - "listbox entries, postset.mk, file_ooo.scp registry name, globals.pm and\n", + "listbox entries, langlist.mk, file_ooo.scp registry name, globals.pm and\n", "msi-encodinglist.txt\n\n", "Usage: $0 [--single] {language string} | {LangID} | {primarylanguage sublanguage} | {language-country}\n\n", @@ -402,7 +402,7 @@ sub main() # completelangiso=af ar as-IN ... zu grepFile( '^\s*completelangiso\s*=\s*(\s*([a-z]{2,3})(-[A-Z][A-Z])?)*' . $langcoun . '', - "$SRC_ROOT", "solenv", "inc/postset.mk", + "$SRC_ROOT", "solenv", "inc/langlist.mk", # needs a duplicated pair of backslashes to produce a literal \\ ('^\s*completelangiso\s*=', '^\s*$', '^\s*' . $langcoun . '\s*\\\\*$')); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits