Merge pull request #1506 from pascalchevrel/Bug-948022_template_chang…

…es_to_use_l10n_tags Bug 948022 - update homepage and base.py to use l10n tags for promos
mozilla · Dec 11, 2013 · 6134d23 · 6134d23
2 parents 227c42d + 6c9b621
commit 6134d23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/bedrock/mozorg/templates/mozorg/home.html b/bedrock/mozorg/templates/mozorg/home.html
@@ -58,7 +58,7 @@ <h1>{{ _('We are %(mozilla_wordmark)s') | format(mozilla_wordmark=high_res_img('
   <section class="pillars">
     <ul class="accordion">
 
-    {% if request.locale in settings.LOCALES_WITH_LIGHTBEAM_HOME or settings.DEV %}
+    {% if l10n_has_tag('promo_lightbeam') or settings.DEV %}
       <li id="panel-lightbeam" class="panel" tabindex="0">
         {# L10n: The active word should be wrapped in <i></i> tags, though it may appear at a different position in the translated title. #}
         <h2 class="panel-title">{{ _('<i>Watch</i> the watchers') }}</h2>
@@ -88,7 +88,7 @@ <h3>{{ _('Our principles guide us') }}</h3>
       </li>
     {% endif %}
 
-    {% if request.locale in settings.LOCALES_WITH_VTCS_HOME or settings.DEV %}
+    {% if l10n_has_tag('promo_surfing') or settings.DEV %}
       <li id="panel-vans" class="panel" tabindex="0">
         {# L10n: The active word should be wrapped in <i></i> tags, though it may appear at a different position in the translated title. #}
         <h2 class="panel-title">{{ _('<i>Stream</i> the surf') }}</h2>
@@ -143,7 +143,7 @@ <h3>{{ _('Join our<br> developer community') }}</h3>
         </div>
       </li>
 
-    {% if request.locale in settings.LOCALES_WITH_DONATE_HOME or settings.DEV %}
+    {% if l10n_has_tag('promo_donate') or settings.DEV %}
       <li id="panel-donate" class="panel" tabindex="0">
         {# L10n: The active word should be wrapped in <i></i> tags, though it may appear at a different position in the translated title. #}
         <h2 class="panel-title">{{ _('<i>Support</i> Mozilla') }}</h2>
@@ -193,7 +193,7 @@ <h3>{{ _('<i>Support</i> Mozilla')|striptags }}</h3>
           </div>
         </div>
       </li>
-    {% elif request.locale in settings.LOCALES_WITH_VTCS_HOME or settings.DEV %}
+    {% elif l10n_has_tag('promo_surfing') or settings.DEV %}
       <li id="panel-webmaker" class="panel" tabindex="0">
         {# L10n: The active word should be wrapped in <i></i> tags, though it may appear at a different position in the translated title. #}
         <h2 class="panel-title">{{ _('<i>Learn</i> the Web') }}</h2>

diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
@@ -765,22 +765,6 @@ def JINJA_CONFIG():
                       'ms', 'nl', 'pl', 'pt-BR', 'ro', 'ru', 'sl', 'sq', 'sr',
                       'ta', 'tr', 'zh-CN', 'zh-TW']
 
-# Locales with the Lightbeam and Webmaker banners on home page
-LOCALES_WITH_LIGHTBEAM_HOME = ['en-GB', 'en-US', 'en-ZA', 'ar', 'ca', 'cs', 'cy',
-                               'da', 'de', 'el', 'es-AR', 'es-CL', 'es-ES', 'es-MX',
-                               'et', 'eu', 'fr', 'fy-NL', 'hr', 'hy-AM', 'is', 'it',
-                               'ko', 'mk', 'nl', 'pl', 'pt-BR', 'ru', 'sq', 'sv-SE',
-                               'tr', 'uk', 'xh', 'zh-TW']
-
-# Locales with the Vans Triple Crown banner on home page
-LOCALES_WITH_VTCS_HOME = ['en-GB', 'en-US', 'en-ZA', 'ar', 'ca', 'cs', 'cy', 'da', 'de',
-                          'el', 'es-AR', 'es-CL', 'es-ES', 'es-MX', 'et', 'eu', 'fr',
-                          'fy-NL', 'hr', 'hy-AM', 'is', 'it', 'ko', 'mk', 'nl', 'pl',
-                          'pt-BR', 'ru', 'sk', 'sq', 'sv-SE', 'tr', 'uk', 'zh-TW']
-
-# Locales with the Donate banner on home page
-LOCALES_WITH_DONATE_HOME = ['en-US', 'de', 'fr', 'pt-BR']
-
 # reCAPTCHA keys
 RECAPTCHA_PUBLIC_KEY = ''
 RECAPTCHA_PRIVATE_KEY = ''