[Bug 630536] Remove %(locale)s

Author: tgavankar

apps/wiki/models.py

@@ -640,11 +640,10 @@ def clean(self):
                 old = self.based_on
                 self.based_on = based_on  # Be nice and guess a correct value.
                 # TODO(erik): This error message ignores non-translations.
-                raise ValidationError(_('A revision must be based on a '
-                    'revision of the %(locale)s document. Revision ID'
-                    ' %(id)s does not fit those criteria.') %
-                    dict(locale=LOCALES[settings.WIKI_DEFAULT_LANGUAGE].native,
-                         id=old.id))
+                raise ValidationError(_('A revision must be based on the '
+                    'English article. Revision ID %(id)s does not fit this'
+                    ' criterion.') %
+                    dict(id=old.id))
 
         if not self.can_be_readied_for_localization():
             self.is_ready_for_localization = False

apps/wiki/templates/wiki/includes/document_macros.html

@@ -60,9 +60,8 @@ <h1 class="title">{{ document.title }}</h1>
       {{ document.html|safe }}
     {% elif fallback_reason == 'no_translation' %}
       <div id="doc-pending-fallback" class="warning-box">
-        {% trans help_link=url('wiki.document', 'localize-firefox-help'),
-                 locale=settings.LOCALES[request.locale].native %}
-          Our volunteers haven't translated this article into {{ locale }} yet.
+        {% trans help_link=url('wiki.document', 'localize-firefox-help') %}
+          No one has helped translate this article yet.
           <a href="{{ help_link }}">Join us and help get the job done!</a>
         {% endtrans %}
       </div>