Skip to content

Commit

Permalink
Backed out 6 changesets (bug 1639515) for causing failures on test_in…
Browse files Browse the repository at this point in the history
…tlUtils_getDisplayNames.html. CLOSED TREE

Backed out changeset eaff696ed6a6 (bug 1639515)
Backed out changeset 6d361f92b27e (bug 1639515)
Backed out changeset 6919213b03f7 (bug 1639515)
Backed out changeset 5a08d3b17fa7 (bug 1639515)
Backed out changeset 3681111b7ed3 (bug 1639515)
Backed out changeset 970826244d07 (bug 1639515)
  • Loading branch information
crisscozmuta committed Sep 14, 2021
1 parent ad1d276 commit 59cdd2a
Show file tree
Hide file tree
Showing 23 changed files with 966 additions and 462 deletions.
20 changes: 13 additions & 7 deletions browser/actors/AboutProtectionsParent.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,20 @@ class AboutProtectionsParent extends JSWindowActorParent {
break;
case "FetchContentBlockingEvents":
let dataToSend = {};
let displayNames = new Services.intl.DisplayNames(undefined, {
type: "weekday",
style: "abbreviated",
calendar: "gregory",
let weekdays = Services.intl.getDisplayNames(undefined, {
style: "short",
keys: [
"dates/gregorian/weekdays/sunday",
"dates/gregorian/weekdays/monday",
"dates/gregorian/weekdays/tuesday",
"dates/gregorian/weekdays/wednesday",
"dates/gregorian/weekdays/thursday",
"dates/gregorian/weekdays/friday",
"dates/gregorian/weekdays/saturday",
"dates/gregorian/weekdays/sunday",
],
});

// Weekdays starting Sunday (7) to Saturday (6).
let weekdays = [7, 1, 2, 3, 4, 5, 6].map(day => displayNames.of(day));
weekdays = Object.values(weekdays.values);
dataToSend.weekdays = weekdays;

if (PrivateBrowsingUtils.isWindowPrivate(win)) {
Expand Down
2 changes: 1 addition & 1 deletion dom/base/IntlUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void IntlUtils::GetDisplayNames(const Sequence<nsString>& aLocales,

// Now call the method.
JS::Rooted<JS::Value> retVal(cx);
nsresult rv = mozIntl->GetDisplayNamesDeprecated(locales, options, &retVal);
nsresult rv = mozIntl->GetDisplayNames(locales, options, &retVal);
if (NS_FAILED(rv)) {
aError.Throw(rv);
return;
Expand Down
Loading

0 comments on commit 59cdd2a

Please sign in to comment.