You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2014/09/15 15:25:43 UTC
[1/2] git commit: CB-6490 [BlackBerry10] Use hyphen instead of
underscore in getLocaleName().
Repository: cordova-plugin-globalization
Updated Branches:
refs/heads/master aa66116f8 -> e79b14863
CB-6490 [BlackBerry10] Use hyphen instead of underscore in getLocaleName().
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/commit/e79b1486
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/e79b1486
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/e79b1486
Branch: refs/heads/master
Commit: e79b1486346f1d1a9dc7f5a4d3ea587d8ec8737f
Parents: c4e3eda
Author: Lianghui Chen <li...@blackberry.com>
Authored: Fri Sep 12 14:38:24 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Mon Sep 15 09:24:55 2014 -0400
----------------------------------------------------------------------
.../native/device/libGlobalization.so | Bin 275007 -> 275007 bytes
.../native/simulator/libGlobalization.so | Bin 1395627 -> 1397163 bytes
.../native/src/globalization_ndk.cpp | 12 +++++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/e79b1486/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
Binary files a/src/blackberry10/native/device/libGlobalization.so and b/src/blackberry10/native/device/libGlobalization.so differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/e79b1486/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
Binary files a/src/blackberry10/native/simulator/libGlobalization.so and b/src/blackberry10/native/simulator/libGlobalization.so differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/e79b1486/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 @@ std::string GlobalizationNDK::getLocaleName()
{
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 @@ std::string GlobalizationNDK::getLocaleName()
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)
[2/2] git commit: CB-7548 [BlackBerry10] Allow any numeric type as
date in dateToString method.
Posted by bh...@apache.org.
CB-7548 [BlackBerry10] Allow any numeric type as date in dateToString method.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/commit/c4e3eda7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/c4e3eda7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/c4e3eda7
Branch: refs/heads/master
Commit: c4e3eda7db65e3018c40fe103622e5b764139e02
Parents: aa66116
Author: Lianghui Chen <li...@blackberry.com>
Authored: Wed Sep 10 14:36:41 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Mon Sep 15 09:24:55 2014 -0400
----------------------------------------------------------------------
.../native/device/libGlobalization.so | Bin 275007 -> 275007 bytes
.../native/simulator/libGlobalization.so | Bin 1395543 -> 1395627 bytes
.../native/src/globalization_ndk.cpp | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/c4e3eda7/src/blackberry10/native/device/libGlobalization.so
----------------------------------------------------------------------
diff --git a/src/blackberry10/native/device/libGlobalization.so b/src/blackberry10/native/device/libGlobalization.so
index 3b39fcc..3329b36 100755
Binary files a/src/blackberry10/native/device/libGlobalization.so and b/src/blackberry10/native/device/libGlobalization.so differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/c4e3eda7/src/blackberry10/native/simulator/libGlobalization.so
----------------------------------------------------------------------
diff --git a/src/blackberry10/native/simulator/libGlobalization.so b/src/blackberry10/native/simulator/libGlobalization.so
index 0cdcafb..745135b 100755
Binary files a/src/blackberry10/native/simulator/libGlobalization.so and b/src/blackberry10/native/simulator/libGlobalization.so differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/c4e3eda7/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 445d238..8cb4703 100644
--- a/src/blackberry10/native/src/globalization_ndk.cpp
+++ b/src/blackberry10/native/src/globalization_ndk.cpp
@@ -345,8 +345,8 @@ std::string GlobalizationNDK::dateToString(const std::string& args)
return errorInJson(PARSING_ERROR, "No date provided!");
}
- if (!date.isDouble()) {
- slog2f(0, ID_G11N, SLOG2_ERROR, "GlobalizationNDK::dateToString: date is not a Double: %d.",
+ if (!date.isNumeric()) {
+ slog2f(0, ID_G11N, SLOG2_ERROR, "GlobalizationNDK::dateToString: date is not a numeric: %d.",
date.type());
return errorInJson(PARSING_ERROR, "Date in wrong format!");
}