Fixed wrong English localization translations. Mentioned in #569.

This commit is contained in:
huanghongxun 2019-05-31 10:20:11 +08:00
parent a141c6b137
commit c12d76e2fa
2 changed files with 8 additions and 15 deletions

View File

@ -47,16 +47,11 @@ public final class Locales {
public static final SupportedLocale ZH_CN = new SupportedLocale(Locale.SIMPLIFIED_CHINESE);
/**
* Vietnamese
* Spanish
*/
public static final SupportedLocale VI = new SupportedLocale(new Locale("vi"));
public static final SupportedLocale ES = new SupportedLocale(new Locale("es"));
/**
* Russian
*/
public static final SupportedLocale RU = new SupportedLocale(new Locale("ru"));
public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH);
public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH, ES);
public static SupportedLocale getLocaleByName(String name) {
if (name == null) return DEFAULT;
@ -64,8 +59,7 @@ public final class Locales {
case "en": return EN;
case "zh": return ZH;
case "zh_cn": return ZH_CN;
case "vi": return VI;
case "ru": return RU;
case "es": return ES;
default: return DEFAULT;
}
}
@ -74,8 +68,7 @@ public final class Locales {
if (locale == EN) return "en";
else if (locale == ZH) return "zh";
else if (locale == ZH_CN) return "zh_CN";
else if (locale == VI) return "vi";
else if (locale == RU) return "ru";
else if (locale == ES) return "es";
else if (locale == DEFAULT) return "def";
else throw new IllegalArgumentException("Unknown locale: " + locale);
}

View File

@ -189,7 +189,7 @@ launcher.cache_directory=Download Cache Directory
launcher.cache_directory.choose=Choose download cache directory
launcher.cache_directory.default=Default
launcher.cache_directory.disabled=Disabled
launcher.cache_directory.invalid=Invalid cache directory. Restore default settings.
launcher.cache_directory.invalid=Invalid cache directory. Restoring default settings.
launcher.contact=Contact Us
launcher.crash=Hello Minecraft! Launcher has crashed!
launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Update it!
@ -242,7 +242,7 @@ modpack.task.install=Import Modpack
modpack.task.install.error=This modpack file cannot be recognized. Only Curse, MultiMC modpacks are supported.
modpack.task.install.will=Install the modpack:
modpack.type.curse=Curse
modpack.type.curse.completion=Install relative files to Curse modpack
modpack.type.curse.completion=Install files related to Curse modpack
modpack.type.curse.tolerable_error=But we cannot complete downloading all files of this Curse modpack. You can retry downloading when launching corresponding game version. You may retry for a couple of times due to network problems.
modpack.type.curse.error=Unable to complete this Curse modpack. Please retry.
modpack.type.curse.not_found=Some of required resources are deleted and cannot be downloaded. Please consider the latest version or other modpacks.
@ -379,7 +379,7 @@ settings.physical_memory=Physical Memory Size
settings.show_log=Show Logs
settings.tabs.installers=Installers
settings.type=Version setting type
settings.type.global=Global global settings(all shared)
settings.type.global=Global game settings (all settings shared among games)
settings.type.global.manage=Global Game Settings
settings.type.global.edit=Configure global game settings
settings.type.special.enable=Enable specialized settings for this game