i18nlangtag/source/isolang/isolang.cxx | 13 +++++--------
i18nlangtag/source/isolang/mslangid.cxx | 7 +++----
include/i18nlangtag/lang.h | 3 ---
vcl/source/gdi/sallayout.cxx | 2 +-
4 files changed, 9 insertions(+), 16 deletions(-)
New commits:
commit f6f49b8085e0069697c13494e490e37bb1044a41
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 22:53:51 2013 +0200
isKorean() never returned true
because it compared the primary language with the combined primary and
sub language
Change-Id: I09f8ee5c6f00a98e0b2bc3045caeaef6f0f86794
diff --git a/i18nlangtag/source/isolang/mslangid.cxx
b/i18nlangtag/source/isolang/mslangid.cxx
index 977a24f..1a0c68e 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -256,13 +256,13 @@ bool MsLangId::isTraditionalChinese( const
::com::sun::star::lang::Locale & rLoc
//static
bool MsLangId::isChinese( LanguageType nLang )
{
- return MsLangId::getPrimaryLanguage(nLang) == LANGUAGE_CHINESE;
+ return MsLangId::getPrimaryLanguage(nLang) ==
MsLangId::getPrimaryLanguage(LANGUAGE_CHINESE);
}
//static
bool MsLangId::isKorean( LanguageType nLang )
{
- return MsLangId::getPrimaryLanguage(nLang) == LANGUAGE_KOREAN;
+ return MsLangId::getPrimaryLanguage(nLang) ==
MsLangId::getPrimaryLanguage(LANGUAGE_KOREAN);
}
// static
commit 6626ca9c30ecf2ad5ee53d5ca47a6dfae087cba3
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 22:26:19 2013 +0200
Pali should be ISO 639-1 'pi' not 639-3 'pli'
Change-Id: Ifea43b20aacdb54eec9be25d349daa1a19ae26b4
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index cc611ef..6c39bde 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -521,7 +521,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_MANX, "gv", "GB" },
{ 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_PALI_LATIN, "pi", "" }, // Pali with Latin
script, ISO 639-1
+ { LANGUAGE_USER_PALI_LATIN, "pli", "" }, // Pali with Latin
script, ISO 639-3 (sigh..) back-compat
{ LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN" },
{ LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU" },
{ LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU" },
commit c8cfda297691b793048b67affe7b1db08e028c6d
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 22:09:40 2013 +0200
added LANGUAGE_KASHMIRI as "known no country" locale
Change-Id: I6e6cc53fb7ed07876aba4bfb6d847bb49e076fc3
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 8adaba7..cc611ef 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -302,8 +302,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_GUJARATI, "gu", "IN" },
{ LANGUAGE_KANNADA, "kn", "IN" },
{ LANGUAGE_ASSAMESE, "as", "IN" },
- { LANGUAGE_KASHMIRI, "ks", "" }, // Kashmiri in
"Jammu and Kashmir" ... no ISO3166 code for that
{ LANGUAGE_KASHMIRI_INDIA, "ks", "IN" },
+ { LANGUAGE_KASHMIRI, "ks", "" }, // Kashmiri in
"Jammu and Kashmir" ... no ISO3166 code for that
{ LANGUAGE_MALAYALAM, "ml", "IN" },
{ LANGUAGE_MANIPURI, "mni", "IN" },
{ LANGUAGE_MARATHI, "mr", "IN" },
@@ -870,6 +870,7 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl(
LanguageType nLang,
case LANGUAGE_USER_ESPERANTO:
case LANGUAGE_USER_INTERLINGUA:
case LANGUAGE_USER_LOJBAN:
+ case LANGUAGE_KASHMIRI:
return pEntry->getLocale();
default:
; // nothing
commit e0dc2e0c474010a7d52aa6fe3612e74eca603a0e
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 21:56:48 2013 +0200
LANGUAGE_KASHMIRI is not a primary-only LangID
Change-Id: I0195d775b51b2a258dd7a561cd7b6f063ca382c8
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index fb746e8..8adaba7 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -135,7 +135,6 @@ struct IsoLangOtherEntry
* strongly doubt that most callers exactly expect the behavior described.
* Currently these primary LangIDs are used literally in OOo code:
* LANGUAGE_ENGLISH LANGUAGE_CHINESE
- * LANGUAGE_KASHMIRI
*/
static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
@@ -303,7 +302,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_GUJARATI, "gu", "IN" },
{ LANGUAGE_KANNADA, "kn", "IN" },
{ LANGUAGE_ASSAMESE, "as", "IN" },
- { LANGUAGE_KASHMIRI, "ks", "" },
+ { LANGUAGE_KASHMIRI, "ks", "" }, // Kashmiri in
"Jammu and Kashmir" ... no ISO3166 code for that
{ LANGUAGE_KASHMIRI_INDIA, "ks", "IN" },
{ LANGUAGE_MALAYALAM, "ml", "IN" },
{ LANGUAGE_MANIPURI, "mni", "IN" },
commit 6419c032307b72ba58d142c7848e09a0f62dcdaf
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 21:27:01 2013 +0200
removed primary-only LANGUAGE_URDU
Change-Id: Ieaba4362fafeecd2d20bff63531783f5e33662f7
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index b6a575b..fb746e8 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -135,7 +135,7 @@ struct IsoLangOtherEntry
* strongly doubt that most callers exactly expect the behavior described.
* Currently these primary LangIDs are used literally in OOo code:
* LANGUAGE_ENGLISH LANGUAGE_CHINESE
- * LANGUAGE_URDU LANGUAGE_KASHMIRI
+ * LANGUAGE_KASHMIRI
*/
static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
@@ -297,7 +297,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_BURMESE, "my", "MM" },
{ LANGUAGE_KAZAKH, "kk", "KZ" },
{ LANGUAGE_ENGLISH_INDIA, "en", "IN" },
- { LANGUAGE_URDU, "ur", "" },
{ LANGUAGE_URDU_INDIA, "ur", "IN" },
{ LANGUAGE_URDU_PAKISTAN, "ur", "PK" },
{ LANGUAGE_HINDI, "hi", "IN" },
diff --git a/i18nlangtag/source/isolang/mslangid.cxx
b/i18nlangtag/source/isolang/mslangid.cxx
index 8f398e5..977a24f 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -204,7 +204,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
case LANGUAGE_ARABIC_SAUDI_ARABIA & LANGUAGE_MASK_PRIMARY :
case LANGUAGE_HEBREW & LANGUAGE_MASK_PRIMARY :
case LANGUAGE_YIDDISH & LANGUAGE_MASK_PRIMARY :
- case LANGUAGE_URDU & LANGUAGE_MASK_PRIMARY :
+ case LANGUAGE_URDU_PAKISTAN & LANGUAGE_MASK_PRIMARY :
case LANGUAGE_FARSI & LANGUAGE_MASK_PRIMARY :
case LANGUAGE_KASHMIRI & LANGUAGE_MASK_PRIMARY :
case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY :
@@ -362,7 +362,6 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_TIBETAN:
case LANGUAGE_DZONGKHA:
case LANGUAGE_USER_TIBETAN_INDIA:
- case LANGUAGE_URDU:
case LANGUAGE_URDU_PAKISTAN:
case LANGUAGE_URDU_INDIA:
case LANGUAGE_USER_KURDISH_IRAQ:
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 3149338..f886557 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -357,7 +357,6 @@ typedef unsigned short LanguageType;
#define LANGUAGE_TURKMEN 0x0442
#define LANGUAGE_UIGHUR_CHINA 0x0480
#define LANGUAGE_UKRAINIAN 0x0422
-#define LANGUAGE_URDU 0x0020 /* primary only, not a
locale! */
#define LANGUAGE_URDU_INDIA 0x0820
#define LANGUAGE_URDU_PAKISTAN 0x0420
#define LANGUAGE_UZBEK_CYRILLIC 0x0843
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index c6b8a30..4abdc26 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -251,7 +251,7 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar,
LanguageType eLang )
nOffset = 0x0660 - '0'; // arabic-indic digits
break;
case LANGUAGE_FARSI & LANGUAGE_MASK_PRIMARY:
- case LANGUAGE_URDU & LANGUAGE_MASK_PRIMARY:
+ case LANGUAGE_URDU_PAKISTAN & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_PUNJABI & LANGUAGE_MASK_PRIMARY: //???
case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY:
nOffset = 0x06F0 - '0'; // eastern arabic-indic digits
commit dbbed520c2ca4cf8c1ca382fc1cad960835747ef
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 21:13:12 2013 +0200
removed unused primary-only LANGUAGE_AZERI
Change-Id: I7db415b82fd7e7dc97cc69f8192e7660448d6e9f
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 51830d3..b6a575b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -135,7 +135,7 @@ struct IsoLangOtherEntry
* strongly doubt that most callers exactly expect the behavior described.
* Currently these primary LangIDs are used literally in OOo code:
* LANGUAGE_ENGLISH LANGUAGE_CHINESE
- * LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
+ * LANGUAGE_URDU LANGUAGE_KASHMIRI
*/
static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
@@ -288,7 +288,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA, "sh", "BA" },
{ LANGUAGE_SERBIAN_LATIN_NEUTRAL, "sh", "" }, // kludge,
needed to be sr_Latn instead, script codes not supported yet
{ LANGUAGE_ARMENIAN, "hy", "AM" },
- { LANGUAGE_AZERI, "az", "" },
{ LANGUAGE_AZERI_LATIN, "az", "AZ" },
// { LANGUAGE_AZERI_CYRILLIC, "az", "AZ" }, // script codes
not supported yet
{ LANGUAGE_UZBEK_LATIN, "uz", "UZ" },
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 3983440..3149338 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -126,7 +126,6 @@ typedef unsigned short LanguageType;
#define LANGUAGE_ARABIC_PRIMARY_ONLY 0x0001 /* primary only, not a
locale! */
#define LANGUAGE_ARMENIAN 0x042B
#define LANGUAGE_ASSAMESE 0x044D
-#define LANGUAGE_AZERI 0x002C /* primary only, not a
locale! */
#define LANGUAGE_AZERI_CYRILLIC 0x082C
#define LANGUAGE_AZERI_LATIN 0x042C
#define LANGUAGE_BASHKIR_RUSSIA 0x046D
commit 16c4e7aaf131e7f1d16a2f97728d8a0caaacba92
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 21:10:54 2013 +0200
removed unused primary-only LANGUAGE_MALAY
Change-Id: If8d8f6f093b0464fc2c2740a32bcd76a4e89b737
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 6c67dc0..51830d3 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -134,7 +134,7 @@ struct IsoLangOtherEntry
* 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:
- * LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY
+ * LANGUAGE_ENGLISH LANGUAGE_CHINESE
* LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
*/
@@ -265,7 +265,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_VIETNAMESE, "vi", "VN" },
{ LANGUAGE_LATVIAN, "lv", "LV" },
{ LANGUAGE_MACEDONIAN, "mk", "MK" },
- { LANGUAGE_MALAY, "ms", "" },
{ LANGUAGE_MALAY_MALAYSIA, "ms", "MY" },
{ LANGUAGE_MALAY_BRUNEI_DARUSSALAM, "ms", "BN" },
{ LANGUAGE_ENGLISH_MALAYSIA, "en", "MY" },
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index a970bdb..3983440 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -249,7 +249,6 @@ typedef unsigned short LanguageType;
#define LANGUAGE_LITHUANIAN_CLASSIC 0x0827
#define LANGUAGE_LUXEMBOURGISH_LUXEMBOURG 0x046E /* obsoletes
LANGUAGE_USER_LUXEMBOURGISH 0x0630 */
#define LANGUAGE_MACEDONIAN 0x042F
-#define LANGUAGE_MALAY 0x003E /* primary only, not a
locale! */
#define LANGUAGE_MALAYALAM 0x044C /* in India */
#define LANGUAGE_MALAY_BRUNEI_DARUSSALAM 0x083E
#define LANGUAGE_MALAY_MALAYSIA 0x043E
commit 06ba55efdf37d07056ba9dbf920a61bfb32875af
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 29 21:01:22 2013 +0200
removed second LANGUAGE_FRENCH mapping to language-only
Change-Id: Ib96ac80ed95a1c027950a428ee2ebfefa77a36d5
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index d3ababc..6c67dc0 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -147,7 +147,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_ENGLISH_AUS, "en", "AU" },
{ LANGUAGE_ENGLISH_CAN, "en", "CA" },
{ LANGUAGE_FRENCH, "fr", "FR" },
- { LANGUAGE_FRENCH, "fr", "" },
{ LANGUAGE_GERMAN, "de", "DE" },
{ LANGUAGE_ITALIAN, "it", "IT" },
{ LANGUAGE_DUTCH, "nl", "NL" },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
