gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

applying formats and parameters

Browse Source 
also due to a merge conflict apparently the deathCounter++ was never merged from my original old pr😭
This commit is contained in:
⍚~Nex
2024-04-05 18:00:38 +02:00
parent f947d37868
commit 832edd27fc
6 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/FunkinText.hx
+2 -2
View File
@@ -4,8 +4,8 @@ import flixel.util.FlxColor;
import flixel.text.FlxText;
class FunkinText extends FlxText {
public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true, ?TranslationID:String) {
super(X, Y, FieldWidth, TranslationsUtil.checkTransl(Text, TranslationID), Size);
public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true, ?TranslationID:String, ?TranslParameters:Array<Dynamic>) {
super(X, Y, FieldWidth, TranslationsUtil.getTransl(Text, TranslationID, TranslParameters), Size);
setFormat(Paths.font("vcr.ttf"), Size, FlxColor.WHITE);
if (Border) {
borderStyle = OUTLINE;
source/funkin/backend/utils/TranslationsUtil.hx
+10 -9
View File
@@ -17,7 +17,7 @@ class TranslationsUtil
*
* Using this class function it'll never be `null`.
*/
public static var transMap(default, null):Map<String, String> = [];
public static var transMap(default, null):Map<String, FormatInfo> = [];
/**
* The default language used inside of the source code.
@@ -56,17 +56,18 @@ class TranslationsUtil
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``.
* This is for checking and getting 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``.
*
* If `id` is `null` then it's gonna search using `defString`.
*/
public static function checkTransl(defString:String, ?id:String):String
public static function getTransl(defString:String, ?id:String, ?parms:Array<Dynamic>):String
{
if(parms == null) parms = [];
#if TRANSLATIONS_SUPPORT
if(id == null) id = defString;
if(transMap.exists(id)) return transMap.get(id);
if(transMap.exists(id)) return transMap.get(id).format(parms);
#end
return defString;
return new FormatInfo(defString).format(parms);
}
/**
@@ -86,7 +87,7 @@ class TranslationsUtil
/**
* Returns a map of translations based on its XML.
*/
public static function loadLanguage(name:String):Map<String, String>
public static function loadLanguage(name:String):Map<String, FormatInfo>
{
#if TRANSLATIONS_SUPPORT
var path:String = Paths.translationsMain(name);
@@ -106,7 +107,7 @@ class TranslationsUtil
return [];
}
var leMap:Map<String, String> = [];
var leMap:Map<String, FormatInfo> = [];
for(node in xml.node.translations.elements) {
switch(node.name) {
case "trans":
@@ -118,7 +119,7 @@ class TranslationsUtil
FlxG.log.warn("A translation node requires a string attribute.");
continue;
}
leMap.set(node.att.id, node.att.string);
leMap.set(node.att.id, new FormatInfo(node.att.string));
}
}
return leMap;
@@ -164,7 +165,7 @@ class FormatInfo {
var str:String = "";
for(i=>s in strings) {
str += s;
if(i < strings.length-1)
if(i < indexes.length)
str += values[indexes[i]];
}