From f403d40d58e944883d96dc27199d43255c73a6f5 Mon Sep 17 00:00:00 2001
From: DanGonite57 <danzinc57@gmail.com>
Date: Sat, 1 Jan 2022 15:07:56 +0000
Subject: [PATCH] Allow British English to replace words in weakspot funbox
 (#2227)

* Use British English as last word assignment

* Removed superfluous null checks
---
 src/js/test/test-logic.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 7f6456466..ae3a3acff 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -878,11 +878,6 @@ export async function init() {
           randomWord = wordset.randomWord();
         }
 
-        if (Config.britishEnglish && /english/.test(Config.language)) {
-          let britishWord = await BritishEnglish.replace(randomWord);
-          if (britishWord) randomWord = britishWord;
-        }
-
         if (Config.lazyMode === true && !language.noLazyMode) {
           randomWord = LazyMode.replaceAccents(randomWord, language.accents);
         }
@@ -949,6 +944,10 @@ export async function init() {
           }
         }
 
+        if (Config.britishEnglish && /english/.test(Config.language)) {
+          randomWord = await BritishEnglish.replace(randomWord);
+        }
+
         if (/\t/g.test(randomWord)) {
           setHasTab(true);
         }
@@ -1070,8 +1069,7 @@ export async function init() {
         Config.britishEnglish &&
         Config.language.replace(/_\d*k$/g, "") === "english"
       ) {
-        let britishWord = await BritishEnglish.replace(w[i]);
-        if (britishWord) w[i] = britishWord;
+        w[i] = await BritishEnglish.replace(w[i]);
       }
 
       if (Config.lazyMode === true && !language.noLazyMode) {
@@ -1235,14 +1233,6 @@ export async function addWord() {
     randomWord = wordset.randomWord();
   }
 
-  if (
-    Config.britishEnglish &&
-    Config.language.replace(/_\d*k$/g, "") === "english"
-  ) {
-    let britishWord = await BritishEnglish.replace(randomWord);
-    if (britishWord) randomWord = britishWord;
-  }
-
   if (Config.lazyMode === true && !language.noLazyMode) {
     randomWord = LazyMode.replaceAccents(randomWord, language.accents);
   }
@@ -1278,6 +1268,13 @@ export async function addWord() {
     }
   }
 
+  if (
+    Config.britishEnglish &&
+    Config.language.replace(/_\d*k$/g, "") === "english"
+  ) {
+    randomWord = await BritishEnglish.replace(randomWord);
+  }
+
   let split = randomWord.split(" ");
   if (split.length > 1) {
     split.forEach((word) => {