Merge pull request #5188 from kyoshino/bug-1387466-channel-all-label

Fix Bug 1387466 - Adjust download page strings to remove "(incl. Win 64)" now that Win64 builds are default on all channels
mozilla · Oct 10, 2017 · 31afa69 · 31afa69
2 parents 54c6004 + 1a9365f
commit 31afa69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bedrock/firefox/templates/firefox/channel/android.html b/bedrock/firefox/templates/firefox/channel/android.html
@@ -52,7 +52,7 @@ <h2>{{_('Beta')}}</h2>
     <div class="container">
       <ul>
         <li><a href="{{ firefox_url('android', 'notes', 'beta') }}">{{_('Release Notes')}}</a></li>
-        <li><a href="{{ firefox_url('android', 'all', 'beta') }}">{{_('All Languages and Builds')}}</a></li>
+        <li><a href="{{ firefox_url('android', 'all', 'beta') }}">{% if l10n_has_tag('firefox_channel_bug1387466') %}{{_('All Languages and Platforms')}}{% else %}{{_('All Languages and Builds')}}{% endif %}</a></li>
       </ul>
     </div>
   </footer>

diff --git a/bedrock/firefox/templates/firefox/channel/desktop.html b/bedrock/firefox/templates/firefox/channel/desktop.html
@@ -50,7 +50,7 @@ <h2>{{_('Beta')}}</h2>
     <div class="container">
       <ul>
         <li><a href="{{ firefox_url('desktop', 'notes', 'beta') }}">{{_('Release Notes')}}</a></li>
-        <li><a href="{{ firefox_url('desktop', 'all', 'beta') }}">{{_('All Languages and Builds (incl. Win 64)')}}</a></li>
+        <li><a href="{{ firefox_url('desktop', 'all', 'beta') }}">{% if l10n_has_tag('firefox_channel_bug1387466') %}{{_('All Languages and Platforms')}}{% else %}{{_('All Languages and Builds')}}{% endif %}</a></li>
       </ul>
     </div>
   </footer>
@@ -75,7 +75,7 @@ <h2>{{_('Developer Edition')}}</h2>
       <ul>
         <li><a href="{{ firefox_url('desktop', 'notes', 'developer') }}">{{_('Release Notes')}}</a></li>
         <li><a href="{{ url('firefox.developer') }}">{{_('Learn more')}}</a></li>
-        <li><a href="{{ firefox_url('desktop', 'all', 'developer') }}">{{_('All Languages and Builds (incl. Win 64)')}}</a></li>
+        <li><a href="{{ firefox_url('desktop', 'all', 'developer') }}">{% if l10n_has_tag('firefox_channel_bug1387466') %}{{_('All Languages and Platforms')}}{% else %}{{_('All Languages and Builds')}}{% endif %}</a></li>
       </ul>
     </div>
   </footer>
@@ -104,7 +104,7 @@ <h2>{{_('Nightly')}}</h2>
       <ul>
         <li><a href="{{ firefox_url('desktop', 'notes', 'nightly') }}">{{_('Release Notes')}}</a></li>
         <li><a rel="external" href="https://blog.nightly.mozilla.org/">{{_('Nightly Blog')}}</a></li>
-        <li><a href="{{ firefox_url('desktop', 'all', 'nightly') }}">{{_('All Languages and Builds (incl. Win 64)')}}</a></li>
+        <li><a href="{{ firefox_url('desktop', 'all', 'nightly') }}">{% if l10n_has_tag('firefox_channel_bug1387466') %}{{_('All Languages and Platforms')}}{% else %}{{_('All Languages and Builds')}}{% endif %}</a></li>
       </ul>
     </div>
   </footer>