Skip to content

Commit

Permalink
Merge branch 'master' into AV-2069_optimize-ckan-dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
bzar authored Oct 12, 2023
2 parents 40e947c + a5dfc55 commit def15f9
Show file tree
Hide file tree
Showing 24 changed files with 109 additions and 825 deletions.
4 changes: 2 additions & 2 deletions ckan/ckanext/ckanext-ytp_comments/.tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
host = https://www.transifex.com

[o:avoindata:p:ytp:r:ckanext-ytp-comments]
file_filter = i18n/<lang>/LC_MESSAGES/ckanext-ytp-comments.po
source_file = i18n/ckanext-ytp-comments.pot
file_filter = ckanext/ytp_comments/i18n/<lang>/LC_MESSAGES/ckanext-ytp-comments.po
source_file = ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot
source_lang = en
type = PO

Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# Translations template for ckanext-ytp-comments.
# Copyright (C) 2015 ORGANIZATION
# This file is distributed under the same license as the ckanext-ytp-comments
# Translations template for ckanext-ytp_comments.
# Copyright (C) 2023 ORGANIZATION
# This file is distributed under the same license as the ckanext-ytp_comments
# project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckanext-ytp-comments 0.0\n"
"Project-Id-Version: ckanext-ytp_comments 0.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-11-09 15:34+0200\n"
"POT-Creation-Date: 2023-10-09 08:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
"Generated-By: Babel 2.7.0\n"

#: ckanext/ytp/comments/email_template.py:7
#: ckanext/ytp_comments/email_template.py:7
msgid "New comment in dataset '{dataset}'"
msgstr ""

#: ckanext/ytp/comments/email_template.py:9
#: ckanext/ytp_comments/email_template.py:9
msgid ""
"User {user} ({email}) has left a comment in dataset ({dataset}):\n"
"\n"
Expand All @@ -38,91 +38,91 @@ msgid ""
"\n"
"Best regards\n"
"\n"
"Avoindata.fi support\n"
"avoindata@vrk.fi\n"
"Suomi.fi Open Data support\n"
"avoindata@dvv.fi\n"
msgstr ""

#: ckanext/ytp/comments/logic/auth/create.py:15
#: ckanext/ytp/comments/logic/auth/update.py:17
#: ckanext/ytp_comments/logic/auth/create.py:15
#: ckanext/ytp_comments/logic/auth/update.py:17
msgid "You must be logged in to add a comment"
msgstr ""

#: ckanext/ytp/comments/logic/auth/create.py:27
#: ckanext/ytp_comments/logic/auth/create.py:27
msgid "You must be logged in to subscribe to comment notifications"
msgstr ""

#: ckanext/ytp/comments/logic/auth/delete.py:25
#: ckanext/ytp/comments/logic/auth/update.py:23
#: ckanext/ytp_comments/logic/auth/delete.py:25
#: ckanext/ytp_comments/logic/auth/update.py:23
msgid "Comment does not exist"
msgstr ""

#: ckanext/ytp/comments/logic/auth/delete.py:28
#: ckanext/ytp/comments/logic/auth/update.py:26
#: ckanext/ytp_comments/logic/auth/delete.py:28
#: ckanext/ytp_comments/logic/auth/update.py:26
msgid "User is not the author of the comment"
msgstr ""

#: ckanext/ytp/comments/logic/auth/delete.py:40
#: ckanext/ytp_comments/logic/auth/delete.py:40
msgid "You must be logged in to unsubscribe from comment notifications"
msgstr ""

#: ckanext/ytp/comments/public/javascript/notifications.js:9
#: ckanext/ytp/comments/templates/organization/read.html:19
#: ckanext/ytp/comments/templates/package/comment_list.html:100
#: ckanext/ytp_comments/public/javascript/notifications.js:9
#: ckanext/ytp_comments/templates/organization/read.html:19
#: ckanext/ytp_comments/templates/package/comment_list.html:99
msgid "Subscribe to comments"
msgstr ""

