UHF-10883: Merge remote-tracking branch 'origin/dev' into UHF-10883

City-of-Helsinki · Nov 26, 2024 · 0c4c18e · 0c4c18e
2 parents c1e0dfd + d7ac557
commit 0c4c18e
Show file tree

Hide file tree

Showing 16 changed files with 177 additions and 1,679 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/grants_metadata.settings.yml b/conf/cmi/grants_metadata.settings.yml
@@ -291,14 +291,14 @@ third_party_options:
     44: 'Development grant'
     45: 'Development grant for the Helsinki Model'
     46: 'Development grant for basic arts education'
-    47: 'Kulttuurin erityisavustus 1'
-    48: 'Kulttuurin erityisavustus 2'
-    49: 'Nuorison erityisavustus 1'
-    50: 'Nuorison erityisavustus 2'
-    51: 'Liikunnan erityisavustus 1'
-    52: 'Liikunnan erityisavustus 2'
-    53: 'Kulttuurin ja vapaa-ajan erityisavustus 1'
-    54: 'Kulttuurin ja vapaa-ajan erityisavustus 2'
+    47: 'Special grant for culture 1'
+    48: 'Special grant for culture 2'
+    49: 'Special grant for youth activities 1'
+    50: 'Special grant for youth activities 2'
+    51: 'Special grant for sports 1'
+    52: 'Special grant for sports 2'
+    53: 'Special grant for culture and leisure 1'
+    54: 'Special grant for culture and leisure 2'
 langcode: en
 config_import_ignore:
   - 53