Upgrade @phensley/cldr to 1.8.0

Squarespace · Nov 30, 2023 · 53f1927 · 53f1927
1 parent 2ffd619
commit 53f1927
Show file tree

Hide file tree

Showing 11 changed files with 799 additions and 703 deletions.
diff --git a/codegen/package.json b/codegen/package.json
@@ -20,9 +20,9 @@
   },
   "devDependencies": {
     "@phenomnomnominal/tsquery": "^6.1.3",
-    "@phensley/cldr": "1.7.3",
-    "@phensley/cldr-compiler": "1.7.3",
-    "@phensley/unit-converter": "1.7.3",
+    "@phensley/cldr": "1.8.0",
+    "@phensley/cldr-compiler": "1.8.0",
+    "@phensley/unit-converter": "1.8.0",
     "@types/jest": "^29.5.4",
     "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^6.6.0",

diff --git a/codegen/swedish.yaml b/codegen/swedish.yaml
@@ -1,9 +1,10 @@
 version: 1
 patches:
+  # Note: This is only used for testing the custom patching feature.
   # For Swedish, change the value for CI "Ivory Coast"
   - locales: sv,sv-*
     operations:
       - op: replace
         path: /Names/regions/displayName/none/CI
-        value: Elfenbenskusten
+        value: Ivory Coast
 
diff --git a/src/generated/java/com/squarespace/cldrengine/api/LanguageIdType.java b/src/generated/java/com/squarespace/cldrengine/api/LanguageIdType.java
@@ -33,6 +33,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   ANG("ang"),
   ANN("ann"),
   ANP("anp"),
+  APC("apc"),
   AR("ar"),
   AR_001("ar-001"),
   ARC("arc"),
@@ -80,6 +81,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   BJN("bjn"),
   BKM("bkm"),
   BLA("bla"),
+  BLO("blo"),
   BLT("blt"),
   BM("bm"),
   BN("bn"),
@@ -335,6 +337,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   KV("kv"),
   KW("kw"),
   KWK("kwk"),
+  KXV("kxv"),
   KY("ky"),
   LA("la"),
   LAD("lad"),
@@ -540,6 +543,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   SI("si"),
   SID("sid"),
   SK("sk"),
+  SKR("skr"),
   SL("sl"),
   SLH("slh"),
   SLI("sli"),
@@ -634,6 +638,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   VI("vi"),
   VLS("vls"),
   VMF("vmf"),
+  VMW("vmw"),
   VO("vo"),
   VOT("vot"),
   VRO("vro"),
@@ -649,6 +654,7 @@ public enum LanguageIdType implements StringEnum<LanguageIdType> {
   XAL("xal"),
   XH("xh"),
   XMF("xmf"),
+  XNR("xnr"),
   XOG("xog"),
   YAO("yao"),
   YAP("yap"),

diff --git a/src/generated/java/com/squarespace/cldrengine/api/UnitType.java b/src/generated/java/com/squarespace/cldrengine/api/UnitType.java
@@ -17,8 +17,11 @@ public enum UnitType implements StringEnum<UnitType> {
   RADIAN("radian"),
   REVOLUTION("revolution"),
   ACRE("acre"),
+  BU_JP("bu-jp"),
+  CHO("cho"),
   DUNAM("dunam"),
   HECTARE("hectare"),
+  SE_JP("se-jp"),
   SQUARE_CENTIMETER("square-centimeter"),
   SQUARE_FOOT("square-foot"),
   SQUARE_INCH("square-inch"),
@@ -100,6 +103,8 @@ public enum UnitType implements StringEnum<UnitType> {
   FOOT("foot"),
   FURLONG("furlong"),
   INCH("inch"),
+  JO_JP("jo-jp"),
+  KEN("ken"),
   KILOMETER("kilometer"),
   LIGHT_YEAR("light-year"),
   METER("meter"),
@@ -112,7 +117,12 @@ public enum UnitType implements StringEnum<UnitType> {
   PARSEC("parsec"),
   PICOMETER("picometer"),
   POINT("point"),
+  RI_JP("ri-jp"),
+  RIN("rin"),
+  SHAKU_CLOTH("shaku-cloth"),
+  SHAKU_LENGTH("shaku-length"),
   SOLAR_RADIUS("solar-radius"),
+  SUN("sun"),
   YARD("yard"),
   CANDELA("candela"),
   LUMEN("lumen"),
@@ -121,6 +131,7 @@ public enum UnitType implements StringEnum<UnitType> {
   CARAT("carat"),
   DALTON("dalton"),
   EARTH_MASS("earth-mass"),
+  FUN("fun"),
   GRAIN("grain"),
   GRAM("gram"),
   KILOGRAM("kilogram"),
@@ -141,6 +152,7 @@ public enum UnitType implements StringEnum<UnitType> {
   WATT("watt"),
   ATMOSPHERE("atmosphere"),
   BAR("bar"),
+  GASOLINE_ENERGY_DENSITY("gasoline-energy-density"),
   HECTOPASCAL("hectopascal"),
   INCH_OFHG("inch-ofhg"),
   KILOPASCAL("kilopascal"),
@@ -172,6 +184,7 @@ public enum UnitType implements StringEnum<UnitType> {
   CUBIC_MILE("cubic-mile"),
   CUBIC_YARD("cubic-yard"),
   CUP("cup"),
+  CUP_JP("cup-jp"),
   CUP_METRIC("cup-metric"),
   DECILITER("deciliter"),
   DESSERT_SPOON("dessert-spoon"),
@@ -184,16 +197,22 @@ public enum UnitType implements StringEnum<UnitType> {
   GALLON_IMPERIAL("gallon-imperial"),
   HECTOLITER("hectoliter"),
   JIGGER("jigger"),
+  KOKU("koku"),
+  KOSAJI("kosaji"),
   LITER("liter"),
   MEGALITER("megaliter"),
   MILLILITER("milliliter"),
+  OSAJI("osaji"),
   PINCH("pinch"),
   PINT("pint"),
   PINT_METRIC("pint-metric"),
   QUART("quart"),
   QUART_IMPERIAL("quart-imperial"),
+  SAI("sai"),
+  SHAKU("shaku"),
   TABLESPOON("tablespoon"),
-  TEASPOON("teaspoon")
+  TEASPOON("teaspoon"),
+  TO_JP("to-jp")
   ;
 
   private static final Map<String, UnitType> REVERSE = new HashMap<>();

diff --git a/src/generated/java/com/squarespace/cldrengine/internal/CalendarExternalData.java b/src/generated/java/com/squarespace/cldrengine/internal/CalendarExternalData.java
@@ -24,72 +24,72 @@ public class CalendarExternalData {
   public static final String DAYPERIODRULES =
     "{\"af\":\"2 5 3 0 1|0 1 8c k0 u0\",\"am\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"ar\":\"5 3 4 0 1|0 50 a0" +
     " k0 u0\",\"az\":\"2 3 4 6 0 1 5|0 6o a0 k0 k1 sc vo\",\"bg\":\"2 5 3 4 0 1 5|0 1 6o ic nc u0 10o\",\"" +
-    "bn\":\"5 3 4 0 1 5|0 6o a0 k0 u0 xc\",\"bs\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u0 z0\",\"ca\":\"2 3 4 0 1" +
-    " 5|0 1 a0 k0 vo z0\",\"ccp\":\"5 3 4 0 1 5|0 6o a0 k0 u0 xc\",\"chr\":\"3 6 0|0 k0 k1\",\"cs\":\"2 5" +
-    " 3 4 6 0 1 5|0 1 6o f0 k0 k1 u0 10o\",\"cy\":\"2 3 6 0 1|0 1 k0 k1 u0\",\"da\":\"2 5 3 4 0 1|0 1 8c " +
-    "go k0 u0\",\"de\":\"2 5 3 4 0 1|0 1 8c go k0 u0\",\"ee\":\"5 3 4 0 1 5|0 6o 8c k0 u0 z0\",\"el\":\"5" +
-    " 3 0 1 5|0 6o k0 sc xc\",\"en\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"es\":\"3 4 6 1 5|0 a0 k0 k1 x" +
-    "c\",\"es-CO\":\"4 6 1 5|0 k0 k1 xc\",\"et\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 u0 12c\",\"eu\":\"2 3 4 0 1" +
-    " 5|0 1 a0 k0 vo z0\",\"fa\":\"3 4 0 5|1o 6o k0 vo\",\"fi\":\"2 5 3 4 6 0 1 5|0 1 8c go k0 k1 u0 12c\"" +
-    ",\"fil\":\"2 3 4 6 0 1 5|0 1 a0 k0 k1 qo u0\",\"fr\":\"2 5 3 6 0 1|0 1 6o k0 k1 u0\",\"gl\":\"2 3 4 " +
-    "0 1 5|0 1 a0 k0 lo z0\",\"gsw\":\"2 5 3 0 1|0 1 8c k0 u0\",\"gu\":\"2 5 3 0 1 5|0 1 6o k0 qo xc\",\"" +
-    "he\":\"2 5 3 0 1 5|0 1 a0 k0 u0 10o\",\"hi\":\"2 5 3 0 1 5|0 1 6o k0 qo xc\",\"hi-Latn\":\"2 5 3 6 0" +
-    " 1 5|0 1 6o k0 k1 qo xc\",\"hr\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u0 z0\",\"hu\":\"2 5 3 4 6 0 1 5|0 1 a" +
-    "0 f0 k0 k1 u0 z0\",\"hy\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"id\":\"2 3 0 6 1 5|0 1 go k0 p0 u0\",\"i" +
-    "s\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"it\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"ja\":\"2 3 6 0 1 5|0 6o" +
-    " k0 k1 qo vo\",\"ka\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 u0 z0\",\"kgp\":\"2 5 3 6 0 1|0 1 a0 k0 k1 vo\",\"" +
-    "kk\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"km\":\"2 3 6 0 1 5|0 1 k0 k1 u0 z0\",\"kn\":\"2 5 3 0 1 " +
-    "5|0 1 a0 k0 u0 z0\",\"ko\":\"2 5 3 4 6 0 1 5|0 1 50 a0 k0 k1 u0 z0\",\"ky\":\"2 5 3 6 0 1 5|0 1 a0 k" +
-    "0 k1 u0 z0\",\"lij\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 10o\",\"lo\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 qo xc" +
-    "\",\"lt\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"lv\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 12c\",\"mk\":\"2 5 " +
-    "3 4 6 0 1|0 1 6o go k0 k1 u0\",\"ml\":\"2 5 3 4 6 0 1 5|0 1 50 a0 k0 k1 p0 vo\",\"mn\":\"2 5 3 6 0 1" +
-    " 5|0 1 a0 k0 k1 u0 z0\",\"mr\":\"2 5 3 4 6 0 1 5|0 1 6o a0 k0 k1 qo z0\",\"ms\":\"3 4 0 1 5|0 1o k0 " +
-    "nc vo\",\"my\":\"2 3 6 0 1 5|0 1 k0 k1 qo vo\",\"nb\":\"2 5 3 4 0 1|0 1 a0 go k0 u0\",\"ne\":\"2 5 3" +
-    " 6 0 1 5|0 1 6o k0 k1 vo 10o\",\"nl\":\"2 5 3 0 1|0 1 a0 k0 u0\",\"nn\":\"2 5 3 4 0 1|0 1 a0 go k0 u" +
-    "0\",\"no\":\"2 5 3 4 0 1|0 1 a0 go k0 u0\",\"pa\":\"2 5 3 0 1 5|0 1 6o k0 qo z0\",\"pl\":\"2 5 3 4 6" +
-    " 0 1 5|0 1 a0 go k0 k1 u0 z0\",\"pt\":\"2 5 3 6 0 1|0 1 a0 k0 k1 vo\",\"ro\":\"2 5 3 6 0 1 5|0 1 8c " +
-    "k0 k1 u0 10o\",\"ru\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u0 10o\",\"si\":\"2 3 4 6 0 1 5|0 1o a0 k0 k1 nc " +
-    "u0\",\"sk\":\"2 5 3 4 6 0 1 5|0 1 6o f0 k0 k1 u0 10o\",\"sl\":\"2 5 3 4 6 0 1 5|0 1 a0 go k0 k1 u0 1" +
-    "0o\",\"sq\":\"2 5 3 4 6 0 1|0 1 6o f0 k0 k1 u0\",\"sr\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"sv\":" +
-    "\"2 5 3 4 0 1|0 1 8c go k0 u0\",\"sw\":\"2 5 3 4 6 0 1 5|0 1 6o bo k0 k1 qo vo\",\"ta\":\"2 5 3 4 6 " +
-    "0 1 5|0 1 50 8c k0 k1 qo z0\",\"te\":\"2 5 3 0 1 5|0 1 a0 k0 u0 z0\",\"th\":\"2 5 3 6 0 1 5|0 1 a0 k" +
-    "0 k1 qo z0\",\"tr\":\"2 5 3 4 6 0 1 5|0 1 a0 ic k0 k1 vo z0\",\"uk\":\"2 5 3 6 0 1|0 1 6o k0 k1 u0\"" +
-    ",\"ur\":\"2 5 3 0 1 5|0 1 6o k0 u0 xc\",\"uz\":\"2 5 3 0 6 1 5|0 1 a0 ic k0 u0 10o\",\"vi\":\"2 5 3 " +
-    "6 0 1 5|0 1 6o k0 k1 u0 z0\",\"yrl\":\"2 5 3 6 0 1|0 1 a0 k0 k1 vo\",\"yue\":\"2 5 3 4 0 1|0 1 8c dc" +
-    " k0 vo\",\"zh\":\"2 5 3 4 0 1|0 1 8c dc k0 vo\",\"zu\":\"3 4 0 1 5|0 a0 go lo vo\"}";
+    "blo\":\"5 3 4 0 1|0 6o bo k0 xc\",\"bn\":\"5 3 4 0 1 5|0 6o a0 k0 u0 xc\",\"bs\":\"2 5 3 6 0 1 5|0 1" +
+    " 6o k0 k1 u0 z0\",\"ca\":\"2 3 4 0 1 5|0 1 a0 k0 vo z0\",\"ccp\":\"5 3 4 0 1 5|0 6o a0 k0 u0 xc\",\"" +
+    "chr\":\"3 6 0|0 k0 k1\",\"cs\":\"2 5 3 4 6 0 1 5|0 1 6o f0 k0 k1 u0 10o\",\"cy\":\"2 3 6 0 1|0 1 k0 " +
+    "k1 u0\",\"da\":\"2 5 3 4 0 1|0 1 8c go k0 u0\",\"de\":\"2 5 3 4 0 1|0 1 8c go k0 u0\",\"ee\":\"5 3 4" +
+    " 0 1 5|0 6o 8c k0 u0 z0\",\"el\":\"5 3 0 1 5|0 6o k0 sc xc\",\"en\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 " +
+    "z0\",\"es\":\"3 4 6 1 5|0 a0 k0 k1 xc\",\"es-CO\":\"4 6 1 5|0 k0 k1 xc\",\"et\":\"2 5 3 6 0 1 5|0 1 " +
+    "8c k0 k1 u0 12c\",\"eu\":\"2 3 4 0 1 5|0 1 a0 k0 vo z0\",\"fa\":\"3 4 0 5|1o 6o k0 vo\",\"fi\":\"2 5" +
+    " 3 4 6 0 1 5|0 1 8c go k0 k1 u0 12c\",\"fil\":\"2 3 4 6 0 1 5|0 1 a0 k0 k1 qo u0\",\"fr\":\"2 5 3 6 " +
+    "0 1|0 1 6o k0 k1 u0\",\"gl\":\"2 3 4 0 1 5|0 1 a0 k0 lo z0\",\"gsw\":\"2 5 3 0 1|0 1 8c k0 u0\",\"gu" +
+    "\":\"2 5 3 0 1 5|0 1 6o k0 qo xc\",\"he\":\"2 5 3 0 1 5|0 1 a0 k0 u0 10o\",\"hi\":\"2 5 3 0 1 5|0 1 " +
+    "6o k0 qo xc\",\"hi-Latn\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 qo xc\",\"hr\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u" +
+    "0 z0\",\"hu\":\"2 5 3 4 6 0 1 5|0 1 a0 f0 k0 k1 u0 z0\",\"hy\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"id\"" +
+    ":\"2 3 0 6 1 5|0 1 go k0 p0 u0\",\"is\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"it\":\"2 5 3 6 0 1|0 1 a0 " +
+    "k0 k1 u0\",\"ja\":\"2 3 6 0 1 5|0 6o k0 k1 qo vo\",\"ka\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 u0 z0\",\"kgp" +
+    "\":\"2 5 3 6 0 1|0 1 a0 k0 k1 vo\",\"kk\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"km\":\"2 3 6 0 1 5|" +
+    "0 1 k0 k1 u0 z0\",\"kn\":\"2 5 3 0 1 5|0 1 a0 k0 u0 z0\",\"ko\":\"2 5 3 4 6 0 1 5|0 1 50 a0 k0 k1 u0" +
+    " z0\",\"ky\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"lij\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 10o\",\"lo" +
+    "\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 qo xc\",\"lt\":\"2 5 3 6 0 1|0 1 a0 k0 k1 u0\",\"lv\":\"2 5 3 6 0 1 " +
+    "5|0 1 a0 k0 k1 u0 12c\",\"mk\":\"2 5 3 4 6 0 1|0 1 6o go k0 k1 u0\",\"ml\":\"2 5 3 4 6 0 1 5|0 1 50 " +
+    "a0 k0 k1 p0 vo\",\"mn\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"mr\":\"2 5 3 4 6 0 1 5|0 1 6o a0 k0 k" +
+    "1 qo z0\",\"ms\":\"3 4 0 1 5|0 1o k0 nc vo\",\"my\":\"2 3 6 0 1 5|0 1 k0 k1 qo vo\",\"nb\":\"2 5 3 4" +
+    " 0 1|0 1 a0 go k0 u0\",\"ne\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 vo 10o\",\"nl\":\"2 5 3 0 1|0 1 a0 k0 u0\"" +
+    ",\"nn\":\"2 5 3 4 0 1|0 1 a0 go k0 u0\",\"no\":\"2 5 3 4 0 1|0 1 a0 go k0 u0\",\"pa\":\"2 5 3 0 1 5|" +
+    "0 1 6o k0 qo z0\",\"pl\":\"2 5 3 4 6 0 1 5|0 1 a0 go k0 k1 u0 z0\",\"pt\":\"2 5 3 6 0 1|0 1 a0 k0 k1" +
+    " vo\",\"ro\":\"2 5 3 6 0 1 5|0 1 8c k0 k1 u0 10o\",\"ru\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u0 10o\",\"si" +
+    "\":\"2 3 4 6 0 1 5|0 1o a0 k0 k1 nc u0\",\"sk\":\"2 5 3 4 6 0 1 5|0 1 6o f0 k0 k1 u0 10o\",\"sl\":\"" +
+    "2 5 3 4 6 0 1 5|0 1 a0 go k0 k1 u0 10o\",\"sq\":\"2 5 3 4 6 0 1|0 1 6o f0 k0 k1 u0\",\"sr\":\"2 5 3 " +
+    "6 0 1 5|0 1 a0 k0 k1 u0 z0\",\"sv\":\"2 5 3 4 0 1|0 1 8c go k0 u0\",\"sw\":\"2 5 3 4 6 0 1 5|0 1 6o " +
+    "bo k0 k1 qo vo\",\"ta\":\"2 5 3 4 6 0 1 5|0 1 50 8c k0 k1 qo z0\",\"te\":\"2 5 3 0 1 5|0 1 a0 k0 u0 " +
+    "z0\",\"th\":\"2 5 3 6 0 1 5|0 1 a0 k0 k1 qo z0\",\"tr\":\"2 5 3 4 6 0 1 5|0 1 a0 ic k0 k1 vo z0\",\"" +
+    "uk\":\"2 5 3 6 0 1|0 1 6o k0 k1 u0\",\"ur\":\"2 5 3 0 1 5|0 1 6o k0 u0 xc\",\"uz\":\"2 5 3 0 6 1 5|0" +
+    " 1 a0 ic k0 u0 10o\",\"vi\":\"2 5 3 6 0 1 5|0 1 6o k0 k1 u0 z0\",\"yrl\":\"2 5 3 6 0 1|0 1 a0 k0 k1 " +
+    "vo\",\"yue\":\"2 5 3 4 0 1|0 1 8c dc k0 vo\",\"zh\":\"2 5 3 4 0 1|0 1 8c dc k0 vo\",\"zu\":\"3 4 0 1" +
+    " 5|0 a0 go lo vo\"}";
 
   public static final String TIMEDATA =
-    "{\"\":{\"AX\":0,\"BQ\":0,\"CP\":0,\"CZ\":0,\"DK\":0,\"FI\":0,\"ID\":0,\"IS\":0,\"ML\":0,\"NE\":0,\"R" +
-    "U\":0,\"SE\":0,\"SJ\":0,\"SK\":0,\"AS\":1,\"BT\":1,\"DJ\":1,\"ER\":1,\"GH\":1,\"IN\":1,\"LS\":1,\"PG" +
-    "\":1,\"PW\":1,\"SO\":1,\"TO\":1,\"VU\":1,\"WS\":1,\"001\":2,\"BI\":2,\"BY\":2,\"FO\":2,\"GL\":2,\"HU" +
-    "\":2,\"MG\":2,\"MT\":2,\"MU\":2,\"MV\":2,\"NO\":2,\"PL\":2,\"RW\":2,\"TH\":2,\"TJ\":2,\"TM\":2,\"VN\"" +
-    ":2,\"ZW\":2,\"AL\":3,\"TD\":3,\"CF\":4,\"CM\":4,\"LU\":4,\"NP\":4,\"PF\":4,\"SC\":4,\"SM\":4,\"SN\":" +
-    "4,\"TF\":4,\"VA\":4,\"CY\":5,\"GR\":5,\"CO\":6,\"DO\":6,\"KP\":6,\"KR\":6,\"NA\":6,\"PA\":6,\"PR\":6" +
-    ",\"VE\":6,\"AC\":7,\"AI\":7,\"BW\":7,\"BZ\":7,\"CC\":7,\"CK\":7,\"CX\":7,\"DG\":7,\"FK\":7,\"GB\":7," +
-    "\"GG\":7,\"GI\":7,\"IE\":7,\"IM\":7,\"IO\":7,\"JE\":7,\"LT\":7,\"MK\":7,\"MN\":7,\"MS\":7,\"NF\":7,\"" +
-    "NG\":7,\"NR\":7,\"NU\":7,\"PN\":7,\"SH\":7,\"SX\":7,\"TA\":7,\"ZA\":7,\"AR\":8,\"CL\":8,\"CR\":8,\"C" +
-    "U\":8,\"EA\":8,\"GT\":8,\"HN\":8,\"IC\":8,\"KG\":8,\"KM\":8,\"LK\":8,\"MA\":8,\"MX\":8,\"NI\":8,\"PY" +
-    "\":8,\"SV\":8,\"UY\":8,\"AD\":9,\"AM\":9,\"AO\":9,\"AT\":9,\"AW\":9,\"BE\":9,\"BF\":9,\"BJ\":9,\"BL\"" +
-    ":9,\"BR\":9,\"CG\":9,\"CI\":9,\"CV\":9,\"CW\":9,\"DE\":9,\"EE\":9,\"FR\":9,\"GA\":9,\"GF\":9,\"GN\":" +
-    "9,\"GP\":9,\"GW\":9,\"HR\":9,\"IL\":9,\"IT\":9,\"KZ\":9,\"MC\":9,\"MD\":9,\"MF\":9,\"MQ\":9,\"MZ\":9" +
-    ",\"NC\":9,\"NL\":9,\"PM\":9,\"PT\":9,\"RE\":9,\"RO\":9,\"SI\":9,\"SR\":9,\"ST\":9,\"TG\":9,\"TR\":9," +
-    "\"WF\":9,\"YT\":9,\"BD\":10,\"PK\":10,\"AZ\":11,\"BA\":11,\"BG\":11,\"CH\":11,\"GE\":11,\"LI\":11,\"" +
-    "ME\":11,\"RS\":11,\"UA\":11,\"UZ\":11,\"XK\":11,\"AG\":12,\"AU\":12,\"BB\":12,\"BM\":12,\"BS\":12,\"" +
-    "CA\":12,\"DM\":12,\"FJ\":12,\"FM\":12,\"GD\":12,\"GM\":12,\"GU\":12,\"GY\":12,\"JM\":12,\"KI\":12,\"" +
-    "KN\":12,\"KY\":12,\"LC\":12,\"LR\":12,\"MH\":12,\"MP\":12,\"MW\":12,\"NZ\":12,\"SB\":12,\"SG\":12,\"" +
-    "SL\":12,\"SS\":12,\"SZ\":12,\"TC\":12,\"TT\":12,\"UM\":12,\"US\":12,\"VC\":12,\"VG\":12,\"VI\":12,\"" +
-    "ZM\":12,\"BO\":13,\"EC\":13,\"ES\":13,\"GQ\":13,\"PE\":13,\"AE\":14,\"BH\":14,\"DZ\":14,\"EG\":14,\"" +
-    "EH\":14,\"HK\":14,\"IQ\":14,\"JO\":14,\"KW\":14,\"LB\":14,\"LY\":14,\"MO\":14,\"MR\":14,\"OM\":14,\"" +
-    "PH\":14,\"PS\":14,\"QA\":14,\"SA\":14,\"SD\":14,\"SY\":14,\"TN\":14,\"YE\":14,\"AF\":15,\"LA\":15,\"" +
-    "CN\":16,\"LV\":16,\"TL\":16,\"JP\":17,\"CD\":18,\"IR\":18,\"KH\":19,\"BN\":20,\"MY\":20,\"ET\":21,\"" +
-    "TW\":21,\"KE\":22,\"MM\":22,\"TZ\":22,\"UG\":22},\"ca\":{\"ES\":4},\"fr\":{\"CA\":4},\"gl\":{\"ES\":" +
-    "4},\"it\":{\"CH\":4,\"IT\":4},\"af\":{\"ZA\":8},\"es\":{\"BO\":8,\"BR\":8,\"EC\":8,\"ES\":8,\"GQ\":8" +
-    ",\"PE\":8},\"en\":{\"001\":12},\"ar\":{\"001\":14},\"zu\":{\"ZA\":16},\"hi\":{\"IN\":23},\"kn\":{\"I" +
-    "N\":23},\"ml\":{\"IN\":23},\"te\":{\"IN\":23},\"ta\":{\"IN\":24},\"gu\":{\"IN\":21},\"mr\":{\"IN\":2" +
-    "1},\"pa\":{\"IN\":21}}";
+    "{\"\":{\"419\":0,\"AX\":1,\"BQ\":1,\"CP\":1,\"CZ\":1,\"DK\":1,\"FI\":1,\"ID\":1,\"IS\":1,\"ML\":1,\"" +
+    "NE\":1,\"RU\":1,\"SE\":1,\"SJ\":1,\"SK\":1,\"AS\":2,\"BT\":2,\"DJ\":2,\"ER\":2,\"GH\":2,\"IN\":2,\"L" +
+    "S\":2,\"PG\":2,\"PW\":2,\"SO\":2,\"TO\":2,\"VU\":2,\"WS\":2,\"001\":3,\"BI\":3,\"BY\":3,\"FO\":3,\"G" +
+    "L\":3,\"HU\":3,\"MG\":3,\"MT\":3,\"MU\":3,\"MV\":3,\"NO\":3,\"PL\":3,\"RW\":3,\"TH\":3,\"TJ\":3,\"TM" +
+    "\":3,\"VN\":3,\"ZW\":3,\"AL\":4,\"TD\":4,\"CF\":5,\"CM\":5,\"LU\":5,\"NP\":5,\"PF\":5,\"SC\":5,\"SM\"" +
+    ":5,\"SN\":5,\"TF\":5,\"VA\":5,\"CY\":6,\"GR\":6,\"AR\":0,\"BO\":0,\"CL\":0,\"CO\":0,\"CR\":0,\"CU\":" +
+    "0,\"DO\":0,\"EC\":0,\"GT\":0,\"HN\":0,\"KP\":0,\"KR\":0,\"MX\":0,\"NA\":0,\"NI\":0,\"PA\":0,\"PE\":0" +
+    ",\"PR\":0,\"PY\":0,\"SV\":0,\"UY\":0,\"VE\":0,\"AC\":7,\"AI\":7,\"BW\":7,\"BZ\":7,\"CC\":7,\"CK\":7," +
+    "\"CX\":7,\"DG\":7,\"FK\":7,\"GB\":7,\"GG\":7,\"GI\":7,\"IE\":7,\"IM\":7,\"IO\":7,\"JE\":7,\"LT\":7,\"" +
+    "MK\":7,\"MN\":7,\"MS\":7,\"NF\":7,\"NG\":7,\"NR\":7,\"NU\":7,\"PN\":7,\"SH\":7,\"SX\":7,\"TA\":7,\"Z" +
+    "A\":7,\"EA\":8,\"IC\":8,\"KG\":8,\"KM\":8,\"LK\":8,\"MA\":8,\"AD\":9,\"AM\":9,\"AO\":9,\"AT\":9,\"AW" +
+    "\":9,\"BE\":9,\"BF\":9,\"BJ\":9,\"BL\":9,\"BR\":9,\"CG\":9,\"CI\":9,\"CV\":9,\"CW\":9,\"DE\":9,\"EE\"" +
+    ":9,\"FR\":9,\"GA\":9,\"GF\":9,\"GN\":9,\"GP\":9,\"GW\":9,\"HR\":9,\"IL\":9,\"IT\":9,\"KZ\":9,\"MC\":" +
+    "9,\"MD\":9,\"MF\":9,\"MQ\":9,\"MZ\":9,\"NC\":9,\"NL\":9,\"PM\":9,\"PT\":9,\"RE\":9,\"RO\":9,\"SI\":9" +
+    ",\"SR\":9,\"ST\":9,\"TG\":9,\"TR\":9,\"WF\":9,\"YT\":9,\"BD\":10,\"PK\":10,\"AZ\":11,\"BA\":11,\"BG\"" +
+    ":11,\"CH\":11,\"GE\":11,\"LI\":11,\"ME\":11,\"RS\":11,\"UA\":11,\"UZ\":11,\"XK\":11,\"AG\":12,\"AU\"" +
+    ":12,\"BB\":12,\"BM\":12,\"BS\":12,\"CA\":12,\"DM\":12,\"FJ\":12,\"FM\":12,\"GD\":12,\"GM\":12,\"GU\"" +
+    ":12,\"GY\":12,\"JM\":12,\"KI\":12,\"KN\":12,\"KY\":12,\"LC\":12,\"LR\":12,\"MH\":12,\"MP\":12,\"MW\"" +
+    ":12,\"NZ\":12,\"SB\":12,\"SG\":12,\"SL\":12,\"SS\":12,\"SZ\":12,\"TC\":12,\"TT\":12,\"UM\":12,\"US\"" +
+    ":12,\"VC\":12,\"VG\":12,\"VI\":12,\"ZM\":12,\"ES\":13,\"GQ\":13,\"AE\":14,\"BH\":14,\"DZ\":14,\"EG\"" +
+    ":14,\"EH\":14,\"HK\":14,\"IQ\":14,\"JO\":14,\"KW\":14,\"LB\":14,\"LY\":14,\"MO\":14,\"MR\":14,\"OM\"" +
+    ":14,\"PH\":14,\"PS\":14,\"QA\":14,\"SA\":14,\"SD\":14,\"SY\":14,\"TN\":14,\"YE\":14,\"AF\":15,\"LA\"" +
+    ":15,\"CN\":16,\"LV\":16,\"TL\":16,\"JP\":17,\"CD\":18,\"IR\":18,\"KH\":19,\"BN\":20,\"MY\":20,\"ET\"" +
+    ":21,\"TW\":21,\"KE\":22,\"MM\":22,\"TZ\":22,\"UG\":22},\"ca\":{\"ES\":5},\"fr\":{\"CA\":5},\"gl\":{\"" +
+    "ES\":5},\"it\":{\"CH\":5,\"IT\":5},\"af\":{\"ZA\":8},\"es\":{\"BR\":8,\"ES\":8,\"GQ\":8},\"en\":{\"0" +
+    "01\":12},\"ar\":{\"001\":14},\"zu\":{\"ZA\":16},\"hi\":{\"IN\":23},\"kn\":{\"IN\":23},\"ml\":{\"IN\"" +
+    ":23},\"te\":{\"IN\":23},\"ta\":{\"IN\":24},\"gu\":{\"IN\":21},\"mr\":{\"IN\":21},\"pa\":{\"IN\":21}}";
 
   public static final String TIMESTRINGS =
-    "[\"H|H\",\"h H|h\",\"H h|H\",\"h H hB|h\",\"H h hB|H\",\"h H hb hB|h\",\"h H hB hb|h\",\"H h hb hB|H" +
+    "[\"h H hB hb|h\",\"H|H\",\"h H|h\",\"H h|H\",\"h H hB|h\",\"H h hB|H\",\"h H hb hB|h\",\"H h hb hB|H" +
     "\",\"H h hB hb|H\",\"H hB|H\",\"h hB H|h\",\"H hB h|H\",\"h hb H hB|h\",\"H hB h hb|H\",\"h hB hb H|" +
     "h\",\"H hb hB h|H\",\"H hB hb h|H\",\"H K h|H\",\"hB H|H\",\"hB h H hb|h\",\"hb hB h H|h\",\"hB hb h" +
     " H|h\",\"hB hb H h|H\",\"hB h H|h\",\"hB h hb H|h\"]";