Merge pull request #1130 from City-of-Helsinki/dev

Dev to main

Author: khalima

composer.lock

@@ -2,6 +2,7 @@ _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
 mode: simple
 ignored_config_entities:
+  - block.block.ibmchatapp_pysakointibot_fi_test
   - 'easy_breadcrumb.settings:home_segment_title'
   - 'hdbt_admin_tools.site_settings:footer_settings'
   - 'hdbt_admin_tools.site_settings:site_settings'

conf/cmi/config_ignore.settings.yml

@@ -34,10 +34,10 @@ display:
             items_per_page_options_all_label: '- Kaikki -'
       exposed_form:
         options:
-          submit_button: Suodata
-          exposed_sorts_label: Järjestä
-          sort_asc_label: Nouseva
-          sort_desc_label: Laskeva
+          submit_button: Käytä
+          exposed_sorts_label: Lajittele
+          sort_asc_label: Nousevasti
+          sort_desc_label: Laskevasti
           reset_button_label: Palauta
       empty:
         area_text_custom:

conf/cmi/language/fi/views.view.locked_services.yml

@@ -23,9 +23,9 @@ display:
         options:
           submit_button: Etsi
           reset_button_label: Palauta
-          exposed_sorts_label: Järjestä
-          sort_asc_label: Nouseva
-          sort_desc_label: Laskeva
+          exposed_sorts_label: Lajittele
+          sort_asc_label: Nousevasti
+          sort_desc_label: Laskevasti
       empty:
         area:
           content:

conf/cmi/language/fi/views.view.unit_search.yml

@@ -29,10 +29,11 @@ display:
             items_per_page_options_all_label: '- Все -'
       exposed_form:
         options:
-          submit_button: Фильтр
-          sort_asc_label: Ascending
-          sort_desc_label: Descending
+          submit_button: фильтр
+          sort_asc_label: 'По возрастанию'
+          sort_desc_label: 'По убыванию'
           reset_button_label: Сбросить
+          exposed_sorts_label: 'Сортировать по'
       filters:
         name:
           expose:

conf/cmi/language/ru/views.view.locked_services.yml

@@ -40,8 +40,9 @@ display:
         options:
           submit_button: Поиск
           reset_button_label: Сбросить
-          sort_asc_label: Ascending
-          sort_desc_label: Descending
+          sort_asc_label: 'По возрастанию'
+          sort_desc_label: 'По убыванию'
+          exposed_sorts_label: 'Сортировать по'
   block:
     display_title: Блок
   entity_reference:

conf/cmi/language/ru/views.view.unit_search.yml

@@ -30,7 +30,7 @@ display:
             items_per_page_options_all_label: '- Alla -'
       exposed_form:
         options:
-          submit_button: Filtrera
+          submit_button: Verkställ
           sort_asc_label: Stigande
           sort_desc_label: Fallande
           reset_button_label: Återställ