Merge pull request #41 from wardi/gettext-encoding-issue

Gettext encoding issue

ckanext/scheming/helpers.py

@@ -24,7 +24,11 @@ def scheming_language_text(text, prefer_lang=None, _gettext=None):
     else:
         if _gettext is None:
             _gettext = gettext
-        return _gettext(text)
+
+        t = _gettext(text)
+        if isinstance(t, str):
+            return t.decode('utf-8')
+        return t
 
 
 def scheming_choices_label(choices, value):
@@ -115,4 +119,3 @@ def scheming_get_organization_schema(organization_type, expanded=True):
     schemas = scheming_organization_schemas(expanded)
     if schemas:
         return schemas.get(organization_type)
-

ckanext/scheming/tests/test_helpers.py

@@ -23,6 +23,10 @@ def test_first_when_no_matching_language(self):
             {'aa': 'hello', 'bb': 'no'},
             prefer_lang='en'))
 
+    def test_decodes_utf8(self):
+        assert_equals(u'\xa1Hola!', scheming_language_text('\xc2\xa1Hola!'))
+
+
 class TestFieldRequired(object):
     def test_explicit_required_true(self):
         assert_equals(True, scheming_field_required({'required': True}))