Merge 9d6a462 into bef270c

ckanext/scheming/helpers.py

@@ -3,17 +3,18 @@
 from pylons.i18n import gettext
 
 
-def scheming_language_text(text, _gettext=None, _lang=None):
+def scheming_language_text(text, prefer_lang=None, _gettext=None):
     """
     :param text: {lang: text} dict or text string
+    :param prefer_lang: choose this language version if available
 
     Convert "language-text" to users' language by looking up
     languag in dict or using gettext if not a dict
     """
     if hasattr(text, 'get'):
-        if _lang is None:
-            _lang = lang()
-        v = text.get(_lang)
+        if prefer_lang is None:
+            prefer_lang = lang()
+        v = text.get(prefer_lang)
         if not v:
             v = text.get(config.get('ckan.locale_default', 'en'))
             if not v:

ckanext/scheming/templates/scheming/package/snippets/package_form.html

@@ -9,9 +9,11 @@
   {%- endif -%}
   {%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
   {%- for field in schema.dataset_fields -%}
-    {%- snippet 'scheming/snippets/form_field.html',
-      field=field, data=data, errors=errors, licenses=c.licenses,
-      schema=schema -%}
+    {%- if field.form_snippet is not none -%}
+      {%- snippet 'scheming/snippets/form_field.html',
+        field=field, data=data, errors=errors, licenses=c.licenses,
+        schema=schema -%}
+    {%- endif -%}
   {%- endfor -%}
 {% endblock %}
 

ckanext/scheming/tests/test_helpers.py

@@ -11,17 +11,17 @@ def test_pass_through_gettext(self):
     def test_only_one_language(self):
         assert_equals('hello', scheming_language_text(
             {'zh': 'hello'},
-            _lang='en'))
+            prefer_lang='en'))
 
     def test_matching_language(self):
         assert_equals('hello', scheming_language_text(
             {'en': 'hello', 'aa': 'aaaa'},
-            _lang='en'))
+            prefer_lang='en'))
 
     def test_first_when_no_matching_language(self):
         assert_equals('hello', scheming_language_text(
             {'aa': 'hello', 'bb': 'no'},
-            _lang='en'))
+            prefer_lang='en'))
 
 class TestFieldRequired(object):
     def test_explicit_required_true(self):