Merge pull request #195 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Feb 10, 2023 · 78263e5 · 78263e5
2 parents f9ce362 + 63bfed3
commit 78263e5
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 289 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.service_list.field_service_list_description
-    - field.field.paragraph.service_list.field_service_list_meta_load_mor
     - field.field.paragraph.service_list.field_service_list_services
     - field.field.paragraph.service_list.field_service_list_title
     - paragraphs.paragraphs_type.service_list
@@ -42,14 +41,6 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_service_list_meta_load_mor:
-    type: string_textfield
-    weight: 4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_service_list_services:
     type: select2_entity_reference
     weight: 1

diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml
@@ -6,7 +6,6 @@ dependencies:
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
     - field.field.paragraph.unit_search.field_unit_search_meta_label
-    - field.field.paragraph.unit_search.field_unit_search_meta_load_more
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
     - field.field.paragraph.unit_search.field_unit_search_units
@@ -65,14 +64,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_unit_search_meta_load_more:
-    type: string_textfield
-    weight: 7
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_unit_search_meta_placehold:
     type: string_textfield
     weight: 5

diff --git a/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.service_list.field_service_list_description
-    - field.field.paragraph.service_list.field_service_list_meta_load_mor
     - field.field.paragraph.service_list.field_service_list_services
     - field.field.paragraph.service_list.field_service_list_title
     - paragraphs.paragraphs_type.service_list
@@ -22,14 +21,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_service_list_meta_load_mor:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 3
-    region: content
   field_service_list_services:
     type: entity_reference_entity_id
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml
@@ -6,7 +6,6 @@ dependencies:
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
     - field.field.paragraph.unit_search.field_unit_search_meta_label
-    - field.field.paragraph.unit_search.field_unit_search_meta_load_more
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
     - field.field.paragraph.unit_search.field_unit_search_units
@@ -43,14 +42,6 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_unit_search_meta_load_more:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 6
-    region: content
   field_unit_search_meta_placehold:
     type: string
     label: hidden

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -138,7 +138,6 @@ module:
   view_unpublished: 0
   views_bulk_edit: 0
   views_bulk_operations: 0
-  views_infinite_scroll: 0
   views_ui: 0
   pathauto: 1
   content_translation: 10

diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml
diff --git a/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml b/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml
diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml
diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml
diff --git a/conf/cmi/language/fi/views.view.service_list.yml b/conf/cmi/language/fi/views.view.service_list.yml
@@ -1,6 +1,6 @@
 display:
   default:
-    display_title: Oletus
+    display_title: Isäntä
     display_options:
       exposed_form:
         options:
@@ -12,23 +12,15 @@ display:
       pager:
         options:
           tags:
-            previous: '‹ Edellinen'
-            next: 'Seuraava ›'
+            next: Seuraava
+            previous: Edellinen
+            first: Ensimmäinen
+            last: Viimeinen
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
             offset_label: Offset
-          views_infinite_scroll:
-            button_text: 'Lataa lisää palveluita'
-      fields:
-        name:
-          separator: ', '
       arguments:
         id:
           exception:
             title: Kaikki
-      empty:
-        area:
-          content:
-            value: "<p>Ei tuloksia</p>\r\n"
-            format: full_html
diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml
@@ -12,14 +12,14 @@ display:
       pager:
         options:
           tags:
-            previous: '‹ Edellinen'
-            next: 'Seuraava ›'
+            next: Seuraava
+            previous: Edellinen
+            first: Ensimmäinen
+            last: Viimeinen
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
             offset_label: Offset
-          views_infinite_scroll:
-            button_text: 'Lataa lisää palvelupaikkoja'
       fields:
         name:
           separator: ', '