From 2993df975458659291ff0018666675b4eb57049a Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Fri, 23 Dec 2022 12:40:47 +0100
Subject: [PATCH] Minor changes on translations and formatting
---
ckanext/odsh/collection/controller.py | 21 ++++++++++---------
.../package/snippets/package_form.html | 2 +-
.../package/snippets/resource_form.html | 2 +-
.../package/snippets/resource_item.html | 4 ++--
.../odsh/templates/snippets/package_item.html | 4 ++--
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ckanext/odsh/collection/controller.py b/ckanext/odsh/collection/controller.py
index cbc89c0b..511460d7 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 e01dc075..cb5f3917 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 9961cd90..652a41f7 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 f92cbf49..33c97155 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 be56a763..609f7a14 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 %}
--
GitLab