Author: jsc
Date: Fri Jul 18 12:59:49 2014
New Revision: 1611634
URL: http://svn.apache.org/r1611634
Log:
#125264# merge lang support for ca-XR
Modified:
openoffice/branches/AOO410/main/i18npool/inc/i18npool/lang.h
openoffice/branches/AOO410/main/i18npool/source/isolang/isolang.cxx
openoffice/branches/AOO410/main/i18npool/source/isolang/mslangid.cxx
openoffice/branches/AOO410/main/instsetoo_native/util/pack.lst
openoffice/branches/AOO410/main/setup_native/source/win32/msi-encodinglist.txt
openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
openoffice/branches/AOO410/main/solenv/inc/langlist.mk
Modified: openoffice/branches/AOO410/main/i18npool/inc/i18npool/lang.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/i18npool/inc/i18npool/lang.h?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/i18npool/inc/i18npool/lang.h (original)
+++ openoffice/branches/AOO410/main/i18npool/inc/i18npool/lang.h Fri Jul 18
12:59:49 2014
@@ -459,6 +459,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_GASCON 0x0636 /* Gascon France */
#define LANGUAGE_USER_GERMAN_BELGIUM 0x8007 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_GERMAN)) */
#define LANGUAGE_USER_CATALAN_VALENCIAN 0x8003 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_CATALAN)) */
+#define LANGUAGE_USER_CATALAN_VALENCIAN_RACV 0x8004 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_CATALAN)) */
#define LANGUAGE_USER_HAUSA_GHANA 0x8068 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_HAUSA_NIGERIA)) */
#define LANGUAGE_USER_EWE_GHANA 0x0637
#define LANGUAGE_USER_ENGLISH_GHANA 0x8409 /* makeLangID( 0x21,
getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */
Modified: openoffice/branches/AOO410/main/i18npool/source/isolang/isolang.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/i18npool/source/isolang/isolang.cxx?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/i18npool/source/isolang/isolang.cxx
(original)
+++ openoffice/branches/AOO410/main/i18npool/source/isolang/isolang.cxx Fri Jul
18 12:59:49 2014
@@ -283,7 +283,8 @@ static MsLangId::IsoLangEntry const aImp
{ LANGUAGE_BELARUSIAN, "be", "BY" },
{ LANGUAGE_CATALAN, "ca", "ES" }, // Spain (default)
{ LANGUAGE_CATALAN, "ca", "AD" }, // Andorra
- { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "XV" }, //
XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in
document content!
+ { LANGUAGE_USER_CATALAN_VALENCIAN_RACV, "ca", "XR" }, // XR: ISO ????
user-assigned; workaround for UI localization only, do not use in document
content!
+ { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "XV" }, // XV: ISO 3166
user-assigned; workaround for UI localization only, do not use in document
content!
{ LANGUAGE_CATALAN, "qcv", "ES" }, // qcv: ISO 639-3
reserved-for-local-use; UI localization quirk only, do not use in document
content!
// { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "ES" }, // In case MS
format files escaped into the wild, map them back.
{ LANGUAGE_FRENCH_CAMEROON, "fr", "CM" },
Modified: openoffice/branches/AOO410/main/i18npool/source/isolang/mslangid.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/i18npool/source/isolang/mslangid.cxx?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/i18npool/source/isolang/mslangid.cxx
(original)
+++ openoffice/branches/AOO410/main/i18npool/source/isolang/mslangid.cxx Fri
Jul 18 12:59:49 2014
@@ -455,9 +455,10 @@ LanguageType MsLangId::getReplacementFor
nLang = LANGUAGE_SPANISH_MODERN;
break;
- // Do not use ca-XV for document content.
+ // Do not use ca-XV, ca-XR for document content.
/* TODO: remove in case we implement BCP47 language tags. */
case LANGUAGE_USER_CATALAN_VALENCIAN:
+ case LANGUAGE_USER_CATALAN_VALENCIAN_RACV:
nLang = LANGUAGE_CATALAN;
break;
}
Modified: openoffice/branches/AOO410/main/instsetoo_native/util/pack.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/instsetoo_native/util/pack.lst?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/instsetoo_native/util/pack.lst (original)
+++ openoffice/branches/AOO410/main/instsetoo_native/util/pack.lst Fri Jul 18
12:59:49 2014
@@ -16,5 +16,5 @@ OpenOffice_Dev_SDK unxlngi6.pro,unxmacx
#URE
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12
en-US ure
OpenOfficeLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro
de|ja ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi
de ooolanguagepack
-OpenOfficeDevLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro
ar|as|ast|be-BY|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW
ooodevlanguagepack
+OpenOfficeDevLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro
ar|as|ast|be-BY|bg|bn|ca|ca-XR|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW
ooodevlanguagepack
Modified:
openoffice/branches/AOO410/main/setup_native/source/win32/msi-encodinglist.txt
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/setup_native/source/win32/msi-encodinglist.txt?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/setup_native/source/win32/msi-encodinglist.txt
(original)
+++
openoffice/branches/AOO410/main/setup_native/source/win32/msi-encodinglist.txt
Fri Jul 18 12:59:49 2014
@@ -36,7 +36,8 @@ br 1252 1150 # Breton
brx 0 1603 # Bodo (India)
bs 0 5146 # bosnian
ca 1252 1027 # Catalan
-ca-XV 1252 32771 # Catalan Valencian
+ca-XR 1252 32772 # Catalan Valencian RACV
+ca-XV 1252 32771 # Catalan Valencian AVL
cs 1250 1029 # Czech
cy 1252 1106 # Welsh
da 1252 1030
Modified:
openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
(original)
+++ openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm Fri
Jul 18 12:59:49 2014
@@ -78,6 +78,7 @@ BEGIN
"kok",
"mni",
"ca-XV",
+ "ca-XR",
"sat",
"ug",
"om",
Modified: openoffice/branches/AOO410/main/solenv/inc/langlist.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/langlist.mk?rev=1611634&r1=1611633&r2=1611634&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/langlist.mk (original)
+++ openoffice/branches/AOO410/main/solenv/inc/langlist.mk Fri Jul 18 12:59:49
2014
@@ -37,6 +37,7 @@ bn-IN \
bs \
by \
ca \
+ca-XR \
ca-XV \
cs \
cy \
