From b8c08fa58476a6f97472072c504b7bec07f68214 Mon Sep 17 00:00:00 2001 From: Lara Scheidegger Date: Wed, 9 Jul 2014 07:35:10 +0000 Subject: Updated data for Andorra/Russia, new label for Russia, small formatting fixes (Java). --- cpp/src/region_data_constants.cc | 8 ++++---- cpp/src/rule.cc | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/region_data_constants.cc b/cpp/src/region_data_constants.cc index d12bafc..8c552d3 100644 --- a/cpp/src/region_data_constants.cc +++ b/cpp/src/region_data_constants.cc @@ -43,9 +43,8 @@ std::map InitRegionData() { "\"languages\":\"en\"" "}")); region_data.insert(std::make_pair("AD", "{" - "\"fmt\":\"%N%n%O%n%A%n%Z %S\"," - "\"require\":\"AS\"," - "\"state_name_type\":\"parish\"," + "\"fmt\":\"%N%n%O%n%A%n%Z %C\"," + "\"require\":\"A\"," "\"zipex\":\"AD100,AD501,AD700\"," "\"posturl\":\"http://www.correos.es/comun/CodigosPostales/1010_s-CodPostal.asp\?Provincia=\"," "\"languages\":\"ca\"" @@ -1062,8 +1061,9 @@ std::map InitRegionData() { "\"languages\":\"sr-Cyrl~sr-Latn\"" "}")); region_data.insert(std::make_pair("RU", "{" - "\"fmt\":\"%Z %C %n%A%n%O%n%N\"," + "\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\"," "\"require\":\"ACZ\"," + "\"state_name_type\":\"oblast\"," "\"zipex\":\"125075,247112,103375\"," "\"posturl\":\"http://info.russianpost.ru/servlet/department\"," "\"languages\":\"ru\"" diff --git a/cpp/src/rule.cc b/cpp/src/rule.cc index e25142f..b4d03ca 100644 --- a/cpp/src/rule.cc +++ b/cpp/src/rule.cc @@ -72,6 +72,8 @@ NameMessageIdMap InitAdminAreaMessageIds() { "emirate", IDS_LIBADDRESSINPUT_EMIRATE)); message_ids.insert(std::make_pair( "island", IDS_LIBADDRESSINPUT_ISLAND)); + message_ids.insert(std::make_pair( + "oblast", IDS_LIBADDRESSINPUT_OBLAST)); message_ids.insert(std::make_pair( "parish", IDS_LIBADDRESSINPUT_PARISH)); message_ids.insert(std::make_pair( -- cgit v1.2.3