openharmony/global_i18n
1
0
Fork 0
mirror of https://gitee.com/openharmony/global_i18n synced 2025-02-21 08:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!363 移除getDisplayxxx方法调用icu底层接口

Browse Source 
Merge pull request !363 from sunyaozu/master
This commit is contained in:
openharmony_ci 2023-02-14 10:59:21 +00:00 committed by Gitee
commit b15651b693
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 26 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/intl/include/i18n_calendar.h
View File

@ -59,7 +59,7 @@ public:
int32_t GetFirstDayOfWeek(void);
bool IsWeekend(int64_t date, UErrorCode &status);
bool IsWeekend(void);
std::string GetDisplayName(std::string &displayLocale);
std::string GetDisplayName(std::string &displayLocaleTag);
private:
icu::Calendar *calendar_;
void InitCalendar(const icu::Locale &locale, CalendarType type);

28
frameworks/intl/src/i18n_calendar.cpp
View File

@ -22,6 +22,7 @@
#include "indiancal.h"
#include "islamcal.h"
#include "japancal.h"
#include "locdspnm.h"
#include "persncal.h"
#include "string"
#include "ureslocs.h"
@ -266,33 +267,24 @@ bool I18nCalendar::IsWeekend(void)
return false;
}
std::string I18nCalendar::GetDisplayName(std::string &displayLocale)
std::string I18nCalendar::GetDisplayName(std::string &displayLocaleTag)
{
icu::UnicodeString unistr;
int32_t destCapacity = 50;
UChar *buffer = unistr.getBuffer(destCapacity);
if (buffer == 0 || !calendar_) {
if (calendar_ == nullptr) {
return "";
}
const char *type = calendar_->getType();
if (!type) {
if (type == nullptr) {
return "";
}
int32_t length;
UErrorCode status = U_ZERO_ERROR;
const UChar *str = uloc_getTableStringWithFallback(U_ICUDATA_LANG, displayLocale.c_str(), "Types", "calendar",
type, &length, &status);
int32_t len;
if (status == U_ZERO_ERROR) {
len = (length < destCapacity) ? length : destCapacity;
if ((len > 0) && (str != nullptr)) {
u_memcpy(buffer, str, len);
}
} else {
icu::Locale displayLocale = icu::Locale::forLanguageTag(displayLocaleTag, status);
if (status != U_ZERO_ERROR) {
return "";
}
len = u_terminateUChars(buffer, destCapacity, length, &status);
unistr.releaseBuffer(U_SUCCESS(status) ? len : 0);
icu::LocaleDisplayNames *dspName = icu::LocaleDisplayNames::createInstance(displayLocale);
icu::UnicodeString unistr;
dspName->keyValueDisplayName("calendar", type, unistr);
delete dspName;
std::string ret;
unistr.toUTF8String<std::string>(ret);
return ret;

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

@ -25,6 +25,7 @@
#include "libxml/parser.h"
#include "locale_info.h"
#include "localebuilder.h"
#include "locdspnm.h"
#include "locid.h"
#include "ohos/init_data.h"
#include "parameter.h"
@ -246,66 +247,27 @@ int32_t GetDialectName(const char *localeName, char *name, size_t nameCapacity,
return temp.size();
}
int32_t GetDisplayName(const char *locale, const char *displayLocale, UChar *dest, int32_t destCapacity,
UErrorCode &status)
{
if (status != U_ZERO_ERROR) {
return 0;
}
if ((destCapacity < 0) || (destCapacity > 0 && !dest)) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
char localeBuffer[ULOC_FULLNAME_CAPACITY];
int32_t length = GetDialectName(locale, localeBuffer, sizeof(localeBuffer), status);
if (status != U_ZERO_ERROR || !length) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
const UChar *str = uloc_getTableStringWithFallback(U_ICUDATA_LANG, displayLocale, "Languages",
nullptr, localeBuffer, &length, &status);
if (status <= U_ZERO_ERROR) {
int32_t len = (length < destCapacity) ? length : destCapacity;
if ((len > 0) && (str != nullptr)) {
u_memcpy(dest, str, len);
}
} else {
status = U_USING_DEFAULT_WARNING;
return 0;
}
return u_terminateUChars(dest, destCapacity, length, &status);
}
void GetDisplayLanguageImpl(const char *locale, const char *displayLocale, icu::UnicodeString &result)
{
UChar *buffer = result.getBuffer(50); // size 50 is enough to hold language name
if (!buffer) {
result.truncate(0);
return;
}
UErrorCode status = U_ZERO_ERROR;
int32_t length = GetDisplayName(locale, displayLocale, buffer, result.getCapacity(), status);
result.releaseBuffer(U_SUCCESS(status) ? length : 0);
}
string GetDisplayLanguageInner(const string &language, const string &displayLocale, bool sentenceCase)
string GetDisplayLanguageInner(const string &language, const string &displayLocaleTag, bool sentenceCase)
{
icu::UnicodeString unistr;
// 0 is the start position of language, 2 is the length of zh and fa
if (!language.compare(0, 2, "zh") || !language.compare(0, 2, "fa")) {
UErrorCode error = U_ZERO_ERROR;
icu::Locale disLocale = icu::Locale::forLanguageTag(displayLocale, error);
if (error != U_ZERO_ERROR) {
return language;
if (!language.compare(0, 2, "zh") || !language.compare(0, 2, "fa") || !language.compare(0, 2, "ro")) {
UErrorCode status = U_ZERO_ERROR;
icu::Locale displayLocale = icu::Locale::forLanguageTag(displayLocaleTag.c_str(), status);
if (status != U_ZERO_ERROR) {
return "";
}
const char *name = disLocale.getName();
if (!name) {
return language;
icu::LocaleDisplayNames *dspNames = icu::LocaleDisplayNames::createInstance(displayLocale,
UDialectHandling::ULDN_DIALECT_NAMES);
icu::Locale tempLocale = icu::Locale::forLanguageTag(language.c_str(), status);
if (status != U_ZERO_ERROR) {
return "";
}
GetDisplayLanguageImpl(language.c_str(), name, unistr);
dspNames->localeDisplayName(tempLocale, unistr);
delete dspNames;
} else {
UErrorCode status = U_ZERO_ERROR;
icu::Locale displayLoc = icu::Locale::forLanguageTag(displayLocale, status);
icu::Locale displayLoc = icu::Locale::forLanguageTag(displayLocaleTag, status);
if (status != U_ZERO_ERROR) {
return "";
}