Merge branch '59-datenserien-kennzeichnen' into 'dev'

Resolve "Datenserien kennzeichnen"

See merge request !47

ckanext/odsh/i18n/ckanext-odsh.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-odsh 2.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-06-05 10:29+0200\n"
+"POT-Creation-Date: 2023-06-16 12:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: ckanext/odsh/plugin.py:227 ckanext/odsh/plugin.py:236 ckanext/odsh/plugin.py:242
+#: ckanext/odsh/plugin.py:222 ckanext/odsh/plugin.py:231 ckanext/odsh/plugin.py:237
 #: ckanext/odsh/templates/header.html:45
 #: ckanext/odsh/templates/organization/index.html:3
 #: ckanext/odsh/templates/organization/index.html:6
@@ -28,15 +28,15 @@ msgstr ""
 msgid "Organizations"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:228 ckanext/odsh/plugin.py:239 ckanext/odsh/plugin.py:245
+#: ckanext/odsh/plugin.py:223 ckanext/odsh/plugin.py:234 ckanext/odsh/plugin.py:240
 msgid "Category"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:229 ckanext/odsh/plugin.py:237 ckanext/odsh/plugin.py:243
+#: ckanext/odsh/plugin.py:224 ckanext/odsh/plugin.py:232 ckanext/odsh/plugin.py:238
 msgid "File format"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:230 ckanext/odsh/plugin.py:238 ckanext/odsh/plugin.py:244
+#: ckanext/odsh/plugin.py:225 ckanext/odsh/plugin.py:233 ckanext/odsh/plugin.py:239
 #: ckanext/odsh/templates/package/resource_read.html:170
 #: ckanext/odsh/templates/package/snippets/info.html:75
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:91
@@ -44,24 +44,11 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:232
+#: ckanext/odsh/plugin.py:227
 msgid "Open-Data-Eigenschaften"
 msgstr ""
 
-#: ckanext/odsh/validation.py:275
-#, python-format
-msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_.:()"
-msgstr ""
-
-#: ckanext/odsh/validation.py:330
-msgid "Subject must be a known URI."
-msgstr ""
-
-#: ckanext/odsh/validation.py:352
-msgid "Subject must not be empty."
-msgstr ""
-
-#: ckanext/odsh/validation.py:367
+#: ckanext/odsh/validation.py:311
 msgid "Only formats on the list of the EU Publications Office are allowed."
 msgstr ""
 
@@ -444,7 +431,7 @@ msgstr ""
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:53
 #: ckanext/odsh/templates/package/edit_view.html:19
 #: ckanext/odsh/templates/package/snippets/package_form.html:33
-#: ckanext/odsh/templates/package/snippets/resource_form.html:96
+#: ckanext/odsh/templates/package/snippets/resource_form.html:91
 #: ckanext/odsh/templates/user/edit_user_form.html:46
 msgid "Delete"
 msgstr ""
@@ -553,7 +540,7 @@ msgid "Issued Descending"
 msgstr ""
 
 #: ckanext/odsh/templates/organization/read.html:31
-#: ckanext/odsh/templates/snippets/package_item.html:84
+#: ckanext/odsh/templates/snippets/package_item.html:89
 #: ckanext/odsh/templates/snippets/search_form.html:20
 msgid "Popular"
 msgstr ""
@@ -604,7 +591,7 @@ msgid "Save Organization"
 msgstr ""
 
 #: ckanext/odsh/templates/organization/snippets/organization_item.html:15
-#: ckanext/odsh/templates/snippets/package_item.html:70
+#: ckanext/odsh/templates/snippets/package_item.html:75
 msgid "View {organization_name}"
 msgstr ""
 
@@ -623,7 +610,7 @@ msgstr ""
 
 #: ckanext/odsh/templates/package/edit_base.html:23
 #: ckanext/odsh/templates/package/resource_edit_base.html:28
-#: ckanext/odsh/templates/package/snippets/resource_form.html:81
+#: ckanext/odsh/templates/package/snippets/resource_form.html:77
 msgid "Back"
 msgstr ""
 
@@ -682,19 +669,19 @@ msgid ""
 msgstr ""
 
 #: ckanext/odsh/templates/package/new_view.html:32
-#: ckanext/odsh/templates/package/snippets/resource_form.html:117
+#: ckanext/odsh/templates/package/snippets/resource_form.html:112
 msgid "Add"
 msgstr ""
 
 #: ckanext/odsh/templates/package/read.html:37
-#: ckanext/odsh/templates/snippets/package_item.html:74
+#: ckanext/odsh/templates/snippets/package_item.html:79
 msgid "Draft"
 msgstr ""
 
 #: ckanext/odsh/templates/package/read.html:40
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:275
 #: ckanext/odsh/templates/snippets/organization.html:24
