Merge pull request #233 from google/FF0F89A9FFB90668CB5E5C968FD01756

(AUTOMATIC) opensource update

Author: pkasting

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

@@ -82,7 +82,7 @@ private static Map<String, String> createMap() {
     map.put("CL", "{\"name\":\"CHILE\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%Z %C%n%S\"}");
     map.put("CM", "{\"name\":\"CAMEROON\"}");
     map.put("CN", "{\"name\":\"CHINA\",\"lang\":\"zh\",\"languages\":\"zh\",\"lfmt\":\"%N%n%O%n%A%n%D%n%C%n%S, %Z\",\"fmt\":\"%Z%n%S%C%D%n%A%n%O%n%N\",\"require\":\"ACSZ\",\"upper\":\"S\",\"sublocality_name_type\":\"district\",\"width_overrides\":\"%S:S%C:S%D:S\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"市/自治州/地区/盟\",\"lang\":\"zh\"},{\"field\":\"S\",\"label\":\"省/自治区/直辖市\",\"lang\":\"zh\"},{\"field\":\"D\",\"label\":\"区/县/旗\",\"lang\":\"zh\"}]}");
-    map.put("CO", "{\"name\":\"COLOMBIA\",\"fmt\":\"%N%n%O%n%A%n%D%n%C, %S, %Z\",\"require\":\"AS\",\"state_name_type\":\"department\",\"label_overrides\":[{\"field\":\"LL\",\"label\":\"Vereda\"},{\"field\":\"A3\",\"label\":\"Corregimiento\"},{\"field\":\"A2\",\"label\":\"Municipio\"}]}");
+    map.put("CO", "{\"name\":\"COLOMBIA\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%D%n%C, %S, %Z\",\"require\":\"AS\",\"state_name_type\":\"department\",\"label_overrides\":[{\"field\":\"LL\",\"label\":\"Vereda\"},{\"field\":\"A3\",\"label\":\"Corregimiento\"},{\"field\":\"A2\",\"label\":\"Municipio\"}]}");
     map.put("CR", "{\"name\":\"COSTA RICA\",\"fmt\":\"%N%n%O%n%A%n%S, %C%n%Z\",\"require\":\"ACS\"}");
     map.put("CU", "{\"name\":\"CUBA\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%C %S%n%Z\"}");
     map.put("CV", "{\"name\":\"CAPE VERDE\",\"lang\":\"pt\",\"languages\":\"pt\",\"fmt\":\"%N%n%O%n%A%n%Z %C%n%S\",\"state_name_type\":\"island\"}");

cpp/src/region_data_constants.cc

@@ -342,7 +342,7 @@ const RegionData kRegionData[] = {
       R"("require":"ACZ",)"
       R"("zipex":"26133,53225",)"
       R"("posturl":"http://www.postdirekt.de/plzserver/",)"
-      R"("languages":"de")"
+      R"("languages":"de~frr")"
       "}"},
   {"DJ", "{"
       R"("languages":"ar~fr")"
@@ -412,7 +412,7 @@ const RegionData kRegionData[] = {
       R"("require":"ACZ",)"
       R"("zipex":"00550,00011",)"
       R"("posturl":"https://support.posti.fi/fi/tyokalut/postinumerohaku.html",)"
-      R"("languages":"fi~sv")"
+      R"("languages":"fi~sv~sms")"
       "}"},
   {"FJ", "{"
       R"("languages":"en~hif~fj")"
@@ -568,7 +568,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%nHR-%Z %C",)"
       R"("zipex":"10000,21001,10002",)"
       R"("posturl":"http://www.posta.hr/default.aspx?pretpum",)"
-      R"("languages":"hr~it")"
+      R"("languages":"hr~it~vec")"
       "}"},
   {"HT", "{"
       R"("fmt":"%N%n%O%n%A%nHT%Z %C",)"
@@ -1175,7 +1175,7 @@ const RegionData kRegionData[] = {
   {"SI", "{"
       R"("fmt":"%N%n%O%n%A%nSI-%Z %C",)"
       R"("zipex":"4000,1001,2500",)"
-      R"("languages":"sl")"
+      R"("languages":"sl~vec")"
       "}"},
   {"SJ", "{"
       R"("fmt":"%N%n%O%n%A%n%Z %C",)"

cpp/src/validating_util.cc

@@ -84,8 +84,8 @@ bool UnwrapHeader(const char* header_prefix,
 void ValidatingUtil::Wrap(time_t timestamp, std::string* data) {
   assert(data != nullptr);
   char timestamp_string[2 + 3 * sizeof timestamp];
-  int size = std::snprintf(timestamp_string, sizeof(timestamp_string), "%ld",
-                                             static_cast<long>(timestamp));
+  int size =
+      std::sprintf(timestamp_string, "%ld", static_cast<long>(timestamp));
   assert(size > 0);
   assert(size < sizeof timestamp_string);
   (void)size;