rAc: fix international address formatting (mostly)

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

 // Copyright (C) 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 1196 matching lines @@
 const std::string& RegionDataConstants::GetLanguageCompactLineSeparator(
     const std::string& language_code) {
   static const std::string kEmptyString;
   static const std::string kArabicSeparator =  "، ";
   static const std::string kSpace = " ";
   static const std::string kCommaAndSpace = ", ";
   if (language_code == "ja" ||
       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;
 }
 
 }  // namespace addressinput
 }  // namespace i18n