-#: ckanext/odsh/templates/snippets/package_item.html:76
+#: ckanext/odsh/templates/snippets/package_item.html:81
 msgid "Deleted"
 msgstr ""
 
@@ -704,7 +691,7 @@ msgstr ""
 
 #: ckanext/odsh/templates/package/read.html:53
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:251
-#: ckanext/odsh/templates/snippets/package_item.html:65
+#: ckanext/odsh/templates/snippets/package_item.html:70
 msgid "Private"
 msgstr ""
 
@@ -827,7 +814,7 @@ msgid "Created"
 msgstr ""
 
 #: ckanext/odsh/templates/package/resource_read.html:166
-#: ckanext/odsh/templates/package/snippets/resource_form.html:70
+#: ckanext/odsh/templates/package/snippets/resource_form.html:68
 #: ckanext/odsh/templates/package/snippets/resource_info.html:26
 msgid "Format"
 msgstr ""
@@ -894,14 +881,14 @@ msgid "Filterdialog schließen"
 msgstr ""
 
 #: ckanext/odsh/templates/package/snippets/info.html:28
-#: ckanext/odsh/templates/snippets/package_item.html:92
+#: ckanext/odsh/templates/snippets/package_item.html:97
 msgid "Category:"
 msgid_plural "Categories:"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ckanext/odsh/templates/package/snippets/info.html:63
-#: ckanext/odsh/templates/snippets/package_item.html:138
+#: ckanext/odsh/templates/snippets/package_item.html:143
 msgid "Issued"
 msgstr ""
 
@@ -1003,7 +990,7 @@ msgid "Next: Add Data"
 msgstr ""
 
 #: ckanext/odsh/templates/package/snippets/package_form.html:46
-#: ckanext/odsh/templates/package/snippets/resource_form.html:123
+#: ckanext/odsh/templates/package/snippets/resource_form.html:118
 msgid "Required information"
 msgstr ""
 
@@ -1062,25 +1049,19 @@ msgid ""
 "  application/json"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:68
+#: ckanext/odsh/templates/package/snippets/resource_form.html:66
 msgid "odsh_resource_format_error_label"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:70
-msgid "eg. CSV, XML or JSON"
+#: ckanext/odsh/templates/package/snippets/resource_form.html:80
+msgid "Another dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:84
-msgid ""
-"Another\n"
-"          dataset"
-msgstr ""
-
-#: ckanext/odsh/templates/package/snippets/resource_form.html:93
+#: ckanext/odsh/templates/package/snippets/resource_form.html:88
 msgid "Are you sure you want to delete this resource?"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:110
+#: ckanext/odsh/templates/package/snippets/resource_form.html:105
 msgid "Upload dataset"
 msgstr ""
 
@@ -1221,7 +1202,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#: ckanext/odsh/templates/snippets/package_item.html:60
+#: ckanext/odsh/templates/snippets/package_item.html:41
+msgid "Data series"
+msgstr ""
+
+#: ckanext/odsh/templates/snippets/package_item.html:65
 msgid "NEW"
 msgstr ""
 

ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-odsh 2.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-06-05 10:29+0200\n"
-"PO-Revision-Date: 2023-06-05 10:32+0200\n"
+"POT-Creation-Date: 2023-06-16 12:18+0200\n"
+"PO-Revision-Date: 2023-06-16 12:23+0200\n"
 "Last-Translator: \n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Generated-By: Babel 2.3.4\n"
 "X-Generator: Poedit 2.3\n"
 
-#: ckanext/odsh/plugin.py:227 ckanext/odsh/plugin.py:236
-#: ckanext/odsh/plugin.py:242 ckanext/odsh/templates/header.html:45
+#: ckanext/odsh/plugin.py:222 ckanext/odsh/plugin.py:231
+#: ckanext/odsh/plugin.py:237 ckanext/odsh/templates/header.html:45
 #: ckanext/odsh/templates/organization/index.html:3
 #: ckanext/odsh/templates/organization/index.html:6
 #: ckanext/odsh/templates/organization/index.html:33
@@ -31,18 +31,18 @@ msgstr ""
 msgid "Organizations"
 msgstr "Herausgeber"
 
-#: ckanext/odsh/plugin.py:228 ckanext/odsh/plugin.py:239
-#: ckanext/odsh/plugin.py:245
+#: ckanext/odsh/plugin.py:223 ckanext/odsh/plugin.py:234
+#: ckanext/odsh/plugin.py:240
 msgid "Category"
 msgstr "Kategorie"
 
-#: ckanext/odsh/plugin.py:229 ckanext/odsh/plugin.py:237
-#: ckanext/odsh/plugin.py:243
+#: ckanext/odsh/plugin.py:224 ckanext/odsh/plugin.py:232
+#: ckanext/odsh/plugin.py:238
 msgid "File format"
 msgstr "Dateiformat"
 
