Merge branch 'k-nut-3060-set-formencode-default-lang'

ckan/config/environment.py

@@ -9,6 +9,7 @@
 
 import sqlalchemy
 from pylons import config
+import formencode
 
 import ckan.config.routing as routing
 import ckan.model as model
@@ -200,6 +201,12 @@ def update_config():
         template_paths = extra_template_paths.split(',') + template_paths
     config['pylons.app_globals'].template_paths = template_paths
 
+    # Set the default language for validation messages from formencode
+    # to what is set as the default locale in the config
+    default_lang = config.get('ckan.locale_default', 'en')
+    formencode.api.set_stdtranslation(domain="FormEncode",
+                                      languages=[default_lang])
+
     # Markdown ignores the logger config, so to get rid of excessive
     # markdown debug messages in the log, set it to the level of the
     # root logger.

ckan/lib/navl/dictization_functions.py

@@ -8,6 +8,7 @@
 
 from ckan.common import _
 
+
 class Missing(object):
     def __unicode__(self):
         raise Invalid(_('Missing value'))

ckan/tests/lib/test_navl.py

@@ -0,0 +1,30 @@
+import nose
+import pylons
+
+from ckan.tests import helpers
+from ckan.config import environment
+
+eq_ = nose.tools.eq_
+
+
+class TestFormencdoeLanguage(object):
+    @helpers.change_config('ckan.locale_default', 'de')
+    def test_formencode_uses_locale_default(self):
+        environment.update_config()
+        from ckan.lib.navl.dictization_functions import validate
+        from ckan.lib.navl.validators import not_empty
+        from formencode import validators
+        schema = {
+            "name": [not_empty, unicode],
+            "email": [validators.Email],
+            "email2": [validators.Email],
+        }
+
+        data = {
+            "name": "fred",
+            "email": "32",
+            "email2": "david@david.com",
+        }
+
+        converted_data, errors = validate(data, schema)
+        eq_({'email': [u'Eine E-Mail-Adresse muss genau ein @-Zeichen enthalten']}, errors)