Commit 043c7315 authored by KingRainbow44's avatar KingRainbow44
Browse files

Fix for translation errors

parent f3410092
...@@ -93,7 +93,7 @@ public final class Grasscutter { ...@@ -93,7 +93,7 @@ public final class Grasscutter {
ResourceLoader.loadAll(); ResourceLoader.loadAll();
ScriptLoader.init(); ScriptLoader.init();
// Database // Initialize database.
DatabaseManager.initialize(); DatabaseManager.initialize();
// Create server instances. // Create server instances.
......
...@@ -334,7 +334,7 @@ public final class DispatchServer { ...@@ -334,7 +334,7 @@ public final class DispatchServer {
return; return;
} }
LoginResultJson responseData = new LoginResultJson(); LoginResultJson responseData = new LoginResultJson();
Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt")); Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt", req.ip()));
// Login // Login
Account account = DatabaseHelper.getAccountById(requestData.uid); Account account = DatabaseHelper.getAccountById(requestData.uid);
......
...@@ -29,7 +29,13 @@ public final class Language { ...@@ -29,7 +29,13 @@ public final class Language {
* @return A translated value with arguments substituted. * @return A translated value with arguments substituted.
*/ */
public static String translate(String key, Object... args) { public static String translate(String key, Object... args) {
return Grasscutter.getLanguage().get(key).formatted(args); String translated = Grasscutter.getLanguage().get(key);
try {
return translated.formatted(args);
} catch (Exception exception) {
Grasscutter.getLogger().error("Failed to format string: " + key, exception);
return translated;
}
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment