diff --git a/ckanext/odsh/collection/controller.py b/ckanext/odsh/collection/controller.py index cbc89c0b884708751244099f1c2da74b5bc9b240..511460d70b1976a4daef43b4a3987357675ea458 100644 --- a/ckanext/odsh/collection/controller.py +++ b/ckanext/odsh/collection/controller.py @@ -4,17 +4,18 @@ from ckan.controllers.package import PackageController from .helpers import get_latest_resources_for_format, get_latest_dataset - class LatestDatasetController(PackageController): - + def latest_dataset(self, id): - latest_dataset= get_latest_dataset(id) + latest_dataset = get_latest_dataset(id) if latest_dataset is None: toolkit.abort(404) - toolkit.redirect_to(controller='dataset', action='read', id=latest_dataset) + toolkit.redirect_to(controller='dataset', + action='read', id=latest_dataset) + class LatestRecourcesController(PackageController): - + def latest_resource(self, id, resource_format): latest_resources = get_latest_resources_for_format(id, resource_format) if latest_resources is None: @@ -31,10 +32,10 @@ class LatestRecourcesController(PackageController): url_resource = pre_resource_url else: url_resource = url_for(controller='dataset', - action='resource_download', - id=download_package_id, - resource_id=download_resource_id, - filename=pre_resource_url, - qualified = True) + action='resource_download', + id=download_package_id, + resource_id=download_resource_id, + filename=pre_resource_url, + qualified=True) toolkit.redirect_to(url_resource) toolkit.abort(404) diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html index e01dc0751ed1d0a09b1c1f49a5c2643ebc2196b3..cb5f39175eec943af3041dad0b0f468849dad22f 100644 --- a/ckanext/odsh/templates/package/snippets/package_form.html +++ b/ckanext/odsh/templates/package/snippets/package_form.html @@ -42,5 +42,5 @@ {% endblock %} </div> {% endblock %} - <span class='required-text'>*Pflichtangabe</span> + <span class='required-text'>*{{ _('Required information') }}</span> </form> \ No newline at end of file diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html index 9961cd902cad25b670bf169e41ec66bed15ea1b3..652a41f7b0c13bb185ba68dd6a9ab89e9e834725 100644 --- a/ckanext/odsh/templates/package/snippets/resource_form.html +++ b/ckanext/odsh/templates/package/snippets/resource_form.html @@ -114,7 +114,7 @@ </div> </div> </div> - <span class='required-text'>*Pflichtangabe</span> + <span class='required-text'>*{{ _('Required information') }}</span> </form> {% block scripts %} diff --git a/ckanext/odsh/templates/package/snippets/resource_item.html b/ckanext/odsh/templates/package/snippets/resource_item.html index f92cbf49f0fa22a0eb7bd3477893a0bb4257f995..33c97155a501a2f37e465f5d82f67dd0d6da7360 100644 --- a/ckanext/odsh/templates/package/snippets/resource_item.html +++ b/ckanext/odsh/templates/package/snippets/resource_item.html @@ -17,11 +17,11 @@ </a> {% endif %} {% if resource_size %} - <p>Dateigröße: {{ resource_size }}</p> + <p>{{ _('File size') }}: {{ resource_size }}</p> {% endif %} {% set number_of_pages = res.get('number_of_pages') %} {% if number_of_pages%} - <p>Seitenanzahl: {{ number_of_pages }}</p> + <p>{{ _('Number of pages') }}: {{ number_of_pages }}</p> {% endif %} </div> <div class="resource-icons"> diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html index be56a7634f5154546c0fed35d171ef8a40947fe1..609f7a1435af314385ed69f602cfaaf7f705737d 100644 --- a/ckanext/odsh/templates/snippets/package_item.html +++ b/ckanext/odsh/templates/snippets/package_item.html @@ -90,9 +90,9 @@ Example: <p class='package-info-category'> <span class='category-header'> {% trans category_count=package.groups|length %} - Kategorie: + Category: {% pluralize %} - Kategorien: + Categories: {% endtrans %} </span> {% for category in package.groups %}