#: ckanext/ytp/comments/public/javascript/notifications.js:10
#: ckanext/ytp/comments/templates/organization/read.html:15
#: ckanext/ytp/comments/templates/package/comment_list.html:98
#: ckanext/ytp_comments/public/javascript/notifications.js:10
#: ckanext/ytp_comments/templates/organization/read.html:15
#: ckanext/ytp_comments/templates/package/comment_list.html:97
msgid "Unsubscribe from comments"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:10
#: ckanext/ytp/comments/templates/package/comment_list.html:86
#: ckanext/ytp_comments/templates/package/comment_list.html:10
#: ckanext/ytp_comments/templates/package/comment_list.html:85
msgid "Subject"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:12
#: ckanext/ytp/comments/templates/package/comment_list.html:89
#: ckanext/ytp_comments/templates/package/comment_list.html:12
#: ckanext/ytp_comments/templates/package/comment_list.html:88
msgid "Comment"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:17
#: ckanext/ytp/comments/templates/package/comment_list.html:93
#: ckanext/ytp_comments/templates/package/comment_list.html:17
#: ckanext/ytp_comments/templates/package/comment_list.html:92
msgid "Save"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:18
#: ckanext/ytp/comments/templates/package/comment_list.html:94
#: ckanext/ytp_comments/templates/package/comment_list.html:18
#: ckanext/ytp_comments/templates/package/comment_list.html:93
msgid "Clear"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:37
#: ckanext/ytp/comments/templates/package/comment_list.html:49
#: ckanext/ytp_comments/templates/package/comment_list.html:36
#: ckanext/ytp_comments/templates/package/comment_list.html:48
msgid "This comment was deleted."
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:42
#: ckanext/ytp_comments/templates/package/comment_list.html:41
msgid "Modified"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:54
#: ckanext/ytp_comments/templates/package/comment_list.html:53
msgid "Delete"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:58
#: ckanext/ytp_comments/templates/package/comment_list.html:57
msgid "Edit"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:62
#: ckanext/ytp_comments/templates/package/comment_list.html:61
msgid "Reply"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:76
#: ckanext/ytp_comments/templates/package/comment_list.html:75
msgid "Comments"
msgstr ""

#: ckanext/ytp/comments/templates/package/comment_list.html:107
#: ckanext/ytp_comments/templates/package/comment_list.html:106
msgid "Login to comment."
msgstr ""

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ckanext-ytp_main 0.3\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-08-08 07:15+0000\n"
"POT-Creation-Date: 2023-10-09 07:14+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -2965,10 +2965,10 @@ msgstr ""

#: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81
msgid ""
"Dataset counts are based on submission statistics from avoindata.fi. Open "
"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 "
"for evaluating open data. More information on the metric is available at <a "
"href=\"http://5stardata.info\">http://5stardata.info</a>."
"Dataset counts are based on submission statistics from Suomi.fi Open Data. "
"Open data quality rating is based on a metricdevised by Tim Berners-Lee in "
"2010 for evaluating open data. More information on the metric is available at"
" <a href=\"http://5stardata.info\">http://5stardata.info</a>."
msgstr ""

#: ckanext/ytp/templates/report/deprecated_dataset_report.html:9
Expand Down Expand Up @@ -3498,10 +3498,10 @@ msgstr ""
#: ckanext/ytp/templates/sparql/query.html:18
msgid ""
"You can use the SPARQL search to find datasets and their metadata by using "
"SPARQL query language. Datasets on opendata.fi are published as RDF triples "
"and they follow the DCAT-AP specification. You can find information on <a "
"href=\"https://www.avoindata.fi/ns/\">opendata.fi’s DCAT AP extension "
"here</a>."
"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF "
"triples and they follow the DCAT-AP specification. You can find information "
"on <a href=\"https://www.avoindata.fi/ns/\">Suomi.fi Open Data’s DCAT AP "
"extension here</a>."
msgstr ""

#: ckanext/ytp/templates/sparql/query.html:22
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ckanext-ytp_main 0.3\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-08-08 07:15+0000\n"
"POT-Creation-Date: 2023-10-09 07:14+0000\n"
"PO-Revision-Date: 2018-03-08 13:35+0000\n"
"Last-Translator: Teemu Erkkola <[email protected]>, 2023\n"
"Language-Team: Finnish (https://app.transifex.com/avoindata/teams/7979/fi/)\n"
Expand Down Expand Up @@ -3127,15 +3127,15 @@ msgstr "Viim. 6kk"

