[Libreoffice-commits] .: i18npool/inc i18npool/Library_localedata_en.mk i18npool/source svtools/source

[Eike Rathke]

 i18npool/Library_localedata_en.mk         |    1 
 i18npool/inc/i18npool/lang.h              |    1 
 i18npool/source/isolang/isolang.cxx       |    1 
 i18npool/source/localedata/data/en_MW.xml |   33 ++++++++++++++++++++++++++++++
 i18npool/source/localedata/localedata.cxx |    1 
 svtools/source/misc/langtab.src           |    1 
 6 files changed, 38 insertions(+)

New commits:
commit 9dce646fbc187a0ca0ef0b22a0a2bdd8845689d0
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Apr 4 16:58:40 2012 +0200

    fdo#48111 added English_Malawi [en-MW] locale data

diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index c91c408..f44fab2 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
 	CustomTarget/i18npool/localedata/localedata_en_GH \
 	CustomTarget/i18npool/localedata/localedata_en_IE \
 	CustomTarget/i18npool/localedata/localedata_en_JM \
+	CustomTarget/i18npool/localedata/localedata_en_MW \
 	CustomTarget/i18npool/localedata/localedata_en_NA \
 	CustomTarget/i18npool/localedata/localedata_en_NZ \
 	CustomTarget/i18npool/localedata/localedata_en_PH \
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 6fa05a8..4fb9eca 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -541,6 +541,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KOMI_ZYRIAN           0x0669
 #define LANGUAGE_USER_KOMI_PERMYAK          0x066A
 #define LANGUAGE_USER_PITJANTJATJARA        0x066B
+#define LANGUAGE_USER_ENGLISH_MALAWI        0x8809  /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 35a9250..f27cd88 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -439,6 +439,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_LINGALA_DRCONGO,        "ln", "CD" },
     { LANGUAGE_USER_LOW_GERMAN,            "nds", "DE" },
     { LANGUAGE_USER_HILIGAYNON,            "hil", "PH" },
+    { LANGUAGE_USER_ENGLISH_MALAWI,         "en", "MW" },   /* en default for MW */
     { LANGUAGE_USER_NYANJA,                 "ny", "MW" },
     { LANGUAGE_USER_KASHUBIAN,             "csb", "PL" },
     { LANGUAGE_USER_SPANISH_CUBA,           "es", "CU" },
diff --git a/i18npool/source/localedata/data/en_MW.xml b/i18npool/source/localedata/data/en_MW.xml
new file mode 100644
index 0000000..bc2f108
--- /dev/null
+++ b/i18npool/source/localedata/data/en_MW.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>en</LangID>
+      <DefaultName>English</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>MW</CountryID>
+      <DefaultName>Malawi</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE ref="en_GB" />
+  <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$MK-8809]" />
+  <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>MWK</CurrencyID>
+      <CurrencySymbol>MK</CurrencySymbol>
+      <BankSymbol>MWK</BankSymbol>
+      <CurrencyName>Malawian kwacha</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 b6605b5..dd3f7cf 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -73,6 +73,7 @@ static const struct {
     { "en_ZW",  lcl_DATA_EN },
     { "en_NA",  lcl_DATA_EN },
     { "en_GH",  lcl_DATA_EN },
+    { "en_MW",  lcl_DATA_EN },
 
     { "es_ES",  lcl_DATA_ES },
     { "es_AR",  lcl_DATA_ES },
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index c07b5b7..d279475 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -347,6 +347,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Komi-Zyrian" ; LANGUAGE_USER_KOMI_ZYRIAN ; > ;
         < "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ;
         < "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ;
+        < "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ;
     };
 };