i18nlangtag/source/isolang/isolang.cxx | 1
i18npool/Library_localedata_en.mk | 1
i18npool/source/localedata/data/en_BW.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 c3b4f7b55e87edb56ae0d08e1902269f0b2e8c9a
Author: Eike Rathke <er...@redhat.com>
Date: Mon Sep 14 11:50:26 2015 +0200
add English Botswana [en-BW] locale data, tdf#94207
Change-Id: I01a235c020e4e94290a551f404db8850cc9a5089
diff --git a/i18npool/Library_localedata_en.mk
b/i18npool/Library_localedata_en.mk
index 20691f5..36ce7d2 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Library_use_libraries,localedata_en,\
$(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_AU \
+ CustomTarget/i18npool/localedata/localedata_en_BW \
CustomTarget/i18npool/localedata/localedata_en_BZ \
CustomTarget/i18npool/localedata/localedata_en_CA \
CustomTarget/i18npool/localedata/localedata_en_GB \
diff --git a/i18npool/source/localedata/data/en_BW.xml
b/i18npool/source/localedata/data/en_BW.xml
new file mode 100644
index 0000000..8abfa06
--- /dev/null
+++ b/i18npool/source/localedata/data/en_BW.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>BW</CountryID>
+ <DefaultName>Botswana</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE ref="en_GB" />
+ <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$P-9809]" />
+ <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>BWP</CurrencyID>
+ <CurrencySymbol>P</CurrencySymbol>
+ <BankSymbol>BWP</BankSymbol>
+ <CurrencyName>Pula</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 0ea5942..e087ab0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -70,6 +70,7 @@ static const struct {
{ "en_GH", lcl_DATA_EN },
{ "en_MW", lcl_DATA_EN },
{ "en_GM", lcl_DATA_EN },
+ { "en_BW", lcl_DATA_EN },
{ "es_ES", lcl_DATA_ES },
{ "es_AR", lcl_DATA_ES },
commit 4de6fd143282d77086217e1ec7652dce0d937f82
Author: Eike Rathke <er...@redhat.com>
Date: Mon Sep 14 11:36:20 2015 +0200
add English (Botswana) [en-BW] 0x9809 to language list, tdf#94207
preparation
Change-Id: I6730352c830fdbbc293830f3567d61096e8d0b6f
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 7edfb70..677c7e1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -534,6 +534,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_NDEBELE_SOUTH, "nr", "ZA", 0 },
{ LANGUAGE_TSWANA_BOTSWANA, "tn", "BW", 0 },
{ LANGUAGE_OBSOLETE_USER_TSWANA_BOTSWANA, "tn", "BW", 0 },
+ { LANGUAGE_USER_ENGLISH_BOTSWANA, "en", "BW", 0 },
{ LANGUAGE_USER_MOORE, "mos", "BF", 0 },
{ LANGUAGE_USER_BAMBARA, "bm", "ML", 0 },
{ LANGUAGE_USER_AKAN, "ak", "GH", 0 },
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index aeccf95..1e3026c 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -701,6 +701,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_ARPITAN_FRANCE 0x0696
#define LANGUAGE_USER_ARPITAN_ITALY 0x0A96 /* makeLangID( 0x02,
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
#define LANGUAGE_USER_ARPITAN_SWITZERLAND 0x0E96 /* makeLangID( 0x03,
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
+#define LANGUAGE_USER_ENGLISH_BOTSWANA 0x9809 /* makeLangID( 0x26,
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 fd27105..e6251a4 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -396,6 +396,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Arpitan (France)" ; LANGUAGE_USER_ARPITAN_FRANCE ; > ;
< "Arpitan (Italy)" ; LANGUAGE_USER_ARPITAN_ITALY ; > ;
< "Arpitan (Switzerland)" ; LANGUAGE_USER_ARPITAN_SWITZERLAND ; > ;
+ < "English (Botswana)" ; LANGUAGE_USER_ENGLISH_BOTSWANA ; > ;
};
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
