Verified Commit 10050ab5 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 41417: Always prompt users to restart after changing language 

Bug 41738: Drop the patch to disable live reload

Revert "Bug 41417: Always prompt users to restart after changing language"

This reverts commit bad85a45.
parent b5620096

browser/components/preferences/main.js

+15 −8
Changes for browser/components/preferences/main.js: 15 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -1216,17 +1216,18 @@ var gMainPane = { 
    gMainPane.recordBrowserLanguagesTelemetry("reorder");



    switch (gMainPane.getLanguageSwitchTransitionType(newLocales)) {

      // tor-browser#41417: Always prompt for the restart, until we switch to

      // Fluent, since the current way we use to update languages does not allow

      // live-reload. We could also call showConfirmLanguageChangeMessageBar in

      // the official live-reload case, but the result is inconsistent and makes

      // handling the locales-match case harder.

      case "requires-restart":

      case "live-reload":

        // Prepare to change the locales, as they were different.

        gMainPane.showConfirmLanguageChangeMessageBar(newLocales);

        gMainPane.updatePrimaryBrowserLanguageUI(newLocales[0]);

        break;

      case "live-reload":

        Services.locale.requestedLocales = newLocales;

        gMainPane.updatePrimaryBrowserLanguageUI(

          Services.locale.appLocaleAsBCP47

        );

        gMainPane.hideConfirmLanguageChangeMessageBar();

        break;

      case "locales-match":

        // They matched, so we can reset the UI.

        gMainPane.updatePrimaryBrowserLanguageUI(
@@ -1479,12 +1480,18 @@ var gMainPane = { 
    }



    switch (gMainPane.getLanguageSwitchTransitionType(selected)) {

      // tor-browser#41417: see onPrimaryBrowserLanguageMenuChange

      case "requires-restart":

      case "live-reload":

        gMainPane.showConfirmLanguageChangeMessageBar(selected);

        gMainPane.updatePrimaryBrowserLanguageUI(selected[0]);

        break;

      case "live-reload":

        Services.locale.requestedLocales = selected;



        gMainPane.updatePrimaryBrowserLanguageUI(

          Services.locale.appLocaleAsBCP47

        );

        gMainPane.hideConfirmLanguageChangeMessageBar();

        break;

      case "locales-match":

        // They matched, so we can reset the UI.

        gMainPane.updatePrimaryBrowserLanguageUI(