[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc i18npool/source

2019-06-18 Thread Matthias Seidel (via logerrit) 
 i18npool/inc/i18npool/lang.h|1 +
 i18npool/source/isolang/isolang.cxx |9 +
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 76c28ecc9c1faa4407dd02101aee57405b76d9d4
Author: Matthias Seidel 
AuthorDate: Tue Jun 18 09:09:30 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 18 09:09:30 2019 +

Additions for new language Amharic (am)

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index c06de7b9e030..074de5325bf1 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -110,6 +110,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_AFRIKAANS  0x0436
 #define LANGUAGE_ALBANIAN   0x041C
 #define LANGUAGE_ALSATIAN_FRANCE0x0484
+#define LANGUAGE_AMHARIC0x005E
 #define LANGUAGE_AMHARIC_ETHIOPIA   0x045E
 #define LANGUAGE_ARABIC_ALGERIA 0x1401
 #define LANGUAGE_ARABIC_BAHRAIN 0x3C01
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 250935130ffd..2cef0e44e5e5 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -86,10 +86,10 @@ struct IsoLangOtherEntry
 // language, see code. A call with "en-ZZ" (not in table) would still result in
 // LANGUAGE_ENGLISH.
 
-/* erAck: 2007-07-05T20:01+0200  TODO: The entire suite's "primary language
+/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
  * only" usage and locale fall back should be cleaned up and made consistent. I
  * strongly doubt that most callers exactly expect the behavior described.
- * Currently these primary LangIDs are used literally in OOo code:
+ * Currently these primary LangIDs are used literally in AOO code:
  * LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY
  * LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
  */
@@ -335,6 +335,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_UIGHUR_CHINA,"ug", "CN" },
 { LANGUAGE_TIGRIGNA_ETHIOPIA,   "ti", "ET" },
 { LANGUAGE_TIGRIGNA_ERITREA,"ti", "ER" },
+{ LANGUAGE_AMHARIC, "am", ""   },
 { LANGUAGE_AMHARIC_ETHIOPIA,"am", "ET" },
 { LANGUAGE_GUARANI_PARAGUAY,   "gug", "PY" },
 { LANGUAGE_HAWAIIAN_UNITED_STATES, "haw", "US" },
@@ -933,8 +934,8 @@ LanguageType MsLangId::convertIsoNamesToLanguage( const 
rtl::OUString& rLang,
 if ( pFirstLang )
 return pFirstLang->mnLang;
 
-//  if only the country is set, look for any entry matching the country
-//  (to allow reading country and language in separate steps, in any order)
+// if only the country is set, look for any entry matching the country
+// (to allow reading country and language in separate steps, in any order)
 if ( rCountry.getLength() && !rLang.getLength() )
 {
 const IsoLangEntry* pEntry2 = aImplIsoLangEntries;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc

2018-07-11 Thread Matthias Seidel 
 i18npool/inc/i18npool/paper.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 63c6156b7688d8e7f963b9ac9ff8bd21f39546bb
Author: Matthias Seidel 
Date:   Wed Jul 11 21:33:04 2018 +

Minor cleanup

diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index 3fc3217b44f8..870b718263b2 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -126,8 +126,8 @@ enum Paper
 class I18NPOOL_DLLPUBLIC PaperInfo
 {
 Paper m_eType;
-long m_nPaperWidth; // width in 100thMM
-long m_nPaperHeight;// height in 100thMM
+long m_nPaperWidth;  // width in 100thMM
+long m_nPaperHeight; // height in 100thMM
 public:
 PaperInfo(Paper eType);
 PaperInfo(long nPaperWidth, long nPaperHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc i18npool/source svtools/source

2016-08-21 Thread Andrea Pescetti 
 i18npool/inc/i18npool/lang.h|1 +
 i18npool/source/isolang/isolang.cxx |1 +
 svtools/source/misc/langtab.src |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 45a755138d81baa428252f6261b91ec655a12a65
Author: Andrea Pescetti 
Date:   Sun Aug 21 19:57:51 2016 +

#i126864# Language support: Add Venetan (vec)

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index e0bda07..c06de7b 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -517,6 +517,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_LOJBAN0x0658  /* no locale */
 #define LANGUAGE_USER_KABYLE0x0659
 #define LANGUAGE_USER_HAITIAN   0x065A
+#define LANGUAGE_USER_VENETAN   0x065B
 
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 5b4866e..648d5db 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -462,6 +462,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_LOJBAN,"jbo", ""   },
 { LANGUAGE_USER_KABYLE,"kab", "DZ" },
 { LANGUAGE_USER_HAITIAN,"ht", "HT" },
+{ LANGUAGE_USER_VENETAN,   "vec", "IT" },
 { LANGUAGE_FRENCH_HAITI,"fr", "HT" },
 { 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/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 4f7eb99..ddc6be3 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -325,6 +325,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ;
 < "Kabyle" ; LANGUAGE_USER_KABYLE ; > ;
 < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
+< "Venetan" ; LANGUAGE_USER_VENETAN ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc i18npool/source instsetoo_native/util setup_native/source solenv/bin solenv/inc

2014-07-18 Thread Jürgen Schmidt 
 i18npool/inc/i18npool/lang.h   |1 +
 i18npool/source/isolang/isolang.cxx|3 ++-
 i18npool/source/isolang/mslangid.cxx   |3 ++-
 instsetoo_native/util/pack.lst |2 +-
 setup_native/source/win32/msi-encodinglist.txt |3 ++-
 solenv/bin/modules/installer/globals.pm|1 +
 solenv/inc/langlist.mk |1 +
 7 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 472bb40bf058545fe1755d25b70cdec7a26ed4ec
Author: Jürgen Schmidt j...@apache.org
Date:   Fri Jul 18 10:55:45 2014 +

#125264# add support for ca-XR similar to ca-XV, UI support only

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 567055a..e0bda07 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -459,6 +459,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_GASCON0x0636  /* Gascon France */
 #define LANGUAGE_USER_GERMAN_BELGIUM0x8007  /* 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)) */
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 1c33955..5b4866e 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -283,7 +283,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { 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 },
diff --git a/i18npool/source/isolang/mslangid.cxx 
b/i18npool/source/isolang/mslangid.cxx
index 3db32b9..2ef84a5 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -455,9 +455,10 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( 
LanguageType nLang )
 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;
 }
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 1054d4f..6755848 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -15,5 +15,5 @@ OpenOffice_Dev_SDK  
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1
 #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