shkong/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-05-12 06:56:02 +08:00
Code Issues Projects Releases Wiki Activity

fixed language not found prompt

Browse Source
This commit is contained in:
Secretboy-SMR 2022-05-11 15:27:05 +08:00 committed by Melledy
parent 8ad6bda3b2
commit 04f6e73447
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
View File

@ -44,6 +44,13 @@ public final class LanguageCommand implements CommandHandler {
actualLangCode = languageInst.getLanguageCode(); actualLangCode = languageInst.getLanguageCode();
Grasscutter.setLanguage(languageInst); Grasscutter.setLanguage(languageInst);
} }
if (!langCode.equals(actualLangCode)) {
// I think there is no necessary to register this in language files
// since this will always be english
CommandHandler.sendMessage(sender, "currently, server does not have that language: " + langCode);
}
CommandHandler.sendMessage(sender, translate(sender, "commands.language.language_changed", actualLangCode)); CommandHandler.sendMessage(sender, translate(sender, "commands.language.language_changed", actualLangCode));
} }

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

@ -125,23 +125,23 @@ public final class Language {
InputStream file = Grasscutter.class.getResourceAsStream("/languages/" + fileName); InputStream file = Grasscutter.class.getResourceAsStream("/languages/" + fileName);
if (file == null) { // Provided fallback language. if (file == null) { // Provided fallback language.
Grasscutter.getLogger().warn("Failed to load language file: " + fileName + ", falling back to: " + fallback);
actualLanguageCode = fallbackLanguageCode; actualLanguageCode = fallbackLanguageCode;
if (cachedLanguages.containsKey(actualLanguageCode)) { if (cachedLanguages.containsKey(actualLanguageCode)) {
return new LanguageStreamDescription(actualLanguageCode, null); return new LanguageStreamDescription(actualLanguageCode, null);
} }
file = Grasscutter.class.getResourceAsStream("/languages/" + fallback); file = Grasscutter.class.getResourceAsStream("/languages/" + fallback);
Grasscutter.getLogger().warn("Failed to load language file: " + fileName + ", falling back to: " + fallback);
} }
if(file == null) { // Fallback the fallback language. if(file == null) { // Fallback the fallback language.
Grasscutter.getLogger().warn("Failed to load language file: " + fallback + ", falling back to: en-US.json");
actualLanguageCode = "en-US"; actualLanguageCode = "en-US";
if (cachedLanguages.containsKey(actualLanguageCode)) { if (cachedLanguages.containsKey(actualLanguageCode)) {
return new LanguageStreamDescription(actualLanguageCode, null); return new LanguageStreamDescription(actualLanguageCode, null);
} }
file = Grasscutter.class.getResourceAsStream("/languages/en-US.json"); file = Grasscutter.class.getResourceAsStream("/languages/en-US.json");
Grasscutter.getLogger().warn("Failed to load language file: " + fallback + ", falling back to: en-US.json");
} }
if(file == null) if(file == null)