Merge pull request #894 from sgarrity/bug-869489-manifesto-l10n

Bug 869489 - Port localized versions of Manifesto to Bedrock

bedrock/mozorg/templates/mozorg/about/manifesto.html

@@ -7,10 +7,16 @@
 {% block page_title %}{{ _('The Mozilla Manifesto') }}{% endblock %}
 {% block body_id %}about-manifesto{% endblock %}
 
+{% block extrahead %}
+  {{ super() }}
+  {{ css('manifesto') }}
+{% endblock %}
+
 
 {% block article %}
   <h1 class="title-banner">{{ _('The Mozilla Manifesto') }}</h1>
   <h2 id="introduction">{{_('Introduction')}}</h2>
+
   <p>
     {{_('The Internet is becoming an increasingly important part of our lives.')}}
   </p>
@@ -79,4 +85,10 @@
   <p>
     {{_('The Mozilla Foundation invites all others who support the principles of the Mozilla Manifesto to join with us, and to find new ways to make this vision of the Internet a reality.')}}
   </p>
+
+  {# Per-locale translation credits #}
+  {% if _('Translation provided by [localizer].') != 'Translation provided by [localizer].'  %}
+  <p class="credit small">{{ _('Translation provided by [localizer].') }}</p>
+  {% endif %}
+
 {% endblock %}

bedrock/settings/base.py

@@ -245,6 +245,9 @@ MINIFY_BUNDLES = {
             'js/libs/video-js/video-js.css',
             'js/libs/video-js/video-js-sandstone.css',
         ),
+        'manifesto': (
+            'css/mozorg/manifesto.less',
+        ),
         'marketplace': (
             'css/marketplace/marketplace.less',
         ),

etc/httpd/global.conf

@@ -226,6 +226,8 @@ RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?about/history/$ /b/$1about/history/
 RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?about/bookmarks.html$ https://wiki.mozilla.org/Historical_Documents [L,R=301]
 RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?about/timeline.html$ https://wiki.mozilla.org/Timeline [L,R=301]
 
-# bug 861243
-RewriteRule ^/about/manifesto\.en\.html$ /en-US/about/manifesto/ [L,R=301]
+# bug 861243 and bug 869489
+# FUR locale temporarily staying on PHP site
+RewriteCond %{REQUEST_URI} !^/about/manifesto.fur.html$
+RewriteRule ^/about/manifesto\.(.*)\.html$ /$1/about/manifesto/ [L,R=301]
 RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?about/manifesto(/?)$ /b/$1about/manifesto$2 [PT]

media/css/mozorg/manifesto.less

@@ -0,0 +1,13 @@
+// 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/.
+
+@import "../sandstone/lib.less";
+
+#introduction {
+    clear: both;
+}
+
+.main-column .credit {
+    color: @textColorLight;
+}