Merge branch 'master' into datapusher

.gitmodules

@@ -23,3 +23,6 @@
 [submodule "modules/ckanext-archiver"]
 	path = modules/ckanext-archiver
 	url = https://github.com/ckan/ckanext-archiver.git
+[submodule "modules/ckanext-showcase"]
+	path = modules/ckanext-showcase
+	url = https://github.com/vrk-kpa/ckanext-showcase.git

ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po

@@ -4222,7 +4222,7 @@ msgstr "Uutisvirta"
 #: ckan/templates/user/dashboard.html:20
 #: ckan/templates/user/dashboard_datasets.html:12
 msgid "My Datasets"
-msgstr "Minun tietoaineistot"
+msgstr "Minun tietoaineistoni"
 
 #: ckan/templates/user/dashboard.html:21
 #: ckan/templates/user/dashboard_organizations.html:12

ansible/roles/ckan/vars/main.yml

@@ -7,7 +7,7 @@ celery_user: "{{ www_user }}"
 
 ckan_plugins_default: stats
 # order matters, when templates call super()
-ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore
+ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore showcase
 
 ckan_aws_plugins: cloudstorage
 
@@ -28,6 +28,7 @@ ckan_extensions:
   - ckanext-qa
   - ckanext-dcat
   - ckanext-cloudstorage
+  - ckanext-showcase
 
 
 redis_harvest_database: 0