Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-25 17:22:55 +08:00
Code Issues Projects Releases Wiki Activity

Fix for translation errors

Browse Source
This commit is contained in:
KingRainbow44 2022-05-06 21:52:10 -04:00
parent f34100924e
commit 043c731575
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/Grasscutter.java
View File

@ -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.

2
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View File

@ -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);

8
src/main/java/emu/grasscutter/utils/Language.java
View File

@ -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;
}
} }
/** /**