Merge branch 'master' of github.com:kee-org/KeeFox

kee-org · May 14, 2017 · 73bccab · 73bccab
2 parents 5c5ce12 + e990e24
commit 73bccab
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/Firefox addon/KeeFox/chrome/content/commonDialog.js b/Firefox addon/KeeFox/chrome/content/commonDialog.js
@@ -443,18 +443,25 @@ var keeFoxDialogManager = {
                 // The proxy %2$S is requesting a username and password. The site says: "%1$S"
                 var currentProxyL10nPattern = "";            
                 try 
+                {
+                    // Name changed again in Firefox 50 or so
+                    currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy3");
+                } catch (exception)
                 {
                     try 
                     {
                         // Name changed in Firefox 49
                         currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy2");
                     } catch (exception)
                     {
-                        currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy");
+                        try
+                        {
+                            currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy");
+                        } catch (exception)
+                        {
+                            currentProxyL10nPattern = this._promptBundle.GetStringFromName("EnterLoginForProxy");
+                        }
                     }
-                } catch (exception)
-                {
-                    currentProxyL10nPattern = this._promptBundle.GetStringFromName("EnterLoginForProxy");
                 }
 
                 realmFirst = false;