cxfeng1 closed pull request #1552: [iOS] Add getLanguageSync for local, and fix
original getLanguage met…
URL: https://github.com/apache/incubator-weex/pull/1552
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m
b/ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m
index 2ea918bbd3..7f48edde85 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m
@@ -21,17 +21,24 @@
@implementation WXLocaleModule
-WX_EXPORT_METHOD_SYNC(@selector(getLanguage:))
+WX_EXPORT_METHOD(@selector(getLanguage:))
+WX_EXPORT_METHOD_SYNC(@selector(getLanguageSync))
WX_EXPORT_METHOD_SYNC(@selector(getLanguages))
/**
Get preferred language of the user
*/
-- (NSString *)getLanguage:(WXKeepAliveCallback)callback {
+- (void)getLanguage:(WXKeepAliveCallback)callback {
if (callback) {
callback([NSLocale preferredLanguages][0], NO);
}
- return [NSLocale preferredLanguages][0];
+}
+
+/**
+ Get preferred language of the user
+ */
+- (NSString *)getLanguageSync {
+ return [NSLocale preferredLanguages][0];
}
/**
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
