[Libreoffice-commits] core.git: editeng/source i18nlangtag/source include/i18nlangtag svtools/inc
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Fri Apr 24 21:59:15 UTC 2020
editeng/source/misc/svxacorr.cxx | 4 +--
i18nlangtag/source/isolang/isolang.cxx | 34 ++++++++++++++++-----------------
include/i18nlangtag/lang.h | 2 -
svtools/inc/langtab.hrc | 2 -
4 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit c73b98684810d96164f15ec5a3c6e44747c6cde2
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Apr 24 20:04:35 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Apr 24 23:58:39 2020 +0200
Typo: LANGUAGE_ENGLISH_CARRIBEAN->LANGUAGE_ENGLISH_CARIBBEAN
Change-Id: Ibae29e8f0c083991ee66cc32113025d0cc8a6891
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92877
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4fcdb4d37b8d..1242852d6213 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -301,7 +301,7 @@ ACFlags SvxAutoCorrect::GetDefaultFlags()
LANGUAGE_ENGLISH_EIRE,
LANGUAGE_ENGLISH_SAFRICA,
LANGUAGE_ENGLISH_JAMAICA,
- LANGUAGE_ENGLISH_CARRIBEAN))
+ LANGUAGE_ENGLISH_CARIBBEAN))
nRet &= ~ACFlags(ACFlags::ChgQuotes|ACFlags::ChgSglQuotes);
return nRet;
}
@@ -1232,7 +1232,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
LANGUAGE_ENGLISH_EIRE,
LANGUAGE_ENGLISH_SAFRICA,
LANGUAGE_ENGLISH_JAMAICA,
- LANGUAGE_ENGLISH_CARRIBEAN))
+ LANGUAGE_ENGLISH_CARIBBEAN))
{
rDoc.Replace( nInsPos-1, "I" );
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 67aedf85763d..5abdc085fb11 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -247,7 +247,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_CZECH, "cs", "CZ", k0 },
{ LANGUAGE_CZECH, "cz", "" , kSAME },
{ LANGUAGE_ENGLISH_JAMAICA, "en", "JM", k0 },
- { LANGUAGE_ENGLISH_CARRIBEAN, "en", "BS", k0 }, // not 100%, because AG is Bahamas
+ { LANGUAGE_ENGLISH_CARIBBEAN, "en", "BS", k0 }, // not 100%, because AG is Bahamas
{ LANGUAGE_ENGLISH_BELIZE, "en", "BZ", k0 },
{ LANGUAGE_ENGLISH_TRINIDAD, "en", "TT", k0 },
{ LANGUAGE_ENGLISH_ZIMBABWE, "en", "ZW", k0 },
@@ -872,22 +872,22 @@ static IsoLangEngEntry const aImplIsoLangEngEntries[] =
{ LANGUAGE_ENGLISH_US, "GU" }, // Guam
{ LANGUAGE_ENGLISH_US, "MH" }, // Marshall Islands
{ LANGUAGE_ENGLISH_US, "PW" }, // Palau
- { LANGUAGE_ENGLISH_CARRIBEAN, "AI" }, // Anguilla
- { LANGUAGE_ENGLISH_CARRIBEAN, "AG" }, // Antigua and Barbuda
- { LANGUAGE_ENGLISH_CARRIBEAN, "BS" }, // Bahamas
- { LANGUAGE_ENGLISH_CARRIBEAN, "BB" }, // Barbados
- { LANGUAGE_ENGLISH_CARRIBEAN, "BM" }, // Bermuda
- { LANGUAGE_ENGLISH_CARRIBEAN, "KY" }, // Cayman Islands
- { LANGUAGE_ENGLISH_CARRIBEAN, "GD" }, // Grenada
- { LANGUAGE_ENGLISH_CARRIBEAN, "DM" }, // Dominica
- { LANGUAGE_ENGLISH_CARRIBEAN, "HT" }, // Haiti
- { LANGUAGE_ENGLISH_CARRIBEAN, "MS" }, // Montserrat
- { LANGUAGE_ENGLISH_CARRIBEAN, "FM" }, // Micronesia
- { LANGUAGE_ENGLISH_CARRIBEAN, "VC" }, // St. Vincent / Grenadines
- { LANGUAGE_ENGLISH_CARRIBEAN, "LC" }, // Saint Lucia
- { LANGUAGE_ENGLISH_CARRIBEAN, "TC" }, // Turks & Caicos Islands
- { LANGUAGE_ENGLISH_CARRIBEAN, "GY" }, // Guyana
- { LANGUAGE_ENGLISH_CARRIBEAN, "TT" }, // Trinidad and Tobago
+ { LANGUAGE_ENGLISH_CARIBBEAN, "AI" }, // Anguilla
+ { LANGUAGE_ENGLISH_CARIBBEAN, "AG" }, // Antigua and Barbuda
+ { LANGUAGE_ENGLISH_CARIBBEAN, "BS" }, // Bahamas
+ { LANGUAGE_ENGLISH_CARIBBEAN, "BB" }, // Barbados
+ { LANGUAGE_ENGLISH_CARIBBEAN, "BM" }, // Bermuda
+ { LANGUAGE_ENGLISH_CARIBBEAN, "KY" }, // Cayman Islands
+ { LANGUAGE_ENGLISH_CARIBBEAN, "GD" }, // Grenada
+ { LANGUAGE_ENGLISH_CARIBBEAN, "DM" }, // Dominica
+ { LANGUAGE_ENGLISH_CARIBBEAN, "HT" }, // Haiti
+ { LANGUAGE_ENGLISH_CARIBBEAN, "MS" }, // Montserrat
+ { LANGUAGE_ENGLISH_CARIBBEAN, "FM" }, // Micronesia
+ { LANGUAGE_ENGLISH_CARIBBEAN, "VC" }, // St. Vincent / Grenadines
+ { LANGUAGE_ENGLISH_CARIBBEAN, "LC" }, // Saint Lucia
+ { LANGUAGE_ENGLISH_CARIBBEAN, "TC" }, // Turks & Caicos Islands
+ { LANGUAGE_ENGLISH_CARIBBEAN, "GY" }, // Guyana
+ { LANGUAGE_ENGLISH_CARIBBEAN, "TT" }, // Trinidad and Tobago
{ LANGUAGE_ENGLISH_AUS, "CX" }, // Christmas Islands
{ LANGUAGE_ENGLISH_AUS, "CC" }, // Cocos (Keeling) Islands
{ LANGUAGE_ENGLISH_AUS, "NF" }, // Norfolk Island
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 63f21579a0ed..1cae83ef8356 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -193,7 +193,7 @@ namespace o3tl
#define LANGUAGE_ENGLISH_BAHRAIN LanguageType(0x5009)
#define LANGUAGE_ENGLISH_BELIZE LanguageType(0x2809)
#define LANGUAGE_ENGLISH_CAN LanguageType(0x1009)
-#define LANGUAGE_ENGLISH_CARRIBEAN LanguageType(0x2409)
+#define LANGUAGE_ENGLISH_CARIBBEAN LanguageType(0x2409)
#define LANGUAGE_ENGLISH_EGYPT LanguageType(0x5409)
#define LANGUAGE_ENGLISH_EIRE LanguageType(0x1809)
#define LANGUAGE_ENGLISH_HONG_KONG_SAR LanguageType(0x3C09)
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index ed15bf3d8e26..33002f07e51d 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -88,7 +88,7 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Ireland)") , LANGUAGE_ENGLISH_EIRE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (South Africa)") , LANGUAGE_ENGLISH_SAFRICA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Jamaica)") , LANGUAGE_ENGLISH_JAMAICA },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Caribbean)") , LANGUAGE_ENGLISH_CARRIBEAN },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Caribbean)") , LANGUAGE_ENGLISH_CARIBBEAN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Belize)") , LANGUAGE_ENGLISH_BELIZE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Trinidad)") , LANGUAGE_ENGLISH_TRINIDAD },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zimbabwe)") , LANGUAGE_ENGLISH_ZIMBABWE },
More information about the Libreoffice-commits
mailing list