Properly change ON/OFF switch description, fix #17891 (#17919)

Chan Chak Shing · zoracon · commit cf16f7671baf · 2019-05-08T08:48:46.000-07:00
diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js
@@ -154,10 +154,11 @@ function updateEnabledDisabledUI() {
     // Hide or show the rules sections
     if (item.globalEnabled) {
       document.body.className = ""
+      e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable");
       showHttpNowhereUI();
     } else {
       document.body.className = "disabled";
-      e('onoffswitch_label').innerText = 'HTTPS Everywhere is OFF';
+      e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalDisable");
     }
   });
 }
diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd
@@ -7,7 +7,7 @@
 
 <!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere is OFF">
+<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere is OFF">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere is ON">
 <!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible is ON">
 <!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible is OFF">

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,11 @@ function updateEnabledDisabledUI() {`
`154`	`154`	`// Hide or show the rules sections`
`155`	`155`	`if (item.globalEnabled) {`
`156`	`156`	`document.body.className = ""`
	`157`	`+ e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable");`
`157`	`158`	`showHttpNowhereUI();`
`158`	`159`	`} else {`
`159`	`160`	`document.body.className = "disabled";`
`160`		`- e('onoffswitch_label').innerText = 'HTTPS Everywhere is OFF';`
	`161`	`+ e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalDisable");`
`161`	`162`	`}`
`162`	`163`	`});`
`163`	`164`	`}`