fix(templates): syntax;

- `h` -> `helpers`
- Humanization fixes.

Author: JVickery-TBS

ckan/templates/macros/form/resource_validation_errors.html

@@ -17,21 +17,25 @@
 
 
 {# (canada fork only): error -> danger BS version #}
-{% macro resource_validation_errors(errors={}, type="danger", classes=[], pkg_name='', helpers={}) %}
+{% macro resource_validation_errors(errors={}, type="danger", classes=[], pkg_name='', dataset_type='dataset', helpers={}) %}
   {% if errors %}
     <div class="error-explanation alert alert-{{ type }}{{ " " ~ classes | join(' ') }}">
-      <h3>{{ h.humanize_entity_type('package', dataset_type, 'other errors') or _('Errors in dataset') }}</h3>
+      <h3>{{ helpers.humanize_entity_type('package', dataset_type, 'other errors') or _('Errors in dataset') }}</h3>
       {% if 'dataset' in errors and errors.dataset %}
         {% set dataset_link = helpers.url_for('dataset.read', id=pkg_name) %}
-        <p>{{ h.humanize_entity_type('package', dataset_type, 'other errors package').format(dataset_link) or _('The <a href="{}" target="_blank">dataset</a> contains errors:').format(dataset_link) }}</p>
+        {% set humanized_label = helpers.humanize_entity_type('package', dataset_type, 'other errors package') %}
+        {% if humanized_label %}
+          {% set humanized_label = humanized_label.format(dataset_link)|safe %}
+        {% endif %}
+        <p>{{ humanized_label or _('The <a href="{}" target="_blank">dataset</a> contains errors:').format(dataset_link) }}</p>
         <ul>
           {% for field_id, field_errs in errors.dataset.items() %}
             <li data-field-label="{{ field_id }}">{% if field_id %}{{ field_id }}{{_(':')}} {% endif %}{{ field_errs|join(', ') }}</li>
           {% endfor %}
         </ul>
       {% endif %}
       {% if 'resources' in errors and errors.resources %}
-        <p>{{ h.humanize_entity_type('package', dataset_type, 'other errors resources') or _('The dataset contains invalid resources:') }}</p>
+        <p>{{ helpers.humanize_entity_type('package', dataset_type, 'other errors resources') or _('The dataset contains invalid resources:') }}</p>
         <ul>
           {% for res_id, errs in errors.resources.items() %}
             <li><a href="{{ helpers.url_for('resource.read', id=pkg_name, resource_id=res_id) }}" target="_blank">{{ res_id }}</a></li>

ckan/templates/package/confirm_delete_resource.html

@@ -18,7 +18,7 @@
         {# TODO: upstream contrib?? #}
         {% block errors %}
           {% if resource_validation_errors %}
-            {{ form.resource_validation_errors(errors=resource_validation_errors, pkg_name=pkg_id, helpers=h) }}
+            {{ form.resource_validation_errors(errors=resource_validation_errors, pkg_name=pkg_id, dataset_type=dataset_type, helpers=h) }}
           {% else %}
             {{ form.errors(errors=errors) }}
           {% endif %}

ckan/templates/package/snippets/resource_form.html

@@ -18,7 +18,7 @@
   {# TODO: upstream contrib?? #}
   {% block errors %}
     {% if resource_validation_errors %}
-      {{ form.resource_validation_errors(errors=resource_validation_errors, pkg_name=pkg_name, helpers=h) }}
+      {{ form.resource_validation_errors(errors=resource_validation_errors, pkg_name=pkg_name, dataset_type=dataset_type, helpers=h) }}
     {% else %}
       {{ form.errors(errors=errors) }}
     {% endif %}