Merge pull request #247 from google/FF0F89A9FFB90668CB5E5C968FD01756

(AUTOMATIC) opensource update

Author: battre

common/src/main/java/com/google/i18n/addressinput/common/RegionDataConstants.java

@@ -275,7 +275,7 @@ private static Map<String, String> createMap() {
     map.put("VE", "{\"name\":\"VENEZUELA\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%C %Z, %S\",\"require\":\"ACS\",\"upper\":\"CS\",\"state_name_type\":\"state\"}");
     map.put("VG", "{\"name\":\"VIRGIN ISLANDS (BRITISH)\",\"fmt\":\"%N%n%O%n%A%n%C%n%Z\",\"require\":\"A\"}");
     map.put("VI", "{\"name\":\"VIRGIN ISLANDS (U.S.)\",\"fmt\":\"%N%n%O%n%A%n%C %S %Z\",\"require\":\"ACSZ\",\"upper\":\"ACNOS\",\"state_name_type\":\"state\",\"zip_name_type\":\"zip\"}");
-    map.put("VN", "{\"name\":\"VIET NAM\",\"lang\":\"vi\",\"languages\":\"vi\",\"lfmt\":\"%N%n%O%n%A%n%C%n%S %Z\",\"fmt\":\"%N%n%O%n%A%n%C%n%S %Z\",\"label_overrides\":[{\"field\":\"S1\",\"label\":\"Ward/Township/Commune\"},{\"field\":\"S1\",\"label\":\"Phường/Thị trấn/Xã\",\"lang\":\"vi\"}]}");
+    map.put("VN", "{\"name\":\"VIET NAM\",\"lang\":\"vi\",\"languages\":\"vi\",\"lfmt\":\"%N%n%O%n%A%n%C%n%S %Z\",\"fmt\":\"%N%n%O%n%A%n%C%n%S %Z\",\"require\":\"AS\",\"label_overrides\":[{\"field\":\"S1\",\"label\":\"Ward/Township/Commune\"},{\"field\":\"S1\",\"label\":\"Phường/Thị trấn/Xã\",\"lang\":\"vi\"}]}");
     map.put("VU", "{\"name\":\"VANUATU\"}");
     map.put("WF", "{\"name\":\"WALLIS AND FUTUNA ISLANDS\",\"fmt\":\"%O%n%N%n%A%n%Z %C %X\",\"require\":\"ACZ\",\"upper\":\"ACX\"}");
     map.put("WS", "{\"name\":\"SAMOA\"}");

cpp/src/region_data_constants.cc

@@ -225,6 +225,7 @@ const RegionData kRegionData[] = {
       R"("languages":"dz")"
       "}"},
   {"BV", "{"
+      R"("languages":"no")"
       "}"},
   {"BW", "{"
       R"("languages":"en~tn")"
@@ -251,10 +252,10 @@ const RegionData kRegionData[] = {
       R"("languages":"en")"
       "}"},
   {"CD", "{"
-      R"("languages":"sw~lua~fr~ln~kg")"
+      R"("languages":"fr~sw~lua~ln~kg")"
       "}"},
   {"CF", "{"
-      R"("languages":"fr~sg")"
+      R"("languages":"sg~fr")"
       "}"},
   {"CG", "{"
       R"("languages":"fr")"
@@ -344,7 +345,7 @@ const RegionData kRegionData[] = {
       R"("languages":"de~frr")"
       "}"},
   {"DJ", "{"
-      R"("languages":"ar~fr")"
+      R"("languages":"fr~ar")"
       "}"},
   {"DK", "{"
       R"("fmt":"%N%n%O%n%A%n%Z %C",)"
@@ -434,7 +435,7 @@ const RegionData kRegionData[] = {
   {"FO", "{"
       R"("fmt":"%N%n%O%n%A%nFO%Z %C",)"
       R"("zipex":"100",)"
-      R"("posturl":"https://www.posta.fo/fo/forsida/finn-postnr-stad/",)"
+      R"("posturl":"https://posta.fo/en/private/send-receive/postcodes",)"
       R"("languages":"fo")"
       "}"},
   {"FR", "{"
@@ -521,7 +522,8 @@ const RegionData kRegionData[] = {
   {"GS", "{"
       R"("fmt":"%N%n%O%n%A%n%n%C%n%Z",)"
       R"("require":"ACZ",)"
-      R"("zipex":"SIQQ 1ZZ")"
+      R"("zipex":"SIQQ 1ZZ",)"
+      R"("languages":"en")"
       "}"},
   {"GT", "{"
       R"("fmt":"%N%n%O%n%A%n%Z- %C",)"
@@ -646,7 +648,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%n%Z %C %S",)"
       R"("require":"ACSZ",)"
       R"("zipex":"00144,47037,39049",)"
-      R"("posturl":"http://www.poste.it/online/cercacap/",)"
+      R"("posturl":"https://www.poste.it/cerca/index.html#/risultati-cerca-cap/",)"
       R"("languages":"it")"
       "}"},
   {"JE", "{"
@@ -698,7 +700,7 @@ const RegionData kRegionData[] = {
       R"("languages":"en~gil")"
       "}"},
   {"KM", "{"
-      R"("languages":"ar~fr~zdj~wni")"
+      R"("languages":"ar~zdj~wni~fr")"
       "}"},
   {"KN", "{"
       R"("fmt":"%N%n%O%n%A%n%C, %S",)"
@@ -863,7 +865,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%A%n%O%n%N",)"
       R"("lfmt":"%N%n%O%n%A",)"
       R"("require":"A",)"
-      R"("languages":"zh-Hant~pt")"
+      R"("languages":"zh-Hant~yue~pt")"
       "}"},
   {"MP", "{"
       R"("fmt":"%N%n%O%n%A%n%C %S %Z",)"
@@ -896,7 +898,7 @@ const RegionData kRegionData[] = {
   {"MU", "{"
       R"("fmt":"%N%n%O%n%A%n%Z%n%C",)"
       R"("zipex":"42602",)"
-      R"("languages":"en~fr")"
+      R"("languages":"fr~en")"
       "}"},
   {"MV", "{"
       R"("fmt":"%N%n%O%n%A%n%C %Z",)"
@@ -1198,7 +1200,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%n%Z %C",)"
       R"("require":"AZ",)"
       R"("zipex":"47890,47891,47895,47899",)"
-      R"("posturl":"http://www.poste.it/online/cercacap/",)"
+      R"("posturl":"https://www.poste.it/cerca/index.html#/risultati-cerca-cap/",)"
       R"("languages":"it")"
       "}"},
   {"SN", "{"
@@ -1233,7 +1235,7 @@ const RegionData kRegionData[] = {
       "}"},
   {"SY", "{"
       R"("locality_name_type":"district",)"
-      R"("languages":"ar~fr")"
+      R"("languages":"ar")"
       "}"},
   {"SZ", "{"
       R"("fmt":"%N%n%O%n%A%n%C%n%Z",)"
@@ -1253,7 +1255,7 @@ const RegionData kRegionData[] = {
       R"("languages":"en")"
       "}"},
   {"TD", "{"
-      R"("languages":"fr~ar")"
+      R"("languages":"ar~fr")"
       "}"},
   {"TF", "{"
       R"("languages":"fr")"
@@ -1273,7 +1275,7 @@ const RegionData kRegionData[] = {
       R"("languages":"tg")"
       "}"},
   {"TK", "{"
-      R"("languages":"en~tkl")"
+      R"("languages":"tkl~en")"
       "}"},
   {"TL", "{"
       R"("languages":"pt~tet")"
@@ -1402,6 +1404,7 @@ const RegionData kRegionData[] = {
   {"VN", "{"
       R"("fmt":"%N%n%O%n%A%n%C%n%S %Z",)"
       R"("lfmt":"%N%n%O%n%A%n%C%n%S %Z",)"
+      R"("require":"AS",)"
       R"("zipex":"70010,55999",)"
       R"("languages":"vi")"
       "}"},
@@ -1500,7 +1503,7 @@ std::vector<std::string> InitRegionCodes() {
   return region_codes;
 }
 
-const std::map<std::string, size_t> InitMaxLookupKeyDepth() {
+std::map<std::string, size_t> InitMaxLookupKeyDepth() {
   std::map<std::string, size_t> max_depth;
   for (const auto& region_data : kRegionData) {
     std::vector<FormatElement> fields;