bug 564470, need to capitalize en-US properly *and* link to remora th…

…ings in /pages
mozilla · May 10, 2010 · b511ca8 · b511ca8
1 parent ef22fcd
commit b511ca8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/amo/context_processors.py b/apps/amo/context_processors.py
@@ -14,7 +14,7 @@ def app(request):
 
 def i18n(request):
     return {'LANGUAGES': settings.LANGUAGES,
-            'LANG': translation.get_language(),
+            'LANG': settings.LANGUAGE_URL_MAP.get(translation.get_language()),
             'DIR': 'rtl' if translation.get_language_bidi() else 'ltr',
             }
 

diff --git a/templates/footer.html b/templates/footer.html
@@ -31,10 +31,10 @@
           <ul>
             <li><a href="http://www.mozilla.com/{{ LANG }}/privacy-policy.html">{{ _('Privacy Policy') }}</a></li>
             <li><a href="http://www.mozilla.com/{{ LANG }}/about/legal.html">{{ _('Legal Notices') }}</a></li>
-            <li><a href="{{ url('pages.about') }}">{{ _('About') }}</a></li>
+            <li><a href="{{ remora_url('pages/about') }}">{{ _('About') }}</a></li>
             <li><a href="http://blog.mozilla.com/addons">{{ _('Blog') }}</a></li>
             <li><a href="{{ remora_url('/developers') }}{# TODO #}">{{ _('Developer Hub') }}</a></li>
-            <li><a href="{{ url('pages.faq') }}"><abbr title="{{ _('Frequently Asked Questions') }}">{{ _('FAQ') }}</abbr></a></li>
+            <li><a href="{{ remora_url('pages/faq') }}"><abbr title="{{ _('Frequently Asked Questions') }}">{{ _('FAQ') }}</abbr></a></li>
             <li><a href="https://forums.addons.mozilla.org">{{ _('Forum') }}</a></li>
           </ul>
           <p class="disclaimer">{% trans -%}Mozilla is providing links to these applications as a courtesy, and makes no representations