Merge pull request #318 from City-of-Helsinki/UHF-9755

UHF-9755 Configuration replacement
City-of-Helsinki · Mar 21, 2024 · 1e2904c · 1e2904c
2 parents ccb0f8c + 4969ffb
commit 1e2904c
Show file tree

Hide file tree

Showing 52 changed files with 159 additions and 27 deletions.
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
-    region: content
     settings: {  }
     third_party_settings: {  }
+    region: content
   status:
     type: boolean_checkbox
     weight: 12

diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml
@@ -42,8 +42,8 @@ content:
     weight: 4
     region: content
     settings:
-      linkit_profile: helfi
       linkit_auto_link_text: false
+      linkit_profile: helfi
     third_party_settings: {  }
   field_banner_link_design:
     type: design_field_widget

diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.paragraph.list_of_links_item.field_list_of_links_link
     - paragraphs.paragraphs_type.list_of_links_item
   module:
+    - hdbt_admin_tools
     - media_library
   enforced:
     module:
@@ -39,8 +40,8 @@ content:
     weight: 1
     region: content
     settings:
-      linkit_profile: helfi
       linkit_auto_link_text: false
+      linkit_profile: helfi
     third_party_settings: {  }
 hidden:
   created: true

diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
@@ -31,9 +31,9 @@ content:
     weight: 0
     region: content
   list:
+    weight: 100
     settings: {  }
     third_party_settings: {  }
-    weight: 100
     region: content
 hidden:
   search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.image.default.yml b/conf/cmi/core.entity_view_display.paragraph.image.default.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.paragraph.image.field_image_caption
     - field.field.paragraph.image.field_original_aspect_ratio
     - paragraphs.paragraphs_type.image
+  module:
+    - helfi_platform_config
 _core:
   default_config_hash: CyIGn-WUC2tx_La6KCOli1lPT8vEb_8MQwz6Ls6niO8
 id: paragraph.image.default

diff --git a/conf/cmi/editoria11y.settings.yml b/conf/cmi/editoria11y.settings.yml
@@ -6,7 +6,7 @@ no_load: ''
 embedded_content_warning: ''
 download_links: ''
 ignore_link_strings: ''
+link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text'
 hidden_handlers: ''
 ignore_containers: ''
 allow_overflow: ''
-link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -8,8 +8,8 @@ id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
 description: 'Helfi hearings from hearing api.'
-read_only: true
 generate_aliases: false
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -8,8 +8,8 @@ id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -8,8 +8,8 @@ id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -8,8 +8,8 @@ id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -42,25 +42,25 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
-      columns: columns
       list_of_links: list_of_links
       content_cards: content_cards
-      content_liftup: content_liftup
       banner: banner
       liftup_with_image: liftup_with_image
+      popular_services: popular_services
       from_library: from_library
-      chart: chart
-      remote_video: remote_video
-      map: map
-      news_list: news_list
-      event_list: event_list
+      columns: columns
       phasing: phasing
-      popular_services: popular_services
+      map: map
+      remote_video: remote_video
+      chart: chart
       target_group_links: target_group_links
+      event_list: event_list
+      news_list: news_list
       hearings: hearings
-      unit_search: unit_search
+      content_liftup: content_liftup
       service_list: service_list
       service_list_search: service_list_search
+      unit_search: unit_search
     negate: 0
     target_bundles_drag_drop:
       banner:

diff --git a/conf/cmi/language/fi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/language/fi/core.entity_form_display.paragraph.phasing.default.yml
@@ -0,0 +1,5 @@
+content:
+  field_phasing_item:
+    settings:
+      title: Lohko
+      title_plural: Lohkot
diff --git a/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml
@@ -1 +1 @@
-label: Päivitä
+label: Päivitys
diff --git a/conf/cmi/language/fi/views.view.locked_content.yml b/conf/cmi/language/fi/views.view.locked_content.yml
@@ -21,16 +21,20 @@ display:
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Solmujen bulkkitoimintojen lomake'
           action_title: Toiminto
         title:
           label: Otsikko
+          separator: ', '
         type:
           label: Sisältötyyppi
+          separator: ', '
         name:
           label: 'Lukituksen tekijä'
+          separator: ', '
         operations:
           label: Toimenpiteet
         timestamp:
@@ -57,3 +61,6 @@ display:
           content: 'Lukittua sisältöä ei ole.'
   page_1:
     display_title: Sivu
+    display_options:
+      menu:
+        title: 'Lukitut sisällöt'
diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml
@@ -6,7 +6,7 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Suodatin
+          submit_button: Suodata
           reset_button_label: Palauta
           exposed_sorts_label: Lajittele
           sort_asc_label: Nousevasti

diff --git a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml
@@ -8,19 +8,25 @@ display:
           action_title: Toiminto
         title:
           label: Otsikko
+          separator: ', '
         type:
           label: Sisältötyyppi
+          separator: ', '
         name:
           label: Kirjoittaja
+          separator: ', '
         status:
           label: Tila
           settings:
             format_custom_true: Julkaistu
             format_custom_false: Julkaisematon
+          separator: ', '
         publish_on:
           label: Julkaisuaika
+          separator: ', '
         unpublish_on:
           label: 'Ajastettu piilottaminen'
+          separator: ', '
         operations:
           label: Toimenpiteet
       filters:
@@ -47,6 +53,20 @@ display:
       empty:
         area_text_custom:
           content: 'Ei vielä ajastettua sisältöä.'
+      exposed_form:
+        options:
+          submit_button: Suodata
+          reset_button_label: Palauta
+          exposed_sorts_label: Lajittele
+          sort_asc_label: Nousevasti
+          sort_desc_label: Laskevasti
+      pager:
+        options:
+          tags:
+            previous: '‹ edellinen'
+            next: 'seuraava ›'
+            first: '« ensimmäinen'
+            last: 'viimeinen »'
     display_title: Oletus
   overview:
     display_options:

