openharmony/global_i18n
1
0
Fork 0
mirror of https://gitee.com/openharmony/global_i18n synced 2024-11-30 18:51:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!357 解决Locale属性设置导致应用crash问题

Browse Source 
Merge pull request !357 from sunyaozu/master
This commit is contained in:
openharmony_ci 2023-01-20 03:32:53 +00:00 committed by Gitee
commit c2837003ad
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/js/kits/include/intl_addon.h
View File

@ -115,6 +115,8 @@ private:
bool InitPluralRulesContext(napi_env env, napi_callback_info info, std::vector<std::string> localeTags,
std::map<std::string, std::string> &map);
static napi_value SetProperty(napi_env env, napi_callback_info info);
napi_env env_;
std::unique_ptr<LocaleInfo> locale_ = nullptr;
std::unique_ptr<DateTimeFormat> datefmt_ = nullptr;

28
interfaces/js/kits/src/intl_addon.cpp
View File

@ -42,20 +42,28 @@ void IntlAddon::Destructor(napi_env env, void *nativeObject, void *hint)
reinterpret_cast<IntlAddon *>(nativeObject)->~IntlAddon();
}
napi_value IntlAddon::SetProperty(napi_env env, napi_callback_info info)
{
// do nothing but provided as an input parameter for DECLARE_NAPI_GETTER_SETTER;
napi_value result = nullptr;
NAPI_CALL(env, napi_get_undefined(env, &result));
return result;
}
napi_value IntlAddon::InitLocale(napi_env env, napi_value exports)
{
napi_status status = napi_ok;
napi_property_descriptor properties[] = {
DECLARE_NAPI_GETTER("language", GetLanguage),
DECLARE_NAPI_GETTER("baseName", GetBaseName),
DECLARE_NAPI_GETTER("region", GetRegion),
DECLARE_NAPI_GETTER("script", GetScript),
DECLARE_NAPI_GETTER("calendar", GetCalendar),
DECLARE_NAPI_GETTER("collation", GetCollation),
DECLARE_NAPI_GETTER("hourCycle", GetHourCycle),
DECLARE_NAPI_GETTER("numberingSystem", GetNumberingSystem),
DECLARE_NAPI_GETTER("numeric", GetNumeric),
DECLARE_NAPI_GETTER("caseFirst", GetCaseFirst),
DECLARE_NAPI_GETTER_SETTER("language", GetLanguage, SetProperty),
DECLARE_NAPI_GETTER_SETTER("baseName", GetBaseName, SetProperty),
DECLARE_NAPI_GETTER_SETTER("region", GetRegion, SetProperty),
DECLARE_NAPI_GETTER_SETTER("script", GetScript, SetProperty),
DECLARE_NAPI_GETTER_SETTER("calendar", GetCalendar, SetProperty),
DECLARE_NAPI_GETTER_SETTER("collation", GetCollation, SetProperty),
DECLARE_NAPI_GETTER_SETTER("hourCycle", GetHourCycle, SetProperty),
DECLARE_NAPI_GETTER_SETTER("numberingSystem", GetNumberingSystem, SetProperty),
DECLARE_NAPI_GETTER_SETTER("numeric", GetNumeric, SetProperty),
DECLARE_NAPI_GETTER_SETTER("caseFirst", GetCaseFirst, SetProperty),
DECLARE_NAPI_FUNCTION("toString", ToString),
DECLARE_NAPI_FUNCTION("minimize", Minimize),
DECLARE_NAPI_FUNCTION("maximize", Maximize),