Remove beta browser support.

Due to many issues faced with beta language packs been avaiable in both firefox and cyberfox, Its best for now to drop support for these branches.
InternalError503 · Nov 3, 2016 · 36d96fd · 36d96fd
1 parent d4dab9e
commit 36d96fd
Show file tree

Hide file tree

Showing 31 changed files with 27 additions and 58 deletions.
diff --git a/chrome/content/language_Manager.xul b/chrome/content/language_Manager.xul
@@ -64,7 +64,7 @@
 		<label id="betawarningtouser" class="uk-alert uk-alert-large uk-alert-danger" hidden="true">&languageManagerBetaWarning.label;</label>
 	</hbox>
 </vbox>
-<description id="desc2" align="center">&languageCurrentInstalled.label;</description>
+<description id="desc1" align="center">&languageCurrentInstalled.label;</description>
 <listbox id="theList">
   <listhead>
     <listheader label="&listItemName.label;"/>
@@ -103,7 +103,7 @@
 </hbox> 
 <separator class="groove-thin" id="restoreDefaultSeparator"/>
 
-<hbox align="center">	
+<hbox align="center" id="buttonContainer">	
  <button id="installButton" label="&installButtonItem.label;" disabled="true" oncommand="gLanguageManger.downloadPack(false);"/> 
  <button id="closeButton" type="button" label="&closeButtonItem.label;" disabled="true" oncommand="gLanguageManger.complete();"/>
  <button id="optionsButton" type="button" label="&optionsButtonItem.label;" oncommand="gLanguageManger.ShowLanguageManagerOptions();"/>

