From ed8ef4806847b914239944cdf4d1a14f29ff9dab Mon Sep 17 00:00:00 2001
From: Lugiad <2070109+Adri1@users.noreply.github.com>
Date: Mon, 17 Feb 2025 19:17:04 +0100
Subject: [PATCH 1/2] [Localization] Move Touch controls Localization (#5349)

* Update move-touch-controls-handler.ts localization

* Update move-touch-controls-handler.ts
---
 .../settings/move-touch-controls-handler.ts   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts
index 6128f5954e8..da7ac7f0514 100644
--- a/src/ui/settings/move-touch-controls-handler.ts
+++ b/src/ui/settings/move-touch-controls-handler.ts
@@ -1,6 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import type TouchControl from "#app/touch-controls";
 import type UI from "#app/ui/ui";
+import i18next from "i18next";
 
 export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape";
 export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait";
@@ -71,7 +72,7 @@ export default class MoveTouchControlsHandler {
     if (this.inConfigurationMode) {
       const orientation = document.querySelector("#touchControls #orientation");
       if (orientation) {
-        orientation.textContent = this.isLandscapeMode ? "Landscape" : "Portrait";
+        orientation.textContent = this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait");
       }
     }
     const positions = this.getSavedPositionsOfCurrentOrientation() ?? [];
@@ -90,19 +91,22 @@ export default class MoveTouchControlsHandler {
     const toolbar = document.createElement("div");
     toolbar.id = "configToolbar";
     toolbar.innerHTML = `
-      <div class="column">
-        <div class="button-row">
-          <div id="resetButton" class="button">Reset</div>
-          <div id="saveButton" class="button">Save & close</div>
-          <div id="cancelButton" class="button">Cancel</div>
-        </div>
-        <div class="info-row">
-          <div class="orientation-label"> 
-            Orientation: <span id="orientation">${this.isLandscapeMode ? "Landscape" : "Portrait"}</span>
-          </div>
+    <div class="column">
+      <div class="button-row">
+        <div id="resetButton" class="button">${i18next.t("settings:reset")}</div>
+        <div id="saveButton" class="button">${i18next.t("settings:saveClose")}</div>
+        <div id="cancelButton" class="button">${i18next.t("settings:cancel")}</div>
+      </div>
+      <div class="info-row">
+        <div class="orientation-label"> 
+          ${i18next.t("settings:orientation")}
+          <span id="orientation">
+            ${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")}
+          </span>
         </div>
       </div>
-    `;
+    </div>
+  `;
     return toolbar;
   }
 

From af91ea85c37d4217e315bb39b3f37179ad4623f3 Mon Sep 17 00:00:00 2001
From: Jimmybald1 <122436263+Jimmybald1@users.noreply.github.com>
Date: Mon, 17 Feb 2025 19:22:12 +0100
Subject: [PATCH 2/2] [Bug] Changes Daily Run item stack full message to a
 delay (#5339)

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
---
 src/battle-scene.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index c7e3d4bc928..e6649d0999a 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2605,7 +2605,7 @@ export default class BattleScene extends SceneBase {
           }
         } else if (!virtual) {
           const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
-          this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, true);
+          this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, false, 3000);
           return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success));
         }