[Pkg-mozext-commits] [adblock-plus] 07/52: Issue 1668 - Fixed direction on add-on pages for right-to-left scripts

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit af9739b8b2424864ed262c1fc1c55211aade872a
Author: Sebastian Noack <sebastian at adblockplug.org>
Date:   Mon Dec 8 20:04:40 2014 +0100

    Issue 1668 - Fixed direction on add-on pages for right-to-left scripts
    
    --HG--
    extra : rebase_source : 8da8785023c1a049232936bdedd28bbdfc1dbbb3
---
 chrome/content/ui/firstRun.js |  3 ---
 chrome/content/ui/i18n.js     | 14 +++++++++-----
 chrome/skin/firstRun.css      |  8 +++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/chrome/content/ui/firstRun.js b/chrome/content/ui/firstRun.js
index be2caa6..4956565 100644
--- a/chrome/content/ui/firstRun.js
+++ b/chrome/content/ui/firstRun.js
@@ -43,9 +43,6 @@
 
   function onDOMLoaded()
   {
-    var locale = require("utils").Utils.appLocale;
-    document.documentElement.setAttribute("lang", locale);
-
     // Set up URLs
     var donateLink = E("donate");
     donateLink.href = Utils.getDocLink("donate");
diff --git a/chrome/content/ui/i18n.js b/chrome/content/ui/i18n.js
index 8366268..cc33b0f 100644
--- a/chrome/content/ui/i18n.js
+++ b/chrome/content/ui/i18n.js
@@ -18,12 +18,12 @@
 var i18n;
 
 if (typeof ext != "undefined")
+{
   i18n = ext.i18n;
-else if (typeof chrome != "undefined")
-  // TODO: This check only exist for backwards compatibility, while the Safari
-  // port isn't merged into the adblockpluschrome repo. So this branch should
-  // be removed when the Safari port was merged.
-  i18n = chrome.i18n;
+
+  document.documentElement.lang = ext.i18n.getMessage("@@ui_locale").replace(/_/g, "-");
+  document.documentElement.dir = ext.i18n.getMessage("@@bidi_dir");
+}
 else
 {
   // Using Firefox' approach on i18n instead
@@ -84,6 +84,10 @@ else
       }
     };
   })();
+
+  var Utils = require("utils").Utils;
+  document.documentElement.lang = Utils.appLocale;
+  document.documentElement.dir = Utils.chromeRegistry.isLocaleRTL("adblockplus") ? "rtl" : "ltr";
 }
 
 // Inserts i18n strings into matching elements. Any inner HTML already in the element is
diff --git a/chrome/skin/firstRun.css b/chrome/skin/firstRun.css
index 7a02ad6..9b06ebb 100644
--- a/chrome/skin/firstRun.css
+++ b/chrome/skin/firstRun.css
@@ -296,19 +296,21 @@ section > p
   display: inline-block;
   vertical-align: top;
   padding: 5px 0 5px 0;
+  border: 1px dashed #37506d;
+  border-style: none dashed;
 }
 
 #donate-block
 {
-  border: 1px dashed #37506d;
-  border-style: none dashed;
   width: 50%;
 }
 
 #share-block
 {
-  border-right: 1px dashed #37506d;
   width: 49%;
+
+  -webkit-border-start-style: none;
+  -moz-border-start-style: none;
 }
 
 .share-buttons

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git