From 1d7a34950dc06eeb9aff9e1666d17f5039636e0a Mon Sep 17 00:00:00 2001
From: Stefan Vukovic <stefanvukovic44@gmail.com>
Date: Thu, 15 Feb 2024 08:27:43 +0100
Subject: [PATCH] more merge

---
 ext/js/language/translator.js | 2 +-
 test/options-util.test.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js
index 41f49bc0f4..afba4e1386 100644
--- a/ext/js/language/translator.js
+++ b/ext/js/language/translator.js
@@ -1322,7 +1322,7 @@ export class Translator {
      * @returns {Generator<Map<string, unknown>, void, void>}
      */
     *_generateArrayVariants(arrayVariants) {
-        const variantKeys = Array.from(arrayVariants.keys());
+        const variantKeys = [...arrayVariants.keys()];
         const entryVariantLengths = [];
         for (const key of variantKeys) {
             const entryVariants = /** @type {unknown[]} */ (arrayVariants.get(key));
diff --git a/test/options-util.test.js b/test/options-util.test.js
index b8c77474c6..e40f2cdf40 100644
--- a/test/options-util.test.js
+++ b/test/options-util.test.js
@@ -599,7 +599,7 @@ function createOptionsUpdatedTestData1() {
             }
         ],
         profileCurrent: 0,
-        version: 25,
+        version: 26,
         global: {
             database: {
                 prefixWildcardsSupported: false