organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-20276 Accept empty strings in Locale::setUnicodeKeywordValue().

Browse source 
The API documentation is perfectly clear about this, an empty string for
the value means that the keyword should be removed:

  @param keywordValue value of the keyword to be set. If 0-length or
   NULL, will result in the keyword being removed. No error is given if
   that keyword does not exist.
This commit is contained in:
Fredrik Roubert 2018-11-19 15:12:05 +01:00 • committed by Fredrik Roubert
parent 8a3e1b8d36
commit 6f932b744d
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
icu4c/source/common/locid.cpp
View file

@ -1448,12 +1448,16 @@ Locale::setUnicodeKeywordValue(StringPiece keywordName,
return;
}
const char* legacy_value =
uloc_toLegacyType(keywordName_nul.data(), keywordValue_nul.data());
const char* legacy_value = nullptr;
if (legacy_value == nullptr) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
if (!keywordValue_nul.isEmpty()) {
legacy_value =
uloc_toLegacyType(keywordName_nul.data(), keywordValue_nul.data());
if (legacy_value == nullptr) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
}
setKeywordValue(legacy_key, legacy_value, status);

20
icu4c/source/test/intltest/loctest.cpp
View file

@ -1969,6 +1969,26 @@ LocaleTest::TestSetUnicodeKeywordValueStringPiece(void) {
static const char expected[] = "de@calendar=buddhist;collation=phonebook";
assertEquals("", expected, l.getName());
l.setUnicodeKeywordValue("cu", nullptr, status);
status.errIfFailureAndReset();
assertEquals("", expected, l.getName());
l.setUnicodeKeywordValue("!!", nullptr, status);
assertEquals("status", U_ILLEGAL_ARGUMENT_ERROR, status.reset());
assertEquals("", expected, l.getName());
l.setUnicodeKeywordValue("co", "!!", status);
assertEquals("status", U_ILLEGAL_ARGUMENT_ERROR, status.reset());
assertEquals("", expected, l.getName());
l.setUnicodeKeywordValue("co", nullptr, status);
status.errIfFailureAndReset();
l.setUnicodeKeywordValue("ca", "", status);
status.errIfFailureAndReset();
assertEquals("", Locale::getGerman().getName(), l.getName());
}
void