[tbb-commits] [torbutton] branch master updated: Bug 40921: Differentiate the about:tor strings accordingly to the update channel

[gitolite role]

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

pierov pushed a commit to branch master
in repository torbutton.

The following commit(s) were added to refs/heads/master by this push:
     new f1df5ea1 Bug 40921: Differentiate the about:tor strings accordingly to the update channel
f1df5ea1 is described below

commit f1df5ea1890d35be7d557bf227028fce0eb1a8da
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Tue Jun 7 16:56:31 2022 +0200

    Bug 40921: Differentiate the about:tor strings accordingly to the update channel
    
    Also, changed a padding that was incorrect with RTL locales.
---
 chrome/content/aboutTor/aboutTor.xhtml | 16 ++++++++++++++++
 chrome/locale/en-US/aboutTor.dtd       |  7 ++++++-
 chrome/skin/aboutTor.css               |  3 ++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml
index 79b10f32..12244f9b 100644
--- a/chrome/content/aboutTor/aboutTor.xhtml
+++ b/chrome/content/aboutTor/aboutTor.xhtml
@@ -36,9 +36,19 @@
     <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/>
     <div id="torstatus" class="top">
       <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container">
+#if MOZ_UPDATE_CHANNEL == alpha
         <div class="heading1">&aboutTor.alpha.ready.label;</div>
         <br/>
         <div class="heading2">&aboutTor.alpha.ready2.label;</div>
+#elif MOZ_UPDATE_CHANNEL == nightly
+        <div class="heading1">&aboutTor.nightly.ready.label;</div>
+        <br/>
+        <div class="heading2">&aboutTor.nightly.ready2.label;</div>
+#else
+        <div class="heading1">&aboutTor.ready.label;</div>
+        <br/>
+        <div class="heading2">&aboutTor.ready2.label;</div>
+#endif
       </div>
       <div class="showIfHasBeenUpdated torstatus-container">
         <div class="heading1">&aboutTBUpdate.updated;</div>
@@ -70,9 +80,15 @@
         <div id="bannerTextCol">
             <!--<div id="bannerHeader"></div>
             <br />-->
+#if MOZ_UPDATE_CHANNEL == alpha
             <div id="bannerDescription">&aboutTor.alpha.bannerDescription;</div>
             <br />
             <a id="bannerLink" target="_blank" href="https://forum.torproject.net/">&aboutTor.alpha.bannerLink;</a>
+#else
+            <div id="bannerDescription">&aboutTor.nightly.bannerDescription;</div>
+            <br />
+            <a id="bannerLink" target="_blank" href="https://forum.torproject.net/">&aboutTor.nightly.bannerLink;</a>
+#endif
         </div>
     </div>
 
diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd
index 2d565737..5ccf1396 100644
--- a/chrome/locale/en-US/aboutTor.dtd
+++ b/chrome/locale/en-US/aboutTor.dtd
@@ -33,4 +33,9 @@
 <!ENTITY aboutTor.alpha.ready.label "Test. Thoroughly.">
 <!ENTITY aboutTor.alpha.ready2.label "You’re ready to test the world’s most private browsing experience.">
 <!ENTITY aboutTor.alpha.bannerDescription "Tor Browser Alpha is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release.">
-<!ENTITY aboutTor.alpha.bannerLink "Report a bug on the Tor Forum">
\ No newline at end of file
+<!ENTITY aboutTor.alpha.bannerLink "Report a bug on the Tor Forum">
+
+<!ENTITY aboutTor.nightly.ready.label "Test. Thoroughly.">
+<!ENTITY aboutTor.nightly.ready2.label "You’re ready to test the world’s most private browsing experience.">
+<!ENTITY aboutTor.nightly.bannerDescription "Tor Browser Nightly is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release.">
+<!ENTITY aboutTor.nightly.bannerLink "Report a bug on the Tor Forum">
\ No newline at end of file
diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css
index 81b6453e..2712b9f1 100644
--- a/chrome/skin/aboutTor.css
+++ b/chrome/skin/aboutTor.css
@@ -223,7 +223,8 @@ body:not([showmanual]) .showForManual {
 }
 
 #bannerTextCol {
-  padding: 8px 0px 0px 15px;
+  padding-top: 8px;
+  padding-inline-start: 15px;
   font-size: 15px;
   line-height: normal;
   color: #FFFFFF;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.