You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/06/12 23:32:38 UTC
[1/3] git commit: Fixed up plugin.xml
Updated Branches:
refs/heads/master 28fc5428a -> 46f5670be
Fixed up plugin.xml
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/54dc4ce4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/54dc4ce4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/54dc4ce4
Branch: refs/heads/master
Commit: 54dc4ce41b057556f8fb93af75532db4233686a2
Parents: 28fc542
Author: Tim Kim <ti...@adobe.com>
Authored: Tue Jun 11 16:09:02 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Jun 12 14:13:26 2013 -0700
----------------------------------------------------------------------
plugin.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/54dc4ce4/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 744f30d..dda3b5b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -16,12 +16,12 @@ id="org.apache.cordova.core.Globalization"
<!-- android -->
<platform name="android">
- <config-file target="res/xml/config.xml" parent="/cordova/plugins">
+ <config-file target="res/xml/config.xml" parent="/*">
<plugin name="Globalization" value="org.apache.cordova.core.Globalization"/>
</config-file>
- <source-file src="Globalization.java" target-dir="org/apache/cordova/core" />
- <source-file src="GlobalizationError.java" target-dir="org/apache/cordova/core" />
+ <source-file src="src/android/Globalization.java" target-dir="src/org/apache/cordova/core" />
+ <source-file src="src/android/GlobalizationError.java" target-dir="src/org/apache/cordova/core" />
</platform>
<!-- ios -->
[2/3] git commit: Missing parenthesis
Posted by ti...@apache.org.
Missing parenthesis
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/b9137844
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/b9137844
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/b9137844
Branch: refs/heads/master
Commit: b91378446a59abf12f63cece0447b5aad82bef36
Parents: 54dc4ce
Author: Tim Kim <ti...@adobe.com>
Authored: Wed Jun 12 14:22:16 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Jun 12 14:22:16 2013 -0700
----------------------------------------------------------------------
src/android/Globalization.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/b9137844/src/android/Globalization.java
----------------------------------------------------------------------
diff --git a/src/android/Globalization.java b/src/android/Globalization.java
index 04b6872..9dcbb80 100644
--- a/src/android/Globalization.java
+++ b/src/android/Globalization.java
@@ -260,7 +260,7 @@ public class Globalization extends CordovaPlugin {
String fmt = fmtDate.toLocalizedPattern() + " " + fmtTime.toLocalizedPattern(); //default SHORT date/time format. ex. dd/MM/yyyy h:mm a
//get Date value + options (if available)
- if (options.getJSONObject(0).has(OPTIONS){
+ if (options.getJSONObject(0).has(OPTIONS)){
//options were included
JSONObject innerOptions = options.getJSONObject(0).getJSOBObject(OPTIONS);
[3/3] git commit: Fixed typos
Posted by ti...@apache.org.
Fixed typos
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/46f5670b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/46f5670b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/46f5670b
Branch: refs/heads/master
Commit: 46f5670be4ece571a389c9ab0858399b625ec4a8
Parents: b913784
Author: Tim Kim <ti...@adobe.com>
Authored: Wed Jun 12 14:29:09 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Jun 12 14:29:09 2013 -0700
----------------------------------------------------------------------
src/android/Globalization.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/46f5670b/src/android/Globalization.java
----------------------------------------------------------------------
diff --git a/src/android/Globalization.java b/src/android/Globalization.java
index 9dcbb80..3bb2f37 100644
--- a/src/android/Globalization.java
+++ b/src/android/Globalization.java
@@ -263,7 +263,7 @@ public class Globalization extends CordovaPlugin {
if (options.getJSONObject(0).has(OPTIONS)){
//options were included
- JSONObject innerOptions = options.getJSONObject(0).getJSOBObject(OPTIONS);
+ JSONObject innerOptions = options.getJSONObject(0).getJSONObject(OPTIONS);
//get formatLength option
if (!innerOptions.isNull(FORMATLENGTH)){
String fmtOpt = innerOptions.getString(FORMATLENGTH);
@@ -277,7 +277,7 @@ public class Globalization extends CordovaPlugin {
//return pattern type
fmt = fmtDate.toLocalizedPattern() + " " + fmtTime.toLocalizedPattern();
if (!innerOptions.isNull(SELECTOR)){
- String selOpt = innweOpriona.getString(SELECTOR);
+ String selOpt = innerOptions.getString(SELECTOR);
if (selOpt.equalsIgnoreCase(DATE)){
fmt = fmtDate.toLocalizedPattern();
}else if (selOpt.equalsIgnoreCase(TIME)){