Merge pull request #22 from nigelbabu/ja-fix

Correct the support.mozilla.com URL in mobile version
mozilla · Aug 12, 2011 · b3c1a6f · b3c1a6f
2 parents 60a7b2b + a62d74d
commit b3c1a6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/apps/feedback/templates/feedback/mobile/index.html b/apps/feedback/templates/feedback/mobile/index.html
@@ -51,9 +51,9 @@ <h1>{{ _('Give Feedback') }}</h1>
       <div class="field">
         <p class="warning">
           <span>
-            {% trans url='http://support.mozilla.com/{{ LANG }}/' %}
+            {% trans url='http://support.mozilla.com/' + LANG %}
             If you need help or have a problem with Firefox,
-            please visit <a href="{{ url }}">Firefox Support</a>.
+            please visit <a id="sumo-url" href="{{ url }}/">Firefox Support</a>.
             {% endtrans %}
           </span>
         </p>

diff --git a/apps/feedback/tests/test_feedback_views.py b/apps/feedback/tests/test_feedback_views.py
@@ -169,3 +169,12 @@ def test_feedback_index(self):
                             HTTP_USER_AGENT=(self.FX_UA % '20.0b2'),
                             follow=True)
         eq_(r.status_code, 200)
+
+    def test_mobile_sumo_url(self):
+        """Test the sumo url in the mobile version."""
+        r = self.client.get(reverse('feedback'), 
+                            HTTP_USER_AGENT=(self.FX_UA % '20.0b2'), 
+                            SITE_ID=settings.MOBILE_SITE_ID)
+        doc = pq(r.content)
+        sumo_url = doc('#sumo-url')
+        eq_(sumo_url.attr('href'), 'http://support.mozilla.com/en-US/')