[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tpo/staging] remove hardcoded uppercase and capitalization cause of l10n. will-fix: #30678



commit 81a613adb09f67ccb26bf6dda8fb2185695aad4f
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Wed May 29 09:31:51 2019 +0200

    remove hardcoded uppercase and capitalization cause of l10n. will-fix: #30678
---
 assets/scss/_tor.scss                  | 6 +++---
 templates/footer.html                  | 6 +++---
 templates/header.html                  | 4 ++--
 templates/hero-download-languages.html | 4 ++--
 templates/hero-download-options.html   | 4 ++--
 templates/hero-download-tor.html       | 4 ++--
 templates/macros/people.html           | 4 ++--
 templates/navbar.html                  | 2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss
index 051fb39..3d6b4c5 100644
--- a/assets/scss/_tor.scss
+++ b/assets/scss/_tor.scss
@@ -200,7 +200,7 @@ small, .small{
 }
 
 h6 {
-  text-transform: uppercase;
+  text-transform: none !important;
   font-weight: bold;
   color: $purple;
 }
@@ -326,7 +326,7 @@ mark, .mark {
     border-radius: 0;
 }
 
-.btn {text-transform: capitalize;}
+.btn {text-transform: none !important;}
 
 label {
   cursor: pointer;
@@ -425,7 +425,7 @@ a.side-nav.active {
 // Badges
 //
 .badge{
-  text-transform: uppercase;
+  text-transform: none !important;
 }
 
 //
diff --git a/templates/footer.html b/templates/footer.html
index cbeb039..b00757e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -41,14 +41,14 @@
           </li>
           {% endfor %}
         </ul>
-        <a href="https://donate.torproject.org"; title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a>
+        <a href="https://donate.torproject.org"; title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("DONATE NOW") }}</span></h5></a>
       </div>
     </div>
     <div class="col-12 d-flex justify-content-center border">
       <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5">
-        <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p>
+        <p class="text-primary-light">{{ _('SUBSCRIBE TO OUR NEWSLETTER') }}</p>
         <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p>
-        <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/";>{{ _('Sign up') }}</a></p>
+        <p class="w"><a class="btn btn-small btn-dark mt-2 text-white active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/";>{{ _('SIGN UP') }}</a></p>
       </div>
       <div class="col-md-4 col-lg-4 ml-2 mt-5 pb-5">
         <div class="row">
diff --git a/templates/header.html b/templates/header.html
index 9290699..866edad 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -12,10 +12,10 @@
       <div class="row">
         <div class="col-12 content-center pt-5">
           <div class="row">
-            <h6 class="mx-auto text-white text-uppercase">{% block section %}{{ this.section }}{% endblock %}</h6>
+            <h6 class="mx-auto text-white">{% block section %}{{ this.section }}{% endblock %}</h6>
           </div>
           <div class="row pb-5">
-            <h2 class="mx-auto display-3 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2>
+            <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2>
           </div>
         </div>
       </div>
diff --git a/templates/hero-download-languages.html b/templates/hero-download-languages.html
index ac9f49e..929fa41 100644
--- a/templates/hero-download-languages.html
+++ b/templates/hero-download-languages.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <h6 class="mx-auto text-white text-uppercase">{% block section %}Defend yourself{% endblock %}</h6>
+        <h6 class="mx-auto text-white">{% block section %}{{ _('DEFEND YOURSELF') }}{% endblock %}</h6>
 </div>
 <div class="row p-5">
-  <h2 class="mx-auto display-3 text-white text-capitalize text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
+  <h2 class="mx-auto display-3 text-white text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
 </div>
diff --git a/templates/hero-download-options.html b/templates/hero-download-options.html
index ac9f49e..929fa41 100644
--- a/templates/hero-download-options.html
+++ b/templates/hero-download-options.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <h6 class="mx-auto text-white text-uppercase">{% block section %}Defend yourself{% endblock %}</h6>
+        <h6 class="mx-auto text-white">{% block section %}{{ _('DEFEND YOURSELF') }}{% endblock %}</h6>
 </div>
 <div class="row p-5">
-  <h2 class="mx-auto display-3 text-white text-capitalize text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
+  <h2 class="mx-auto display-3 text-white text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
 </div>
diff --git a/templates/hero-download-tor.html b/templates/hero-download-tor.html
index 6f84383..ce3fe32 100644
--- a/templates/hero-download-tor.html
+++ b/templates/hero-download-tor.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <h6 class="mx-auto text-white text-uppercase">{% block section %}Grow the network{% endblock %}</h6>
+        <h6 class="mx-auto text-white">{% block section %}{{ _('GROW THE NETWORK') }}{% endblock %}</h6>
 </div>
 <div class="row p-5">
-  <h2 class="mx-auto display-3 text-white text-capitalize text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
+  <h2 class="mx-auto display-3 text-white text-center">{% block title %}{{ this.title }}{% endblock %}</h2>
 </div>
diff --git a/templates/macros/people.html b/templates/macros/people.html
index 5be11b7..1d4be6e 100644
--- a/templates/macros/people.html
+++ b/templates/macros/people.html
@@ -3,8 +3,8 @@
     <div class="card h-100 my-2">
       <div class="card-body">
         <h5 class="card-title human-name">{{ item.name }}</h5>
-        <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.title }}</h6>
-        <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.nickname }}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6>
+        <h6 class="card-subtitle mb-2 text-primary nick">{{ item.title }}</h6>
+        <h6 class="card-subtitle mb-2 text-primary nick">{{ item.nickname }}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6>
         {{ item.description }}
       </div>
     </div>
diff --git a/templates/navbar.html b/templates/navbar.html
index 71b4738..681ffa8 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -9,7 +9,7 @@
       <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo@xxxxxx'|asseturl }}" >
       <span class="sr-only">Tor Logo</span>
     </a>
-    <a href="https://donate.torproject.org"; title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h5></a>
+    <a href="https://donate.torproject.org"; title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("DONATE NOW") }}</span></h5></a>
     <label for="nav-toggle">
       <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits