From c19c9ebc552c09aef92b451f78927efce544935b Mon Sep 17 00:00:00 2001
From: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Fri, 5 Apr 2024 01:55:00 +0200
Subject: [PATCH] Fixed format string

---
 source/funkin/backend/assets/Paths.hx         |  2 +-
 .../funkin/backend/utils/TranslationsUtil.hx  | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/source/funkin/backend/assets/Paths.hx b/source/funkin/backend/assets/Paths.hx
index 3a6bffce..e8405dc0 100644
--- a/source/funkin/backend/assets/Paths.hx
+++ b/source/funkin/backend/assets/Paths.hx
@@ -40,7 +40,7 @@ class Paths
 		return getPath('translations/$key');
 
 	public static inline function translations(key:String)
-		return translationsMain('${TranslationsUtil.get_curLanguage()}/$key');
+		return translationsMain('${TranslationsUtil.curLanguage}/$key');
 
 	public static inline function video(key:String, ?ext:String = "mp4")
 		return getPath('videos/$key.$ext');
diff --git a/source/funkin/backend/utils/TranslationsUtil.hx b/source/funkin/backend/utils/TranslationsUtil.hx
index 4d4f01db..184d7248 100644
--- a/source/funkin/backend/utils/TranslationsUtil.hx
+++ b/source/funkin/backend/utils/TranslationsUtil.hx
@@ -27,8 +27,13 @@ class TranslationsUtil
 	/**
 	 * Returns the current language.
 	 */
-	inline public static function get_curLanguage():String
+	public static var curLanguage(get, set):String;
+	@:noCompletion private static function get_curLanguage():String {
 		return Options.language;
+	}
+	@:noCompletion private static function set_curLanguage(value:String):String {
+		return Options.language = value;
+	}
 
 	/**
 	 * Returns if the current language is the default one (`DEFAULT_LANGUAGE`).
@@ -48,7 +53,7 @@ class TranslationsUtil
 	 * If `name` is `null`, it's gonna use the current language.
 	 */
 	public static function setTransl(?name:String)
-		transMap = loadLanguage(name == null ? get_curLanguage() : name);
+		transMap = loadLanguage(name == null ? curLanguage : name);
 
 	/**
 	 * This is for checking a translation, `defString` it's just the string that gets returned just in case it won't find the translation OR the current language selected is ``DEFAULT_LANGUAGE``.
@@ -155,12 +160,14 @@ class FormatInfo {
 		}
 	}
 
-	public function format(values:Array<Dynamic>) {
-		// todo
-		var string:Array<Dynamic> = strings.copy();
-		for(i => v in strings) {
-			string.insert(i*2+1, Std.string(values[indexes[i]]));
+	public function format(values:Array<Dynamic>):String {
+		var str:String = "";
+		for(i=>s in strings) {
+			str += s;
+			if(i < strings.length-1)
+				str += values[indexes[i]];
 		}
-		return string.join("");
+
+		return str;
 	}
 }
\ No newline at end of file