maybe fix?

JoaTH-Team · Nov 27, 2024 · a30b399 · a30b399
1 parent 0d97bc2
commit a30b399
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/source/backend/Localization.hx b/source/backend/Localization.hx
@@ -90,14 +90,16 @@ class Localization {
 		return path;
 	}
 
-	public static function loadCustomFont(language:String):String {
-		var path:String = Paths.file('languages/fonts/' + language + '.ttf');
+	private static function loadCustomFont(language:String):String {
+		var target:String = language != null ? language : currentLanguage;
+		var path:String = Paths.file('languages/fonts/' + target + '.ttf');
 		if (Paths.exists(path)) {
 			trace('custom font loaded for $language: $path');
 			return customFontPath = path;
 		}
 
-		return null;
+		trace('no custom font for $language');
+		return Paths.font('vcr');
 	}
 
 	public static function getCustomFont():String {

diff --git a/source/backend/Paths.hx b/source/backend/Paths.hx
@@ -166,7 +166,7 @@ class Paths {
 		return file('songs/$key/chart.json');
 
 	inline static public function font(key:String) {
-		var path:String =  file('fonts/$key');
+		var path:String = file('fonts/$key');
 
 		if (path.extension() == '') {
 			if (exists(path.withExtension("ttf")))

diff --git a/source/options/LanguageState.hx b/source/options/LanguageState.hx
@@ -6,6 +6,7 @@ class LanguageState extends ExtendableState {
 	var langStrings:Array<Locale> = [];
 	var group:FlxTypedGroup<FlxText>;
 	var curSelected:Int = 0;
+
 	var camFollow:FlxObject;
 
 	override function create() {
@@ -80,7 +81,6 @@ class LanguageState extends ExtendableState {
 		if (Input.justPressed('accept')) {
 			SaveData.settings.lang = langStrings[curSelected].code;
 			Localization.switchLanguage(SaveData.settings.lang);
-			Localization.loadCustomFont(SaveData.settings.lang);
 			SaveData.saveSettings();
 			ExtendableState.switchState(new OptionsState());
 			FlxG.sound.play(Paths.sound("select"));