Merge branch 'develop' into pr/60

mbi · Mar 22, 2016 · 8f3fafb · 8f3fafb
2 parents 38eea0d + 24c3bde
commit 8f3fafb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/rosetta/views.py b/rosetta/views.py
@@ -8,6 +8,7 @@
 from django.utils.encoding import iri_to_uri
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.cache import never_cache
+from django.utils.encoding import force_text
 from django.contrib import messages
 
 from microsofttranslator import Translator, TranslateApiException
@@ -290,14 +291,19 @@ def _request_request(key, default=None):
         else:
             rosetta_last_save_error = False
 
+        try:
+            rosetta_i18n_lang_name = force_text(_(storage.get('rosetta_i18n_lang_name')))
+        except:
+            rosetta_i18n_lang_name = force_text(storage.get('rosetta_i18n_lang_name'))
+
         return render_to_response('rosetta/pofile.html', dict(
             version=rosetta.get_version(True),
             ADMIN_MEDIA_PREFIX=ADMIN_MEDIA_PREFIX,
             ADMIN_IMAGE_DIR=ADMIN_IMAGE_DIR,
             ENABLE_REFLANG=rosetta_settings.ENABLE_REFLANG,
             LANGUAGES=LANGUAGES,
             rosetta_settings=rosetta_settings,
-            rosetta_i18n_lang_name=_(storage.get('rosetta_i18n_lang_name')),
+            rosetta_i18n_lang_name=rosetta_i18n_lang_name,
             rosetta_i18n_lang_code=rosetta_i18n_lang_code,
             rosetta_i18n_lang_bidi=rosetta_i18n_lang_bidi,
             rosetta_last_save_error=rosetta_last_save_error,