#: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81
msgid ""
"Dataset counts are based on submission statistics from avoindata.fi. Open "
"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 "
"for evaluating open data. More information on the metric is available at <a "
"href=\"http://5stardata.info\">http://5stardata.info</a>."
"Dataset counts are based on submission statistics from Suomi.fi Open Data. "
"Open data quality rating is based on a metricdevised by Tim Berners-Lee in "
"2010 for evaluating open data. More information on the metric is available "
"at <a href=\"http://5stardata.info\">http://5stardata.info</a>."
msgstr ""
"Tietoaineistot on laskettu avoindata.fi-palvelusta löytyvien "
"tietoaineistojen mukaan. Avoimen datan laatupisteitys perustuu Tim Berners-"
"Leen vuonna 2010 kehittämään avoimen datan luokitteluun. Tästä on saatavissa"
" lisätietoja esimerkiksi verkko-osoitteesta <a "
"Tietoaineistot on laskettu Suomi.fi-avoindatasta löytyvien tietoaineistojen "
"mukaan. Avoimen datan laatupisteitys perustuu Tim Berners-Leen vuonna 2010 "
"kehittämään avoimen datan luokitteluun. Tästä on saatavissa lisätietoja "
"esimerkiksi verkko-osoitteesta <a "
"href=\\\"http://5stardata.info\\\">http://5stardata.info</a>."

#: ckanext/ytp/templates/report/deprecated_dataset_report.html:9
Expand Down Expand Up @@ -3709,16 +3709,16 @@ msgstr "SPARQL-haku"
#: ckanext/ytp/templates/sparql/query.html:18
msgid ""
"You can use the SPARQL search to find datasets and their metadata by using "
"SPARQL query language. Datasets on opendata.fi are published as RDF triples "
"and they follow the DCAT-AP specification. You can find information on <a "
"href=\"https://www.avoindata.fi/ns/\">opendata.fi’s DCAT AP extension "
"here</a>."
msgstr ""
"SPARQL-haulla voit hakea avoindata.fi:n aineistoja ja aineistojen "
"kuvailutietoja käyttämällä SPARQL-kyselykieltä. Kaikki avoindata.fi:n data "
"on kuvailtu RDF-tietomallin ja DCAT-AP-määrittelyn mukaan. Tutustu <a "
"href=\"https://www.avoindata.fi/ns/\">Avoindata.fi:n DCAT-AP-laajennoksen "
"tietoihin</a>."
"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF "
"triples and they follow the DCAT-AP specification. You can find information "
"on <a href=\"https://www.avoindata.fi/ns/\">Suomi.fi Open Data’s DCAT AP "
"extension here</a>."
msgstr ""
"SPARQL-haulla voit hakea Suomi.fi-avoindatan aineistoja ja aineistojen "
"kuvailutietoja käyttämällä SPARQL-kyselykieltä. Kaikki Suomi.fi-avoindatan "
"data on kuvailtu RDF-tietomallin ja DCAT-AP-määrittelyn mukaan. Tutustu <a "
"href=\"https://www.avoindata.fi/ns/\">Suomi.fi-avoindatan DCAT-AP-"
"laajennoksen tietoihin</a>."

#: ckanext/ytp/templates/sparql/query.html:22
msgid ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
# Daniel Vainio, 2021
# Ville Teräväinen, 2022
# Zharktas <[email protected]>, 2023
# Roosa Lampinen, 2023
# Suvi Nuttunen, 2023
# Roosa Lampinen, 2023
# Teemu Erkkola <[email protected]>, 2023
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckanext-ytp_main 0.3\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-08-08 07:15+0000\n"
"POT-Creation-Date: 2023-10-09 07:14+0000\n"
"PO-Revision-Date: 2018-03-08 13:35+0000\n"
"Last-Translator: Teemu Erkkola <[email protected]>, 2023\n"
"Language-Team: Swedish (https://app.transifex.com/avoindata/teams/7979/sv/)\n"
Expand Down Expand Up @@ -661,7 +661,7 @@ msgstr "Medlemmarna kan endast redigera sina egna datamängder"

#: ckanext/ytp/translations.py:76
msgid "Home page"
msgstr "Startsida"
msgstr "Framsida"

#: ckanext/ytp/translations.py:77
msgid "Maturity"
Expand Down Expand Up @@ -2670,7 +2670,7 @@ msgstr "Status"

#: ckanext/ytp/templates/package/snippets/additional_info.html:60
msgid "Last Updated"
msgstr "Senast uppdaterat"
msgstr "Senast uppdaterad"

#: ckanext/ytp/templates/package/snippets/categories.html:26
msgid "Show more categories"
Expand Down Expand Up @@ -3064,12 +3064,12 @@ msgstr "Senaste 6 mån."

