City-of-Helsinki · hyrsky · May 8, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/.platform/ignore b/.platform/ignore
@@ -0,0 +1,2 @@
+tests/dtt/src/ExistingSite/ModuleEnabledTest.php&#10
+tools/make/project/install.mk
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/helfi_api_base.features.yml b/conf/cmi/helfi_api_base.features.yml
@@ -0,0 +1,2 @@
+disable_email_sending: true
+user_expire: false
diff --git a/conf/cmi/language/ar/webform.webform.contact.yml b/conf/cmi/language/ar/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/es/webform.webform.contact.yml b/conf/cmi/language/es/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/et/webform.webform.contact.yml b/conf/cmi/language/et/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/fa/webform.webform.contact.yml b/conf/cmi/language/fa/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/fi/views.view.archive.yml b/conf/cmi/language/fi/views.view.archive.yml
@@ -8,8 +8,8 @@ display:
       pager:
         options:
           tags:
-            next: ››
-            previous: ‹‹
+            next: 'Seuraava ›'
+            previous: '‹ Edellinen'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'

diff --git a/conf/cmi/language/fi/views.view.glossary.yml b/conf/cmi/language/fi/views.view.glossary.yml
@@ -13,8 +13,8 @@ display:
       pager:
         options:
           tags:
-            next: ››
-            previous: ‹‹
+            next: 'Seuraava ›'
+            previous: '‹ Edellinen'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'

diff --git a/conf/cmi/language/fi/views.view.media.yml b/conf/cmi/language/fi/views.view.media.yml
@@ -1,5 +1,4 @@
 label: Media
-description: 'Find and manage media.'
 display:
   default:
     display_title: Oletus

diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml
@@ -1,4 +1,3 @@
-description: 'Find and manage media.'
 display:
   default:
     display_title: Oletus
@@ -10,8 +9,8 @@ display:
       pager:
         options:
           tags:
-            next: ››
-            previous: ‹‹
+            next: 'Seuraava ›'
+            previous: '‹ Edellinen'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'

diff --git a/conf/cmi/language/fi/views.view.redirect_404.yml b/conf/cmi/language/fi/views.view.redirect_404.yml
@@ -16,8 +16,8 @@ display:
             items_per_page_options_all_label: '- Kaikki -'
             offset_label: Offset
           tags:
-            previous: ‹‹
-            next: ››
+            previous: '‹ Edellinen'
+            next: 'Seuraava ›'
       fields:
         path:
           label: Polku

diff --git a/conf/cmi/language/fi/views.view.taxonomy_term.yml b/conf/cmi/language/fi/views.view.taxonomy_term.yml
@@ -6,8 +6,8 @@ display:
       pager:
         options:
           tags:
-            next: ››
-            previous: ‹‹
+            next: 'Seuraava ›'
+            previous: '‹ Edellinen'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'

diff --git a/conf/cmi/language/fi/views.view.watchdog.yml b/conf/cmi/language/fi/views.view.watchdog.yml
@@ -26,8 +26,8 @@ display:
       pager:
         options:
           tags:
-            next: ››
-            previous: ‹‹
+            next: 'Seuraava ›'
+            previous: '‹ Edellinen'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'

diff --git a/conf/cmi/language/fi/webform.webform.contact.yml b/conf/cmi/language/fi/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/fr/webform.webform.contact.yml b/conf/cmi/language/fr/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/ru/webform.webform.contact.yml b/conf/cmi/language/ru/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/sv/webform.webform.contact.yml b/conf/cmi/language/sv/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/language/tr/core.date_format.fallback.yml b/conf/cmi/language/tr/core.date_format.fallback.yml
@@ -0,0 +1 @@
+label: 'Fallback date format'
diff --git a/conf/cmi/language/tr/core.date_format.html_yearless_date.yml b/conf/cmi/language/tr/core.date_format.html_yearless_date.yml
@@ -1 +1 @@
-label: 'HTML Yearless date'
+label: 'HTML Yılsız tarih'
diff --git a/conf/cmi/language/tr/webform.webform.contact.yml b/conf/cmi/language/tr/webform.webform.contact.yml
@@ -0,0 +1 @@
+title: Contact
diff --git a/conf/cmi/rest.resource.helfi_debug_data.yml b/conf/cmi/rest.resource.helfi_debug_data.yml
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -48,3 +48,32 @@
 foreach ($additionalEnvVars as $var) {
   $preflight_checks['environmentVariables'][] = $var;
 }
+
+/**
+ * The UI for environment indicator is broken, so we have to do this instead.
+ * See more info, https://www.drupal.org/project/environment_indicator/issues/2224983
+ */
+if (isset($_SERVER['HTTP_HOST'])) {
+  switch ($_SERVER['HTTP_HOST']) {
+    case 'edit.infofinland.fi':
+      $config['environment_indicator.indicator']['bg_color'] = '#ffffff';
+      $config['environment_indicator.indicator']['fg_color'] = '#000000';
+      $config['environment_indicator.indicator']['name'] = 'Production';
+      break;
+    case 'edit-infofinland.stage.hel.ninja':
+      $config['environment_indicator.indicator']['bg_color'] = '#3584e4';
+      $config['environment_indicator.indicator']['fg_color'] = '#000000';
+      $config['environment_indicator.indicator']['name'] = 'Stage';
+      break;
+    case 'edit-infofinland.test.hel.ninja':
+      $config['environment_indicator.indicator']['bg_color'] = '#ed333b';
+      $config['environment_indicator.indicator']['fg_color'] = '#000000';
+      $config['environment_indicator.indicator']['name'] = 'Test';
+      break;
+    case 'edit-infofinland.dev.hel.ninja':
+      $config['environment_indicator.indicator']['bg_color'] = '#33d17a';
+      $config['environment_indicator.indicator']['fg_color'] = '#000000';
+      $config['environment_indicator.indicator']['name'] = 'Development';
+      break;
+  }
+}
diff --git a/public/sites/default/env.indicator.settings.php b/public/sites/default/env.indicator.settings.php
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -383,8 +383,3 @@ function drupal_get_env(string|array $variables) : mixed {
   $settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock');
 }
 
-// Environment indicator hack, see the file for more info
-$env_indicator_settings = dirname(__FILE__) . '/env.indicator.settings.php';
-if (file_exists($env_indicator_settings)) {
-  require_once $env_indicator_settings;
-}
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -1,9 +1,9 @@
 ifeq ($(DRUPAL_CONF_EXISTS),yes)
-	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli
 else
-	DRUPAL_NEW_TARGETS := up build drush-si drush-locale-update drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli
 endif
-DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-uli
+DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 
@@ -43,6 +43,4 @@ drush-locale-update: ## Update translations.
 
 PHONY += drush-helfi-locale-import
 drush-helfi-locale-import:  ## Update translations from helfi platform config.
-	$(call step,Import helfi platform config translations...)
-	$(call drush,helfi:locale-import helfi_platform_config)
-	$(call drush,cr)
+	# no-op
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		tests/dtt/src/ExistingSite/ModuleEnabledTest.php&#10
		tools/make/project/install.mk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		disable_email_sending: true
		user_expire: false
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		label: 'HTML Yearless date'
		label: 'HTML Yılsız tarih'