openharmony/global_i18n
1
0
Fork 0
mirror of https://gitee.com/openharmony/global_i18n synced 2024-12-02 20:45:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!537 修改地区设置时发送提醒

Browse Source 
Merge pull request !537 from Maozu/anco
This commit is contained in:
openharmony_ci 2023-12-04 03:33:51 +00:00 committed by Gitee
commit b2b5ddf916
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/intl/include/locale_config.h
View File

@ -141,6 +141,7 @@ private:
static std::set<std::string> validHcTag;
static bool listsInitialized;
static bool InitializeLists();
static bool updateLocal(const std::string &locale);
};
} // namespace I18n
} // namespace Global

46
frameworks/intl/src/locale_config.cpp
View File

@ -357,21 +357,7 @@ bool LocaleConfig::SetSystemLanguage(const string &language)
std::string oldLanguage = GetSystemLanguage();
if (SetParameter(LANGUAGE_KEY, language.data()) == 0) {
bool isUpdateSuccess = UpdateSystemLocale(language);
if (isUpdateSuccess) {
#ifdef SUPPORT_GRAPHICS
auto appMgrClient = std::make_unique<AppExecFwk::AppMgrClient>();
AppExecFwk::Configuration configuration;
configuration.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE, language);
appMgrClient->UpdateConfiguration(configuration);
OHOS::AAFwk::Want localeChangeWant;
localeChangeWant.SetAction(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_LOCALE_CHANGED);
OHOS::EventFwk::CommonEventData event(localeChangeWant);
if (!OHOS::EventFwk::CommonEventManager::PublishCommonEvent(event)) {
HiLog::Info(LABEL, "Failed to Publish event %{public}s", localeChangeWant.GetAction().c_str());
return false;
}
#endif
if (isUpdateSuccess && updateLocal(language)) {
return true;
} else {
SetParameter(LANGUAGE_KEY, oldLanguage.data());
@ -410,7 +396,10 @@ bool LocaleConfig::SetSystemRegion(const string &region)
return false;
}
}
return SetParameter(LOCALE_KEY, newLocale.data()) == 0;
if (SetParameter(LOCALE_KEY, newLocale.data()) == 0 && updateLocal(newLocale)) {
return true;
}
return false;
}
bool LocaleConfig::SetSystemLocale(const string &locale)
@ -421,7 +410,30 @@ bool LocaleConfig::SetSystemLocale(const string &locale)
if (!IsValidTag(locale)) {
return false;
}
return SetParameter(LOCALE_KEY, locale.data()) == 0;
if (SetParameter(LOCALE_KEY, locale.data()) == 0 && updateLocal(locale)) {
return true;
}
return false;
}
bool LocaleConfig::updateLocal(const string &locale) {
#ifdef SUPPORT_GRAPHICS
auto appMgrClient = std::make_unique<AppExecFwk::AppMgrClient>();
AppExecFwk::Configuration configuration;
configuration.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE, locale);
appMgrClient->UpdateConfiguration(configuration);
OHOS::AAFwk::Want localeChangeWant;
localeChangeWant.SetAction(OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_LOCALE_CHANGED);
OHOS::EventFwk::CommonEventData event(localeChangeWant);
if (!OHOS::EventFwk::CommonEventManager::PublishCommonEvent(event)) {
HiLog::Error(LABEL, "Failed to Publish event %{public}s", localeChangeWant.GetAction().c_str());
return false;
} else {
return true;
}
#endif
return false;
}
bool LocaleConfig::IsValidLanguage(const string &language)