#: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81
msgid ""
"Dataset counts are based on submission statistics from avoindata.fi. Open "
"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 "
"for evaluating open data. More information on the metric is available at <a "
"href=\"http://5stardata.info\">http://5stardata.info</a>."
"Dataset counts are based on submission statistics from Suomi.fi Open Data. "
"Open data quality rating is based on a metricdevised by Tim Berners-Lee in "
"2010 for evaluating open data. More information on the metric is available "
"at <a href=\"http://5stardata.info\">http://5stardata.info</a>."
msgstr ""
"Datamängderna har räknats utifrån datamängderna i avoindata.fi. "
"Datamängderna har räknats utifrån datamängderna i Suomi.fi-öppnadata. "
"Poängsättningen av öppna data baserar sig på en kvalitetsklassificering "
"utvecklad av Tim Berners-Lee 2010. Mer information finns till exempel på <a "
"href=\\\"http://5stardata.info\\\">http://5stardata.info</a>."
Expand Down Expand Up @@ -3446,7 +3446,7 @@ msgstr "Sökresultaten innehåller inga fält med {facet_type}"

#: ckanext/ytp/templates/snippets/home_breadcrumb_item.html:2
msgid "Home"
msgstr "Startsida"
msgstr "Framsida"

#: ckanext/ytp/templates/snippets/license.html:14
msgid "No License Provided"
Expand Down Expand Up @@ -3621,10 +3621,10 @@ msgstr "SPARQL sökning"
#: ckanext/ytp/templates/sparql/query.html:18
msgid ""
"You can use the SPARQL search to find datasets and their metadata by using "
"SPARQL query language. Datasets on opendata.fi are published as RDF triples "
"and they follow the DCAT-AP specification. You can find information on <a "
"href=\"https://www.avoindata.fi/ns/\">opendata.fi’s DCAT AP extension "
"here</a>."
"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF "
"triples and they follow the DCAT-AP specification. You can find information "
"on <a href=\"https://www.avoindata.fi/ns/\">Suomi.fi Open Data’s DCAT AP "
"extension here</a>."
msgstr ""

#: ckanext/ytp/templates/sparql/query.html:22
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/dataset_resource_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ describe('Dataset resource tests', function(){
const dataset_data = "test data";
cy.switch_language('sv');
//breadcrumbs
cy.get('.breadcrumb').find('li').eq(0).contains('Startsida');
cy.get('.breadcrumb').find('li').eq(0).contains('Framsida');
cy.get('.breadcrumb').find('li').eq(1).contains('Producenter');
cy.get('.breadcrumb').find('li').eq(2);//this has autogenerated uid in it
cy.get('.breadcrumb').find('li').eq(3).contains(dataset_name);
Expand Down
2 changes: 1 addition & 1 deletion doc/dcat-ap/model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ classes:
- name: DataUserInterface
term: adfi:DataUserInterface
range: rdfs:Literal
description: The showcase’s URL on opendata.fi. The URL is created automatically based on the publisher’s name. You can edit the URL if you want.
description: The showcase’s URL on Suomi.fi Open Data. The URL is created automatically based on the publisher’s name. You can edit the URL if you want.
min: 1
max: 1
recommended:
Expand Down
4 changes: 2 additions & 2 deletions docker/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ REGISTRY=""
REPOSITORY=""

# opendata images
CKAN_IMAGE_TAG="67e00941ce19d3c4725314a70cbacc6a94f6d1c8"
DRUPAL_IMAGE_TAG="67e00941ce19d3c4725314a70cbacc6a94f6d1c8"
CKAN_IMAGE_TAG="e1431c8f9fda9cbc22b52a764af8f27c2d9e5148"
DRUPAL_IMAGE_TAG="e1431c8f9fda9cbc22b52a764af8f27c2d9e5148"
SOLR_IMAGE_TAG="acedaa3c1d35875178b6d104fe413bef0bbdd155"
NGINX_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1"
DATAPUSHER_IMAGE_TAG="37245d2426ed6218a7352115d4147139defc9d8e"
Expand Down
2 changes: 0 additions & 2 deletions drupal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ COPY modules/avoindata-guide ${MOD_DIR}/avoindata-guide/
COPY modules/avoindata-user ${MOD_DIR}/avoindata-user/
COPY modules/avoindata-ckeditor-plugins ${MOD_DIR}/avoindata-ckeditor-plugins/
COPY modules/avoindata-theme ${MOD_DIR}/avoindata-theme/
COPY modules/avoindata-appfeed ${MOD_DIR}/avoindata-appfeed/
COPY modules/avoindata-datasetlist ${MOD_DIR}/avoindata-datasetlist/
COPY modules/avoindata-ckeditor5-plugins ${MOD_DIR}/avoindata-ckeditor5-plugins/


Expand Down
Loading

0 comments on commit def15f9

Please sign in to comment.