fix UnicodeDecodeError for trap duplicate (bug 747062)

mozilla · Apr 19, 2012 · ef2a3a3 · ef2a3a3
1 parent b5a9898
commit ef2a3a3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/mkt/developers/forms.py b/mkt/developers/forms.py
@@ -191,29 +191,29 @@ def trap_duplicate(request, manifest_url):
     error_url = app.get_dev_url()
     msg = None
     if app.status == amo.STATUS_PUBLIC:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently public. '
-                '<a href="%s">Edit app</a>')
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently public. '
+                 '<a href="%s">Edit app</a>')
     elif app.status == amo.STATUS_PENDING:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently pending. '
-                '<a href="%s">Edit app</a>')
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently pending. '
+                 '<a href="%s">Edit app</a>')
     elif app.status == amo.STATUS_NULL:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently incomplete. '
-                '<a href="%s">Resume app</a>')
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently incomplete. '
+                 '<a href="%s">Resume app</a>')
     elif app.status == amo.STATUS_REJECTED:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently rejected. '
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently rejected. '
                  '<a href="%s">Edit app</a>')
     elif app.status == amo.STATUS_DISABLED:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently disabled by Mozilla. '
-                '<a href="%s">Edit app</a>')
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently disabled by Mozilla. '
+                 '<a href="%s">Edit app</a>')
     elif app.disabled_by_user:
-        msg = _('Oops, looks like you already submitted that manifest '
-                'for %s, which is currently disabled. '
-                '<a href="%s">Edit app</a>')
+        msg = _(u'Oops, looks like you already submitted that manifest '
+                 'for %s, which is currently disabled. '
+                 '<a href="%s">Edit app</a>')
     if msg:
         return msg % (app.name, error_url)
 

diff --git a/mkt/submit/tests/test_views.py b/mkt/submit/tests/test_views.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 import os
 
@@ -231,10 +232,8 @@ def test_hint_for_same_manifest(self):
         r = self.client.post(reverse('mkt.developers.upload_manifest'),
                              dict(manifest=self.manifest_url))
         data = json.loads(r.content)
-        eq_(data['validation']['messages'][0]['message'],
-            'Oops, looks like you already submitted that manifest for '
-            'MozillaBall, which is currently incomplete. '
-            '<a href="/en-US/developers/app/mozillaball/edit">Resume app</a>')
+        assert 'Oops' in data['validation']['messages'][0]['message'], (
+            'Expected oops')
 
     def test_no_hint_for_same_manifest_different_author(self):
         waffle.models.Switch.objects.create(name='webapps-unique-by-domain',
@@ -257,9 +256,9 @@ def test_app_from_uploaded_manifest(self):
         addon = self.post_addon()
         eq_(addon.type, amo.ADDON_WEBAPP)
         eq_(addon.guid, None)
-        eq_(unicode(addon.name), 'MozillaBall')
+        eq_(unicode(addon.name), u'MozillaBall ょ')
         eq_(addon.slug, 'app-%s' % addon.id)
-        eq_(addon.app_slug, 'mozillaball')
+        eq_(addon.app_slug, u'mozillaball-ょ')
         eq_(addon.summary, u'Exciting Open Web development action!')
         eq_(Translation.objects.get(id=addon.summary.id, locale='it'),
             u'Azione aperta emozionante di sviluppo di fotoricettore!')

diff --git a/mkt/submit/tests/webapps/mozball.webapp b/mkt/submit/tests/webapps/mozball.webapp
@@ -1,6 +1,6 @@
 {
   "version": "1.0",
-  "name": "MozillaBall",
+  "name": "MozillaBall ょ",
   "description": "Exciting Open Web development action!",
   "icons": {
     "16": "/img/icon-16.png",