Bug 1203168 - follow-up to improve internationalization of the about:searchreset page, rs=flod.
authorFlorian Quèze <florian@queze.net>
Mon, 30 May 2016 13:08:27 +0200
changeset 340518 00dccad34edae14b16de663c884a36ef2ec575b4
parent 340517 16161b126fe83df4bf70a7a6341ef77224b7e10f
child 340519 a5b1bd969d1957e514fc0bac1add8cb5e2186a3e
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1203168
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1203168 - follow-up to improve internationalization of the about:searchreset page, rs=flod.
browser/components/search/content/searchReset.xhtml
browser/locales/en-US/chrome/browser/aboutSearchReset.dtd
browser/themes/shared/searchReset.css
--- a/browser/components/search/content/searchReset.xhtml
+++ b/browser/components/search/content/searchReset.xhtml
@@ -6,16 +6,18 @@
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   %globalDTD;
   <!ENTITY % searchresetDTD SYSTEM "chrome://browser/locale/aboutSearchReset.dtd">
   %searchresetDTD;
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&searchreset.tabtitle;</title>
     <link rel="stylesheet" type="text/css" media="all"
           href="chrome://global/skin/in-content/info-pages.css"/>
--- a/browser/locales/en-US/chrome/browser/aboutSearchReset.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutSearchReset.dtd
@@ -1,26 +1,28 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY searchreset.tabtitle       "Restore Search Settings">
 
 <!ENTITY searchreset.pageTitle      "Restore your search settings?">
 
-<!ENTITY searchreset.pageInfo1      "Your search settings might be out-of-date. Firefox can help you restore the default search settings.">
+<!ENTITY searchreset.pageInfo1      "Your search settings might be out-of-date. &brandShortName; can help you restore the default search settings.">
+
 
+<!-- LOCALIZATION NOTE (searchreset.selector.label): this string is
+followed by a dropdown of all the built-in search engines. -->
 <!ENTITY searchreset.selector.label "This will set your default search engine to">
 
 <!-- LOCALIZATION NOTE (searchreset.beforelink.pageInfo,
 searchreset.afterlink.pageInfo): these two string are used respectively
-before and after the the "Settings page" link (searchreset.link.pageInfo).
+before and after the "Settings page" link (searchreset.link.pageInfo2).
 Localizers can use one of them, or both, to better adapt this sentence to
-their language.
--->
+their language. -->
 <!ENTITY searchreset.beforelink.pageInfo2 "You can change these settings at any time from the ">
 <!ENTITY searchreset.afterlink.pageInfo2  ".">
 
 <!ENTITY searchreset.link.pageInfo2       "Settings page">
 
 <!ENTITY searchreset.noChangeButton        "Don’t Change">
 <!ENTITY searchreset.noChangeButton.access "D">
 
--- a/browser/themes/shared/searchReset.css
+++ b/browser/themes/shared/searchReset.css
@@ -16,21 +16,29 @@ select {
   padding-inline-start: 26px;
   background-image: var(--engine-icon-url),
                     url("chrome://global/skin/in-content/dropdown.svg#dropdown");
   background-repeat: no-repeat;
   background-position: 8px center, calc(100% - 4px) center;
   background-size: 16px, 16px;
 }
 
+select:-moz-dir(rtl) {
+  background-position: calc(100% - 8px) center, 4px center;
+}
+
 select:-moz-focusring {
   color: transparent;
   text-shadow: 0 0 0 var(--in-content-text-color);
 }
 
 option {
   padding: 4px;
   padding-inline-start: 30px;
   background-repeat: no-repeat;
   background-position: 8px center;
   background-size: 16px;
   background-color: var(--in-content-page-background);
 }
+
+option:-moz-dir(rtl) {
+  background-position: calc(100% - 8px) center;
+}