You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/03/01 08:18:28 UTC
[1/2] incubator-weex git commit: *[android] fix NoSuchMethodException
in locale module on api 20 and lower
Repository: incubator-weex
Updated Branches:
refs/heads/master a3a05f089 -> b376260d5
*[android] fix NoSuchMethodException in locale module on api 20 and lower
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e016be48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e016be48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e016be48
Branch: refs/heads/master
Commit: e016be489f45199d40c9b44e0f36227c15d9e86c
Parents: 95e16d8
Author: misakuo <mi...@apache.org>
Authored: Sat Feb 24 10:05:18 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Sat Feb 24 10:05:18 2018 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e016be48/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
index 9838c47..6a3de81 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
@@ -91,12 +91,8 @@ public class WXLocaleModule extends WXModule {
} else {
StringBuilder sb = new StringBuilder();
String language = locale.getLanguage();
- String script = locale.getScript();
String region = locale.getCountry();
sb.append(language);
- if (!TextUtils.isEmpty(script)) {
- sb.append("-").append(script);
- }
if (!TextUtils.isEmpty(region)) {
sb.append("-").append(region);
}
[2/2] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr1035' into apache-master
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr1035' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b376260d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b376260d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b376260d
Branch: refs/heads/master
Commit: b376260d5f69becd748d4d2a1901ed0ee395d702
Parents: a3a05f0 e016be4
Author: misakuo <mi...@apache.org>
Authored: Thu Mar 1 16:18:03 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Mar 1 16:18:03 2018 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------