rAc: fix international address formatting (mostly)

third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc

Index: third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc
diff --git a/third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc b/third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc
index 6d7e007a7e5cf50884ce393554c6dc4de30c119b..be60e545f20706156a4a3b75c1d25ac10bcb5ec6 100644
--- a/third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc
+++ b/third_party/libaddressinput/chromium/cpp/src/region_data_constants.cc
@@ -1214,26 +1214,31 @@ const std::string& RegionDataConstants::GetLanguageCompactLineSeparator(
       language_code == "zh" ||
       language_code == "zh-hant" ||
       language_code == "zh-hans") {
-      return kEmptyString;
-  } else if (language_code == "ar" ||
-             language_code == "cjm" ||
-             language_code == "doi" ||
-             language_code == "fa" ||
-             language_code == "lah" ||
-             language_code == "prd" ||
-             language_code == "ps" ||
-             language_code == "swb" ||
-             language_code == "ug" ||
-             language_code == "ur") {
+    return kEmptyString;
+  }
+
+  if (language_code == "ar" ||
+      language_code == "cjm" ||
+      language_code == "doi" ||
+      language_code == "fa" ||
+      language_code == "lah" ||
+      language_code == "prd" ||
+      language_code == "ps" ||
+      language_code == "swb" ||
+      language_code == "ug" ||
+      language_code == "ur") {
     return kArabicSeparator;
-  } else if (language_code == "ko" ||
-             language_code == "kdt" ||
-             language_code == "lcp" ||
-             language_code == "lwl" ||
-             language_code == "th" ||
-             language_code == "tts") {
+  }
+
+  if (language_code == "ko" ||
+      language_code == "kdt" ||
+      language_code == "lcp" ||
+      language_code == "lwl" ||
+      language_code == "th" ||
+      language_code == "tts") {
     return kSpace;
   }
+

[Dan Beam, 2014/01/29 03:26:59]

though i agree with this, are we sure this is a libaddressinput style
convention?

[Evan Stade, 2014/01/29 04:11:00]

yes

   return kCommaAndSpace;
 }