UHF-9300: Merge branch 'main' of https://github.com/City-of-Helsinki/…

…drupal-hdbt into UHF-9300
City-of-Helsinki · Jul 15, 2024 · 35fa7aa · 35fa7aa
2 parents d6133f5 + 8f0b3c7
commit 35fa7aa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/backstop/onBefore.js b/backstop/onBefore.js
@@ -1,8 +1,5 @@
 module.exports = async (page, scenario, vp, isReference, browserContext, config) => {
   await page.emulateMedia({ reducedMotion: 'reduce' });
-  // Wait until all assets have been loaded. Image style generation
-  // can sometimes take a long time, causing random failures.
-  // await page.waitForLoadState('networkidle');
 
   const { hostname } = config;
 

diff --git a/dist/js/hyphenopoly/patterns/en-us.wasm b/dist/js/hyphenopoly/patterns/en-us.wasm
diff --git a/dist/js/hyphenopoly_settings.min.js b/dist/js/hyphenopoly_settings.min.js
diff --git a/src/js/hyphenopoly_settings.js b/src/js/hyphenopoly_settings.js
@@ -8,14 +8,17 @@ document.addEventListener('DOMContentLoaded', function enableHyphenopoly() {
   // eslint-disable-next-line no-undef
   Hyphenopoly.config({
     require: {
-      'fi': 'yhdyssanahirviö',
+      'fi': 'arvopaperimarkkinalainsäädäntö',
       'sv': 'informationssäkerhetskampanj',
       'en': 'supercalifragilisticexpialidocious'
     },
+    fallbacks: {
+      'en': 'en-us'
+    },
     setup: {
       selectors: {
         '.hyphenate': {}
-      }
+      },
     },
     handleEvent: {
       error (e) {

diff --git a/webpack.config.js b/webpack.config.js
@@ -179,7 +179,7 @@ module.exports = (env, argv) => {
             'to': path.resolve(__dirname, 'dist') + '/js/hyphenopoly/',
             'force': true,
           }, {
-            'from': 'node_modules/hyphenopoly/min/patterns/{fi,sv}.wasm',
+            'from': 'node_modules/hyphenopoly/min/patterns/{fi,sv,en-us}.wasm',
             'to': path.resolve(__dirname, 'dist', 'js/hyphenopoly/patterns', '[name][ext]'),
             'force': true,
           }