i18nlangtag/source/isolang/isolang.cxx    |    1 
 i18npool/Library_localedata_en.mk         |    1 
 i18npool/source/localedata/data/en_GM.xml |   50 ++++++++++++++++++++++++++++++
 i18npool/source/localedata/localedata.cxx |    1 
 include/i18nlangtag/lang.h                |    1 
 svtools/source/misc/langtab.src           |    1 
 6 files changed, 55 insertions(+)

New commits:
commit 7c769c7bfc4a9d8b64c7d562aba5c1ad27cd0664
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Jun 30 11:16:14 2015 +0200

    add English (Gambia) [en-GM] locale data, tdf#92442
    
    All derived from en-GB with currency GMD symbol D
    
    Change-Id: I33d8688f73342322c816f4cfe8923bf3a2db85be

diff --git a/i18npool/Library_localedata_en.mk 
b/i18npool/Library_localedata_en.mk
index 5fe3fc2..20691f5 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_en,\
        CustomTarget/i18npool/localedata/localedata_en_CA \
        CustomTarget/i18npool/localedata/localedata_en_GB \
        CustomTarget/i18npool/localedata/localedata_en_GH \
+       CustomTarget/i18npool/localedata/localedata_en_GM \
        CustomTarget/i18npool/localedata/localedata_en_IE \
        CustomTarget/i18npool/localedata/localedata_en_JM \
        CustomTarget/i18npool/localedata/localedata_en_MW \
diff --git a/i18npool/source/localedata/data/en_GM.xml 
b/i18npool/source/localedata/data/en_GM.xml
new file mode 100644
index 0000000..58ad2d4
--- /dev/null
+++ b/i18npool/source/localedata/data/en_GM.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>en</LangID>
+      <DefaultName>English</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>GM</CountryID>
+      <DefaultName>Gambia</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE ref="en_GB" />
+  <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$D-9009]" />
+  <LC_COLLATION ref="en_GB" />
+  <LC_SEARCH ref="en_GB"/>
+  <LC_INDEX ref="en_GB"/>
+  <LC_CALENDAR ref="en_GB"/>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>GMD</CurrencyID>
+      <CurrencySymbol>D</CurrencySymbol>
+      <BankSymbol>GMD</BankSymbol>
+      <CurrencyName>Dalasi</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION ref="en_GB"/>
+  <LC_MISC ref="en_GB"/>
+  <LC_NumberingLevel ref="en_GB"/>
+  <LC_OutLineNumberingLevel ref="en_GB"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index c7d4e2e6..a62fe94 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -69,6 +69,7 @@ static const struct {
     { "en_NA",  lcl_DATA_EN },
     { "en_GH",  lcl_DATA_EN },
     { "en_MW",  lcl_DATA_EN },
+    { "en_GM",  lcl_DATA_EN },
 
     { "es_ES",  lcl_DATA_ES },
     { "es_AR",  lcl_DATA_ES },
commit 07ec1e8cb83b56d82e811eccc169007beeca7651
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Jun 30 11:06:28 2015 +0200

    add English (Gambia) [en-GM] to language list, tdf#92442
    
    Change-Id: Ifcc2d9c53660f8af92739bd674987acfc1d610d2

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 4e8308c..94e9398 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -650,6 +650,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_KVEN_FINNISH,          "fkv", "NO", 0     },
     { LANGUAGE_USER_CHURCH_SLAVIC,          "cu", "RU", 0     },
     { LANGUAGE_USER_VENETIAN,              "vec", "IT", 0     },
+    { LANGUAGE_USER_ENGLISH_GAMBIA,         "en", "GM", 0     },
     { LANGUAGE_MULTIPLE,                   "mul", ""  , 0     },    // 
multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""  , 0     },    // 
undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""  , 0     },    // added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0a87972..5453f02 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -704,6 +704,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KVEN_FINNISH          0x0693
 #define LANGUAGE_USER_CHURCH_SLAVIC         0x0694
 #define LANGUAGE_USER_VENETIAN              0x0695
+#define LANGUAGE_USER_ENGLISH_GAMBIA        0x9009  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 4ff3ac1..0f00e69 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -391,6 +391,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "French (Togo)" ; LANGUAGE_USER_FRENCH_TOGO ; > ;
         < "Kven Finnish" ; LANGUAGE_USER_KVEN_FINNISH ; > ;
         < "Venetian" ; LANGUAGE_USER_VENETIAN ; > ;
+        < "English (Gambia)" ; LANGUAGE_USER_ENGLISH_GAMBIA ; > ;
     };
 };
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to