diff --git a/conf/cmi/language/fi/views.view.user_admin_people.yml b/conf/cmi/language/fi/views.view.user_admin_people.yml
@@ -21,6 +21,8 @@ display:
           label: 'Käyttäjä jo'
         access:
           label: 'Viimeksi paikalla'
+          settings:
+            past_format: '@interval sitten'
         operations:
           label: Toimenpiteet
         mail:

diff --git a/conf/cmi/language/sv/core.base_field_override.node.announcement.status.yml b/conf/cmi/language/sv/core.base_field_override.node.announcement.status.yml
@@ -0,0 +1,4 @@
+label: Publicerad
+settings:
+  on_label: På
+  off_label: Av
diff --git a/conf/cmi/language/sv/core.base_field_override.node.landing_page.status.yml b/conf/cmi/language/sv/core.base_field_override.node.landing_page.status.yml
@@ -0,0 +1,4 @@
+label: Publicerad
+settings:
+  on_label: På
+  off_label: Av
diff --git a/conf/cmi/language/sv/core.base_field_override.node.page.status.yml b/conf/cmi/language/sv/core.base_field_override.node.page.status.yml
@@ -0,0 +1,4 @@
+label: Publicerad
+settings:
+  on_label: På
+  off_label: Av
diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.phasing.default.yml
@@ -0,0 +1,5 @@
+content:
+  field_phasing_item:
+    settings:
+      title: Paragraf
+      title_plural: Paragrafer
diff --git a/conf/cmi/language/sv/field.field.node.landing_page.field_liftup_image.yml b/conf/cmi/language/sv/field.field.node.landing_page.field_liftup_image.yml
@@ -0,0 +1,2 @@
+label: Lyftbild
+description: 'Bilden syns i uttag, sökmotorer och delningar i sociala medier.'
diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml
@@ -0,0 +1 @@
+label: Beskrivning
diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml
@@ -0,0 +1 @@
+label: Titel
diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_filter_keywords.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_filter_keywords.yml
@@ -0,0 +1 @@
+label: Ämnen
diff --git a/conf/cmi/language/sv/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/language/sv/field.field.paragraph.hearings.field_hearings_description.yml
@@ -0,0 +1 @@
+label: Beskrivning
diff --git a/conf/cmi/language/sv/field.field.paragraph.hearings.field_hearings_title.yml b/conf/cmi/language/sv/field.field.paragraph.hearings.field_hearings_title.yml
@@ -0,0 +1 @@
+label: Titel
diff --git a/conf/cmi/language/sv/field.field.paragraph.phasing.field_description.yml b/conf/cmi/language/sv/field.field.paragraph.phasing.field_description.yml
@@ -0,0 +1 @@
+label: Beskrivning
diff --git a/conf/cmi/language/sv/field.field.paragraph.phasing.field_title.yml b/conf/cmi/language/sv/field.field.paragraph.phasing.field_title.yml
@@ -0,0 +1 @@
+label: Titel
diff --git a/conf/cmi/language/sv/field.field.paragraph.phasing_item.field_description.yml b/conf/cmi/language/sv/field.field.paragraph.phasing_item.field_description.yml
@@ -0,0 +1 @@
+label: Beskrivning
diff --git a/conf/cmi/language/sv/field.field.paragraph.phasing_item.field_title.yml b/conf/cmi/language/sv/field.field.paragraph.phasing_item.field_title.yml
@@ -0,0 +1 @@
+label: Titel
diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_title.yml
@@ -0,0 +1 @@
+label: Titel
diff --git a/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/...i/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/...i/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/.../cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/.../cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/...mi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/...cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/...cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml
@@ -0,0 +1,3 @@
+settings:
+  on_label: På
+  off_label: Av
diff --git a/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_lower_content.yml
@@ -0,0 +1 @@
+label: Botteninnehåll
diff --git a/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_sidebar_content.yml b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_sidebar_content.yml
@@ -0,0 +1 @@
+label: 'Sidofältets innehåll'
diff --git a/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_lower_content.yml
@@ -0,0 +1 @@
+label: Botteninnehåll
diff --git a/conf/cmi/language/sv/views.view.files.yml b/conf/cmi/language/sv/views.view.files.yml
@@ -41,6 +41,9 @@ display:
           label: 'Datum för ändring'
         count:
           label: 'Används i'
+          alter:
+            path: 'admin/content/files/usage/{{ fid }}'
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       filters:
         filename:
           expose:
@@ -81,6 +84,7 @@ display:
           label: 'Registrerar modul'
         count:
           label: 'Antal använd'
+          format_plural_string: !!binary MQNAY291bnQ=
       title: Filanvändning
       arguments:
         fid:

diff --git a/conf/cmi/language/sv/views.view.locked_services.yml b/conf/cmi/language/sv/views.view.locked_services.yml
@@ -29,8 +29,9 @@ display:
       exposed_form:
         options:
           submit_button: Filtrera
-          sort_asc_label: Ascending
-          sort_desc_label: Descending
+          sort_asc_label: Stigande
+          sort_desc_label: Fallande
+          exposed_sorts_label: 'Sortera efter'
       filters:
         name:
           expose:

diff --git a/conf/cmi/language/sv/views.view.paragraphs_library.yml b/conf/cmi/language/sv/views.view.paragraphs_library.yml
@@ -39,6 +39,8 @@ display:
           separator: ', '
         operations:
           label: Funktioner
+        count:
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       filters:
         label:
           expose:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		label: Lyftbild
		description: 'Bilden syns i uttag, sökmotorer och delningar i sociala medier.'