-#: ckanext/odsh/plugin.py:230 ckanext/odsh/plugin.py:238
-#: ckanext/odsh/plugin.py:244
+#: ckanext/odsh/plugin.py:225 ckanext/odsh/plugin.py:233
+#: ckanext/odsh/plugin.py:239
 #: ckanext/odsh/templates/package/resource_read.html:170
 #: ckanext/odsh/templates/package/snippets/info.html:75
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:91
@@ -50,26 +50,11 @@ msgstr "Dateiformat"
 msgid "License"
 msgstr "Lizenz"
 
-#: ckanext/odsh/plugin.py:232
+#: ckanext/odsh/plugin.py:227
 msgid "Open-Data-Eigenschaften"
 msgstr "Open-Data-Eigenschaften"
 
-#: ckanext/odsh/validation.py:275
-#, python-format
-msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_.:()"
-msgstr ""
-"Tags \"%s\" müssen aus alphnummerischen Zeichen oder diesen Symbolen "
-"bestehen: -_.:()"
-
-#: ckanext/odsh/validation.py:330
-msgid "Subject must be a known URI."
-msgstr "Bitte geben Sie einen Informationsgegenstand an"
-
-#: ckanext/odsh/validation.py:352
-msgid "Subject must not be empty."
-msgstr "Bitte geben Sie einen Informationsgegenstand ein."
-
-#: ckanext/odsh/validation.py:367
+#: ckanext/odsh/validation.py:311
 msgid "Only formats on the list of the EU Publications Office are allowed."
 msgstr ""
 "Es sind nur Formate zulässig, die in der Liste des EU Publications Office "
@@ -460,7 +445,7 @@ msgstr "Sind Sie sicher, dass Sie diese Datenabfrage löschen möchten?"
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:53
 #: ckanext/odsh/templates/package/edit_view.html:19
 #: ckanext/odsh/templates/package/snippets/package_form.html:33
-#: ckanext/odsh/templates/package/snippets/resource_form.html:96
+#: ckanext/odsh/templates/package/snippets/resource_form.html:91
 #: ckanext/odsh/templates/user/edit_user_form.html:46
 msgid "Delete"
 msgstr "Löschen"
@@ -569,7 +554,7 @@ msgid "Issued Descending"
 msgstr "Veröffentlichungsdatum: Neueste zuerst"
 
 #: ckanext/odsh/templates/organization/read.html:31
-#: ckanext/odsh/templates/snippets/package_item.html:84
+#: ckanext/odsh/templates/snippets/package_item.html:89
 #: ckanext/odsh/templates/snippets/search_form.html:20
 msgid "Popular"
 msgstr "Beliebt"
@@ -627,7 +612,7 @@ msgid "Save Organization"
 msgstr "Herausgeber speichern"
 
 #: ckanext/odsh/templates/organization/snippets/organization_item.html:15
-#: ckanext/odsh/templates/snippets/package_item.html:70
+#: ckanext/odsh/templates/snippets/package_item.html:75
 msgid "View {organization_name}"
 msgstr "{organization_name} anzeigen"
 
@@ -646,7 +631,7 @@ msgstr "Bearbeiten"
 
 #: ckanext/odsh/templates/package/edit_base.html:23
 #: ckanext/odsh/templates/package/resource_edit_base.html:28
-#: ckanext/odsh/templates/package/snippets/resource_form.html:81
+#: ckanext/odsh/templates/package/snippets/resource_form.html:77
 msgid "Back"
 msgstr "Zurück"
 
@@ -709,19 +694,19 @@ msgstr ""
 "Explorer Dokumentation</a>."
 
 #: ckanext/odsh/templates/package/new_view.html:32
-#: ckanext/odsh/templates/package/snippets/resource_form.html:117
+#: ckanext/odsh/templates/package/snippets/resource_form.html:112
 msgid "Add"
 msgstr "Hinzufügen"
 
 #: ckanext/odsh/templates/package/read.html:37
-#: ckanext/odsh/templates/snippets/package_item.html:74
+#: ckanext/odsh/templates/snippets/package_item.html:79
 msgid "Draft"
 msgstr "Entwurf"
 
 #: ckanext/odsh/templates/package/read.html:40
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:275
 #: ckanext/odsh/templates/snippets/organization.html:24
-#: ckanext/odsh/templates/snippets/package_item.html:76
+#: ckanext/odsh/templates/snippets/package_item.html:81
 msgid "Deleted"
 msgstr "Gelöscht"
 
