Issue 2067 - Unify logic retrieving the UI locale

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 92 matching lines @@
             legacySafariVersion: (info.platform == "safari" && (
                 Services.vc.compare(info.platformVersion, "6.0") < 0 ||   // beforeload breaks websites in Safari 5
                 Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0
                 Services.vc.compare(info.platformVersion, "7.0") == 0))
           });
         }
         else if (message.what == "doclink")
           callback(Utils.getDocLink(message.link));
         else if (message.what == "localeInfo")
         {
-          var bidiDir = ext.i18n.getMessage("@@bidi_dir");

[Wladimir Palant, 2015/03/02 11:40:51]

ext.i18n is purely content side in Firefox, so this won't work. How about:

if ("chromeRegistry" in Utils)
  ...
else
  ext.i18n.getMessage();

[Sebastian Noack, 2015/03/02 11:56:03]

Oh, didn't know that.

-          if (!bidiDir)
+          var bidiDir;
+          if ("chromeRegistry" in Utils)
             bidiDir = Utils.chromeRegistry.isLocaleRTL("adblockplus") ? "rtl" : "ltr";
+          else
+            bidiDir = ext.i18n.getMessage("@@bidi_dir");
+
           callback({locale: Utils.appLocale, bidiDir: bidiDir});
         }
         else
           callback(null);
         break;
       case "app.open":
         if (message.what == "options")
           ext.showOptions();
         break;
       case "subscriptions.get":
@@ skipping 42 matching lines @@
         }
 
         if (message.filter)
           filters.subscription = message.filter;
         else
           delete filters.subscription;
         break;
     }
   });
 })(this);