Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 20:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1706318 - Rename connector pattern override preference; r=zbraniecki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D112815
This commit is contained in:
Dan Minor 2021-04-26 18:11:59 +00:00
parent fe1cf774c7
commit db62540452
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intl/locale/OSPreferences.cpp
View File

@ -385,7 +385,7 @@ bool OSPreferences::GetDateTimeConnectorPattern(const nsACString& aLocale,
// Check for a valid override pref and use that if present.
nsAutoCString value;
nsresult nr = Preferences::GetCString(
"intl.date_time.pattern_override.date_time_short", value);
"intl.date_time.pattern_override.connector_short", value);
if (NS_SUCCEEDED(nr) && value.Find("{0}") != kNotFound &&
value.Find("{1}") != kNotFound) {
aRetVal = std::move(value);

6
intl/locale/tests/gtest/TestOSPreferences.cpp
View File

@ -172,7 +172,7 @@ TEST(Intl_Locale_OSPreferences, GetDateTimePatternPrefOverrides)
mozilla::Preferences::SetCString("intl.date_time.pattern_override.time_short",
"HH:mm:ss");
mozilla::Preferences::SetCString(
"intl.date_time.pattern_override.date_time_short", "{1} {0}");
"intl.date_time.pattern_override.connector_short", "{1} {0}");
nr = osprefs->GetDateTimePattern(mozIOSPreferences::dateTimeFormatStyleShort,
mozIOSPreferences::dateTimeFormatStyleShort,
nsDependentCString(""), pattern);
@ -185,7 +185,7 @@ TEST(Intl_Locale_OSPreferences, GetDateTimePatternPrefOverrides)
// Invalid patterns are ignored
mozilla::Preferences::SetCString(
"intl.date_time.pattern_override.date_time_short", "hello, world!");
"intl.date_time.pattern_override.connector_short", "hello, world!");
nr = osprefs->GetDateTimePattern(mozIOSPreferences::dateTimeFormatStyleShort,
mozIOSPreferences::dateTimeFormatStyleShort,
nsDependentCString(""), pattern);
@ -194,7 +194,7 @@ TEST(Intl_Locale_OSPreferences, GetDateTimePatternPrefOverrides)
// Clearing the override results in getting the default pattern back.
mozilla::Preferences::ClearUser(
"intl.date_time.pattern_override.date_time_short");
"intl.date_time.pattern_override.connector_short");
nr = osprefs->GetDateTimePattern(mozIOSPreferences::dateTimeFormatStyleShort,
mozIOSPreferences::dateTimeFormatStyleShort,
nsDependentCString(""), pattern);