commit e79b1486346f1d1a9dc7f5a4d3ea587d8ec8737f
author Lianghui Chen <liachen@blackberry.com> Fri Sep 12 14:38:24 2014 -0400
committer Bryan Higgins <bhiggins@blackberry.com> Mon Sep 15 09:24:55 2014 -0400
tree 9eed837b0735f4259ff83ab1fd3ebb4fc5eadbb6
parent c4e3eda7db65e3018c40fe103622e5b764139e02

CB-6490 [BlackBerry10] Use hyphen instead of underscore in getLocaleName().

src/blackberry10/native/device/libGlobalization.so

diff --git a/src/blackberry10/native/device/libGlobalization.so b/src/blackberry10/native/device/libGlobalization.so
index 3329b36..b0eb328 100755
--- a/src/blackberry10/native/device/libGlobalization.so
+++ b/src/blackberry10/native/device/libGlobalization.so
Binary files differ

src/blackberry10/native/simulator/libGlobalization.so

diff --git a/src/blackberry10/native/simulator/libGlobalization.so b/src/blackberry10/native/simulator/libGlobalization.so
index 745135b..054778e 100755
--- a/src/blackberry10/native/simulator/libGlobalization.so
+++ b/src/blackberry10/native/simulator/libGlobalization.so
Binary files differ

src/blackberry10/native/src/globalization_ndk.cpp

diff --git a/src/blackberry10/native/src/globalization_ndk.cpp b/src/blackberry10/native/src/globalization_ndk.cpp
index 8cb4703..2bddfeb 100644
--- a/src/blackberry10/native/src/globalization_ndk.cpp
+++ b/src/blackberry10/native/src/globalization_ndk.cpp
@@ -225,8 +225,14 @@
 {
     const Locale& loc = Locale::getDefault();
     const char* name = loc.getName();
-    if (name)
-        return resultInJson(name);
+    if (name) {
+        std::string sname(name);
+        size_t pos = sname.find_first_of("_");
+        if (pos != std::string::npos)
+            sname.replace(pos, 1, "-");
+
+        return resultInJson(sname);
+    }
 
     const char* lang = loc.getLanguage();
     if (!lang)
@@ -236,7 +242,7 @@
     if (!country)
         return resultInJson(lang);
 
-    return resultInJson(std::string(lang) + "_" + country);
+    return resultInJson(std::string(lang) + "-" + country);
 }
 
 static bool handleDateOptions(const Json::Value& options, DateFormat::EStyle& dateStyle, DateFormat::EStyle& timeStyle, std::string& error)