@@ -731,7 +716,7 @@ msgstr "Datensatz bearbeiten"
 
 #: ckanext/odsh/templates/package/read.html:53
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:251
-#: ckanext/odsh/templates/snippets/package_item.html:65
+#: ckanext/odsh/templates/snippets/package_item.html:70
 msgid "Private"
 msgstr "Privat"
 
@@ -862,7 +847,7 @@ msgid "Created"
 msgstr "Erstellt"
 
 #: ckanext/odsh/templates/package/resource_read.html:166
-#: ckanext/odsh/templates/package/snippets/resource_form.html:70
+#: ckanext/odsh/templates/package/snippets/resource_form.html:68
 #: ckanext/odsh/templates/package/snippets/resource_info.html:26
 msgid "Format"
 msgstr "Format"
@@ -929,14 +914,14 @@ msgid "Filterdialog schließen"
 msgstr "Close filters"
 
 #: ckanext/odsh/templates/package/snippets/info.html:28
-#: ckanext/odsh/templates/snippets/package_item.html:92
+#: ckanext/odsh/templates/snippets/package_item.html:97
 msgid "Category:"
 msgid_plural "Categories:"
 msgstr[0] "Kategorie:"
 msgstr[1] "Kategorien:"
 
 #: ckanext/odsh/templates/package/snippets/info.html:63
-#: ckanext/odsh/templates/snippets/package_item.html:138
+#: ckanext/odsh/templates/snippets/package_item.html:143
 msgid "Issued"
 msgstr "Veröffentlicht"
 
@@ -1038,7 +1023,7 @@ msgid "Next: Add Data"
 msgstr "Weiter: Daten hinzufügen"
 
 #: ckanext/odsh/templates/package/snippets/package_form.html:46
-#: ckanext/odsh/templates/package/snippets/resource_form.html:123
+#: ckanext/odsh/templates/package/snippets/resource_form.html:118
 msgid "Required information"
 msgstr "Pflichtangabe"
 
@@ -1101,27 +1086,21 @@ msgid ""
 "  application/json"
 msgstr "z.B. application/json"
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:68
+#: ckanext/odsh/templates/package/snippets/resource_form.html:66
 msgid "odsh_resource_format_error_label"
 msgstr "Bitte geben Sie ein Format an"
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:70
-msgid "eg. CSV, XML or JSON"
-msgstr "z.B. CSV, XML or JSON"
-
-#: ckanext/odsh/templates/package/snippets/resource_form.html:84
+#: ckanext/odsh/templates/package/snippets/resource_form.html:80
 #, fuzzy
 #| msgid "Another dataset"
-msgid ""
-"Another\n"
-"          dataset"
+msgid "Another dataset"
 msgstr "weitere Distribution"
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:93
+#: ckanext/odsh/templates/package/snippets/resource_form.html:88
 msgid "Are you sure you want to delete this resource?"
 msgstr "Sind Sie sicher, dass Sie diese Ressource löschen wollen?"
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:110
+#: ckanext/odsh/templates/package/snippets/resource_form.html:105
 msgid "Upload dataset"
 msgstr "Hochladen"
 
@@ -1267,7 +1246,11 @@ msgstr "Abonennten"
 msgid "Documents"
 msgstr "Dokumente"
 
-#: ckanext/odsh/templates/snippets/package_item.html:60
+#: ckanext/odsh/templates/snippets/package_item.html:41
+msgid "Data series"
+msgstr "Datenserie"
+
+#: ckanext/odsh/templates/snippets/package_item.html:65
 msgid "NEW"
 msgstr "NEU"
 
@@ -1529,6 +1512,20 @@ msgstr "Passwort merken"
 msgid "do Login"
 msgstr "Einloggen"
 
+#~ msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_.:()"
+#~ msgstr ""
+#~ "Tags \"%s\" müssen aus alphnummerischen Zeichen oder diesen Symbolen "
+#~ "bestehen: -_.:()"
+
+#~ msgid "Subject must be a known URI."
+#~ msgstr "Bitte geben Sie einen Informationsgegenstand an"
+
+#~ msgid "Subject must not be empty."
+#~ msgstr "Bitte geben Sie einen Informationsgegenstand ein."
+
+#~ msgid "eg. CSV, XML or JSON"
+#~ msgstr "z.B. CSV, XML or JSON"
+
 #~ msgid ""
 #~ "Search\n"
 #~ "datasets..."

ckanext/odsh/templates/snippets/package_item.html

@@ -36,6 +36,11 @@ Example:
     {% block content %}
     <div class="dataset-content">
         {% block heading %}
+        {% if package.get('type') == 'collection' %}
+        <div class='package-info-pill'>
+          {{ _('Data series') }}
+        </div>
+        {% endif %}
         {%if daterange %}
         <div class='package-info-pill'>
             {{ daterange }}