diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/region_data_constants.cc | 8 | ||||
| -rw-r--r-- | cpp/src/rule.cc | 2 |
2 files changed, 6 insertions, 4 deletions
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<std::string, std::string> 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<std::string, std::string> 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 @@ -73,6 +73,8 @@ NameMessageIdMap InitAdminAreaMessageIds() { 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( "prefecture", IDS_LIBADDRESSINPUT_PREFECTURE)); |