diff --git a/chrome/content/options.js b/chrome/content/options.js
@@ -28,7 +28,7 @@ try{
 		// Panel label
 		OptionsPanelTitle: document.getElementById("OptionsPanel"),
 		OptionsCurrentLocale: document.getElementById("currentLanguage"),	
-		// Show what browser mode firefox or firefox beta or cyberfox.
+		// Show what browser mode firefox.
 		OptionsBrowserMode: document.getElementById("BrowserMode"),
 		// Language manager browser menus items
 		OptionsBrowserMenus: document.getElementById("BrowserMenus"),	
@@ -67,7 +67,7 @@ try{
 
 		/*
 		  Note: We don't show any values on the first run, Once language_Manager.xul has be initialized and the browser verified then we can display a value here.	
-		  Show what browser mode firefox or firefox beta or cyberfox.
+		  Show what browser mode firefox
 		*/
 		var OptionsBrowser_Mode = document.getElementById("form-browser-mode");
 		switch (Services.prefs.getCharPref("extensions.language_manager.browser_mode")) {
@@ -79,11 +79,6 @@ try{
 		    case "firefoxmode":
 				OptionsBrowser_Mode.textContent = bundleOptionsWindow.GetStringFromName("lmBrowserModeFF");
 		    break;
-
-		    case "firefoxbetamode":
-				OptionsBrowser_Mode.textContent = bundleOptionsWindow.GetStringFromName("lmBrowserModeFFB");
-		    break;
-
 		}
 
 		switch (Services.prefs.getBoolPref("extensions.language_manager.showinmenu")) {

diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
@@ -469,17 +469,19 @@ initPane: function(){
 
 
 	/*
-		Show a brief notifcation to the user about beta language packs then hide the notification after * time.
-		6 seconds should be enough to inform the user then hide the notification to prevet wasted vertical screen space.
-		Note: For AMO reviewers this notifcation should only show in firefox beta clients.
+		No longer supports firefox beta
+		Note: For AMO reviewers this notifcation should only show in firefox beta clients, We are dropping support for it entirely.
 	*/	
 	showbetaWarning : function(){
 		var notice = document.getElementById("betawarningtouser");
 		if (notice && typeof(notice)  != "undefined" || notice != null){
 			notice.hidden = false;
-			setTimeout(function() {
-				notice.hidden = true;
-			}, 6000); // Wait 6 seconds before hiding the notification.
+			document.getElementById("top_pane_caption").hidden = true;
+			document.getElementById("desc1").hidden = true;
+			document.getElementById("theList").hidden = true;
+			document.getElementById("iRow").hidden = true;
+			document.getElementById("desc2").hidden = true;
+			document.getElementById("buttonContainer").hidden = true;
 		}
 	},
 
@@ -494,10 +496,9 @@ initPane: function(){
 			if (gLMangerHandler.browserAppInformation.name.toLowerCase() === "Firefox".toLowerCase()) {
 				/*
 				   Check if running firefox beta.
-				   Since we target the releases/latest-beta we only support the latest firefox beta release.
+				   Since we target the releases we only support the latest firefox release.
 				*/
 				if (Services.prefs.getCharPref("app.update.channel") === "beta"){
-					Services.prefs.setCharPref("extensions.language_manager.browser_mode", "firefoxbetamode");
 						gLanguageManger.showbetaWarning();
 				}else{
 					Services.prefs.setCharPref("extensions.language_manager.browser_mode", "firefoxmode");
@@ -582,16 +583,6 @@ initPane: function(){
 			// Request URL where to download language pack from.
 			var cyberfoxModeURL = "https://download.8pecxstudios.com/latest/language/" + gLMangerHandler.browserAppInformation.version + "/";
 			var firerfoxModeURL = "https://ftp.mozilla.org/pub/firefox/releases/" + gLMangerHandler.browserAppInformation.version + "/win32/xpi/";
-			var firefoxBetaModeURL = "https://ftp.mozilla.org/pub/firefox/releases/latest-beta/win32/xpi/";
-			/*
-				Unfortunately changes have been made to the https://ftp.mozilla.org/pub/firefox/releases/latest-beta url and is no longer working correctly.
-				Below we attempt to get the browser display version as it contains what beta version the browser is and construct the url.
-			*/
-			var MozAppConstants = null;
-			try {
-				MozAppConstants = Cu.import("resource://gre/modules/AppConstants.jsm", null).AppConstants;
-				firefoxBetaModeURL = "https://ftp.mozilla.org/pub/firefox/releases/" +  MozAppConstants.MOZ_APP_VERSION_DISPLAY + "/win32/xpi/";
-			}catch(e){MozAppConstants = null;}
 
 				document.getElementById("lm-overlay").hidden = false;					
 				switch (Services.prefs.getCharPref("extensions.language_manager.browser_mode")) {
@@ -601,9 +592,6 @@ initPane: function(){
 					case "firefoxmode":
 						gLanguageManger.validateURL(firerfoxModeURL + document.getElementById("languageMenu").value + ".xpi", true, aBoolean);
 						break;
-					case "firefoxbetamode":
-						gLanguageManger.validateURL(firefoxBetaModeURL + document.getElementById("languageMenu").value + ".xpi", true, aBoolean);				
-						break;
 				}						
 			}catch (e){
 				// Catch any nasty errors and output to dialogue

diff --git a/chrome/locale/af/locale.dtd b/chrome/locale/af/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/af/options.properties b/chrome/locale/af/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/ar/locale.dtd b/chrome/locale/ar/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/ar/options.properties b/chrome/locale/ar/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/be/locale.dtd b/chrome/locale/be/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/be/options.properties b/chrome/locale/be/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/bg/locale.dtd b/chrome/locale/bg/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/bg/options.properties b/chrome/locale/bg/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/ca/locale.dtd b/chrome/locale/ca/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/ca/options.properties b/chrome/locale/ca/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/cs/locale.dtd b/chrome/locale/cs/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/cs/options.properties b/chrome/locale/cs/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/da/locale.dtd b/chrome/locale/da/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/da/options.properties b/chrome/locale/da/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/de/locale.dtd b/chrome/locale/de/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Entferne Packet">
 <!ENTITY languageManagerToggleRemove.tooltip "Entferne Sprachpacket">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/de/options.properties b/chrome/locale/de/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/en-US/locale.dtd b/chrome/locale/en-US/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/en-US/options.properties b/chrome/locale/en-US/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/fr/locale.dtd b/chrome/locale/fr/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Enlever le paquet">
 <!ENTITY languageManagerToggleRemove.tooltip "Enlever le paquet linguistique">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/fr/options.properties b/chrome/locale/fr/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/ja/locale.dtd b/chrome/locale/ja/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "パックを削除">
 <!ENTITY languageManagerToggleRemove.tooltip "言語パックを削除します">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/ja/options.properties b/chrome/locale/ja/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/pl/locale.dtd b/chrome/locale/pl/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Usuń pakiet">
 <!ENTITY languageManagerToggleRemove.tooltip "Usuń pakiet językowy">
 
-<!ENTITY languageManagerBetaWarning.label "Ważne: pakiety językowe dla twojej wersji &brandShortName; Beta mogą być teraz niedostępne!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/pl/options.properties b/chrome/locale/pl/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Dodaj Language Manager do menu przeglądarki:
 

diff --git a/chrome/locale/ru/locale.dtd b/chrome/locale/ru/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Удалить пакет">
 <!ENTITY languageManagerToggleRemove.tooltip "Удаление языкового пакета">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/ru/options.properties b/chrome/locale/ru/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus:
 

diff --git a/chrome/locale/tr/locale.dtd b/chrome/locale/tr/locale.dtd
@@ -40,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta is no longer supported, language manager only does release versions of &brandShortName;">
diff --git a/chrome/locale/tr/options.properties b/chrome/locale/tr/options.properties
@@ -10,7 +10,6 @@ lmCopyright=Copyright© 2012-2016
 
 lmBrowserModeCF=Cyberfox
 lmBrowserModeFF=Firefox
-lmBrowserModeFFB=Firefox Beta
 
 lmBrowserMenus=Add language manager to browser menus: