From 74c62e5a13aa7d2f5505be7d8212501d9659ab03 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 15 May 2020 20:00:27 -0300 Subject: [PATCH] simplified translations keys --- src/main/java/carpet/settings/ParsedRule.java | 6 +- .../java/carpet/settings/SettingsManager.java | 39 ++++----- src/main/java/carpet/utils/Translations.java | 1 + .../resources/assets/carpet/lang/en_us.json | 72 +++++++++-------- .../resources/assets/carpet/lang/zh_cn.json | 80 +++++++++---------- 5 files changed, 102 insertions(+), 96 deletions(-) diff --git a/src/main/java/carpet/settings/ParsedRule.java b/src/main/java/carpet/settings/ParsedRule.java index 652ae454..e2acdd25 100644 --- a/src/main/java/carpet/settings/ParsedRule.java +++ b/src/main/java/carpet/settings/ParsedRule.java @@ -231,7 +231,7 @@ public final class ParsedRule implements Comparable { private String translationKey() { - return String.format("carpet.rule.%s.name", name); + return String.format("rule.%s.name", name); } public String translatedName(){ @@ -241,13 +241,13 @@ public final class ParsedRule implements Comparable { public String translatedDescription() { - return tr(String.format("carpet.rule.%s.desc", (name)), description); + return tr(String.format("rule.%s.desc", (name)), description); } public List translatedExtras() { if (!Translations.hasTranslations()) return extraInfo; - String keyBase = String.format("carpet.rule.%s.extra.", name); + String keyBase = String.format("rule.%s.extra.", name); List extras = new ArrayList<>(); int i = 0; while (Translations.hasTranslation(keyBase+i)) diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index cb5eede2..3b27d3c2 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -352,7 +352,7 @@ public class SettingsManager String ruleName = StringArgumentType.getString(ctx, "rule"); ParsedRule rule = getRule(ruleName); if (rule == null) - throw new SimpleCommandExceptionType(Messenger.c("rb "+ tr("carpet.ui.statement.unknown_rule","Unknown rule")+": "+ruleName)).create(); + throw new SimpleCommandExceptionType(Messenger.c("rb "+ tr("ui.unknown_rule","Unknown rule")+": "+ruleName)).create(); return rule; } @@ -370,16 +370,16 @@ public class SettingsManager literalargumentbuilder.executes((context)-> listAllSettings(context.getSource())). then(literal("list"). - executes( (c) -> listSettings(c.getSource(), String.format(tr("carpet.ui.statement.all_%s_settings","All %s Settings"), fancyName), + executes( (c) -> listSettings(c.getSource(), String.format(tr("ui.all_%(mod)s_settings","All %s Settings"), fancyName), getRules())). then(literal("defaults"). executes( (c)-> listSettings(c.getSource(), - String.format(tr("carpet.ui.statement.current_%s_startup_settings_from_%s","Current %s Startup Settings from %s"), fancyName, (identifier+".conf")), + String.format(tr("ui.current_%(mod)s_startup_settings_from_%(conf)s","Current %s Startup Settings from %s"), fancyName, (identifier+".conf")), findStartupOverrides()))). then(argument("tag",StringArgumentType.word()). suggests( (c, b)->suggestMatching(getCategories(), b)). executes( (c) -> listSettings(c.getSource(), - String.format(tr("carpet.ui.statement.%s_settings_matching_'%s'","%s Settings matching \"%s\""), fancyName, tr("carpet.ui.category." + StringArgumentType.getString(c, "tag"),StringArgumentType.getString(c, "tag"))), + String.format(tr("ui.%(mod)s_settings_matching_'%(query)s'","%s Settings matching \"%s\""), fancyName, tr("category." + StringArgumentType.getString(c, "tag"),StringArgumentType.getString(c, "tag"))), getRulesMatching(StringArgumentType.getString(c, "tag")))))). then(literal("removeDefault"). requires(s -> !locked). @@ -414,7 +414,7 @@ public class SettingsManager } catch (CommandSyntaxException e) { - Messenger.m(source, "w "+ displayName +" "+ tr( "carpet.ui.statement.is_set_to","is set to")+": ","wb "+rule.getAsString()); + Messenger.m(source, "w "+ displayName +" "+ tr( "ui.is_set_to","is set to")+": ","wb "+rule.getAsString()); return 1; } @@ -425,17 +425,17 @@ public class SettingsManager rule.translatedExtras().forEach(s -> Messenger.m(player, "g "+s)); List tags = new ArrayList<>(); - tags.add(Messenger.c("w "+ tr("carpet.ui.statement.tags", "Tags")+": ")); + tags.add(Messenger.c("w "+ tr("ui.tags", "Tags")+": ")); for (String t: rule.categories) { - String translated = tr("carpet.ui.category." + t, t); + String translated = tr("category." + t, t); tags.add(Messenger.c("c ["+ translated +"]", "^g "+ String.format(tr("list_all_%s_settings","list all %s settings"), translated),"!/"+identifier+" list "+t)); tags.add(Messenger.c("w , ")); } tags.remove(tags.size()-1); Messenger.m(player, tags.toArray(new Object[0])); - Messenger.m(player, "w "+ tr("carpet.ui.statement.current_value", "Current value")+": ",String.format("%s %s (%s value)",rule.getBoolValue()?"lb":"nb", rule.getAsString(),rule.isDefault()?"default":"modified")); + Messenger.m(player, "w "+ tr("ui.current_value", "Current value")+": ",String.format("%s %s (%s value)",rule.getBoolValue()?"lb":"nb", rule.getAsString(),rule.isDefault()?"default":"modified")); List options = new ArrayList<>(); options.add(Messenger.c("w Options: ", "y [ ")); for (String o: rule.options) @@ -453,8 +453,8 @@ public class SettingsManager private int setRule(ServerCommandSource source, ParsedRule rule, String newValue) { if (rule.set(source, newValue) != null) - Messenger.m(source, "w "+rule.toString()+", ", "c ["+ tr("carpet.ui.statement.change_permanently","change permanently")+"?]", - "^w "+String.format(tr("carpet.ui.statement.click_to_keep_the_settings_in_%s_to_save_across_restarts","Click to keep the settings in %s to save across restarts"), identifier+".conf"), + Messenger.m(source, "w "+rule.toString()+", ", "c ["+ tr("ui.change_permanently","change permanently")+"?]", + "^w "+String.format(tr("ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts","Click to keep the settings in %s to save across restarts"), identifier+".conf"), "?/"+identifier+" setDefault "+rule.name+" "+rule.getAsString()); return 1; } @@ -469,7 +469,7 @@ public class SettingsManager writeSettingsToConf(conf.getLeft()); // this may feels weird, but if conf // is locked, it will never reach this point. rule.set(source,stringValue); - Messenger.m(source ,"gi "+String.format(tr("carpet.ui.statement.rule_%s_will_now_default_to_%s","rule %s will now default to %s"), rule.translatedName(), stringValue)); + Messenger.m(source ,"gi "+String.format(tr("ui.rule_%(rule)s_will_now_default_to_%(value)s","rule %s will now default to %s"), rule.translatedName(), stringValue)); return 1; } // removes overrides of the default values in the file @@ -516,10 +516,10 @@ public class SettingsManager } String baseText = style + (brackets ? " [" : " ") + option + (brackets ? "]" : ""); if (locked) - return Messenger.c(baseText, "^g "+fancyName+" " + tr("carpet.ui.statement.settings_are_locked","settings are locked")); + return Messenger.c(baseText, "^g "+fancyName+" " + tr("ui.settings_are_locked","settings are locked")); if (option.equalsIgnoreCase(rule.getAsString())) return Messenger.c(baseText); - return Messenger.c(baseText, "^g "+ tr("carpet.ui.statement.switch_to","Switch to") +" " + option+(option.equalsIgnoreCase(rule.defaultAsString)?" (default)":""), "?/"+identifier+" " + rule.name + " " + option); + return Messenger.c(baseText, "^g "+ tr("ui.switch_to","Switch to") +" " + option+(option.equalsIgnoreCase(rule.defaultAsString)?" (default)":""), "?/"+identifier+" " + rule.name + " " + option); } private int listSettings(ServerCommandSource source, String title, Collection> settings_list) @@ -541,24 +541,25 @@ public class SettingsManager private int listAllSettings(ServerCommandSource source) { //listSettings(source, "Current "+fancyName+" Settings", getNonDefault()); - listSettings(source, String.format(tr("carpet.ui.statement.current_%s_settings","Current %s Settings"), fancyName), getNonDefault()); + listSettings(source, String.format(tr("ui.current_%(mod)s_settings","Current %s Settings"), fancyName), getNonDefault()); if (version != null) //Messenger.m(source, "g "+fancyName+" version: "+ version); - Messenger.m(source, "g "+fancyName+" "+ tr("carpet.ui.statement.version", "version") + ": "+ version); + Messenger.m(source, "g "+fancyName+" "+ tr("ui.version", "version") + ": "+ version); try { PlayerEntity player = source.getPlayer(); List tags = new ArrayList<>(); //tags.add("w Browse Categories:\n"); - tags.add("w " + tr("carpet.ui.statement.browse_categories", "Browse Categories") + ":\n"); + tags.add("w " + tr("ui.browse_categories", "Browse Categories") + ":\n"); for (String t : getCategories()) { - String translated = tr("carpet.ui.category." + t, t); - String translatedPlus = Translations.hasTranslation("carpet.ui.category." + t) ? tr("carpet.ui.category." + t, t) + String.format(" (%s)", t) : t; + String catKey = "category." + t; + String translated = tr(catKey, t); + String translatedPlus = Translations.hasTranslation(catKey) ? String.format("%s (%s)",tr(catKey, t), t) : t; tags.add("c [" + translated +"]"); //tags.add("^g list all " + translated + " settings"); - tags.add("^g " + String.format(tr("carpet.ui.statement.list_all_%s_settings","list all %s settings"), translatedPlus)); + tags.add("^g " + String.format(tr("ui.list_all_%(cat)s_settings","list all %s settings"), translatedPlus)); tags.add("!/"+identifier+" list " + t); tags.add("w "); } diff --git a/src/main/java/carpet/utils/Translations.java b/src/main/java/carpet/utils/Translations.java index e8ffd8a6..081d656b 100644 --- a/src/main/java/carpet/utils/Translations.java +++ b/src/main/java/carpet/utils/Translations.java @@ -57,6 +57,7 @@ public class Translations Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create(); Type type = new TypeToken>() {}.getType(); translationMap = gson.fromJson(langJs, type); + translationMap.entrySet().removeIf(e -> e.getKey().startsWith("//")); } diff --git a/src/main/resources/assets/carpet/lang/en_us.json b/src/main/resources/assets/carpet/lang/en_us.json index ad516a4a..34331d5c 100644 --- a/src/main/resources/assets/carpet/lang/en_us.json +++ b/src/main/resources/assets/carpet/lang/en_us.json @@ -3,47 +3,51 @@ // But it could be a good example for writing the language file for other languages. { - "carpet.rule.portalSuffocationFix.name": "", - "// the key is genetated as:" : "String.format('carpet.rule.%s.name', rule.name)", + "// Rules:": "", + "rule.portalSuffocationFix.name": "", + "// the key is genetated as:" : "String.format('rule.%s.name', rule.name)", - "carpet.rule.portalSuffocationFix.desc": "", - "// the key is genetated as:" : "String.format('carpet.rule.%s.desc', rule.name)", + "rule.portalSuffocationFix.desc": "", + "// the key is genetated as:" : "String.format('rule.%s.desc', rule.name)", - "carpet.rule.portalSuffocationFix.extra.0": "", - "carpet.rule.portalSuffocationFix.extra.1": "", - "// the key is genetated as:" : "String.format('carpet.rule.%s.extra.%i', rule.name, index)", + "rule.portalSuffocationFix.extra.0": "", + "rule.portalSuffocationFix.extra.1": "", + "// the key is genetated as:" : "String.format('rule.%s.extra.%i', rule.name, index)", - "carpet.ui.category.bugfix": "bugfix", - "carpet.ui.category.survival": "survival", - "carpet.ui.category.creative": "creative", - "carpet.ui.category.experimental": "experimental", - "carpet.ui.category.optimization": "optimization", - "carpet.ui.category.feature": "feature", - "carpet.ui.category.command": "command", - "carpet.ui.category.tnt": "TNT", - "carpet.ui.category.dispenser": "dispenser", - "carpet.ui.category.scarpet": "scarpet", - "carpet.ui.category.client": "client", + "// Categories:": "", + "category.bugfix": "bugfix", + "category.survival": "survival", + "category.creative": "creative", + "category.experimental": "experimental", + "category.optimization": "optimization", + "category.feature": "feature", + "category.command": "command", + "category.tnt": "TNT", + "category.dispenser": "dispenser", + "category.scarpet": "scarpet", + "category.client": "client", - "carpet.ui.statement.browse_categories": "Brouse categories", - "carpet.ui.statement.list_all_%s_settings": "list all %s settings", - "carpet.ui.statement.version": "Version", - "carpet.ui.statement.current_%s_settings": "Current %s settings", - "carpet.ui.statement.switch_to": "Switch to", - "carpet.ui.statement.settings_are_locked": "settings are locked", - "carpet.ui.statement.is_set_to": "is set to", - "carpet.ui.statement.unknown_rule": "Unknown ruls", - "carpet.ui.statement.current_%s_startup_settings_from_%s": "current %s startup settings from %s", - "carpet.ui.statement.%s_settings_matching_'%s'": "%s settings matching \"%s\" ", - "carpet.ui.statement.all_%s_settings": "all %s settings", - "carpet.ui.statement.tags": "Tags", - "carpet.ui.statement.change_permanently": "Change permanently", - "carpet.ui.statement.click_to_keep_the_settings_in_%s_to_save_across_restarts": "click to keep the settings in %s to save across restarts", - "carpet.ui.statement.rule_%s_will_now_default_to_%s": "rule %s will now default to %s", - "carpet.ui.statement.current_value": "current value" + "// Settings command UI elements": "", + + "ui.browse_categories": "Browse categories", + "ui.list_all_%(cat)s_settings": "list all %s settings", + "ui.version": "Version", + "ui.current_%(mod)s_settings": "Current %s settings", + "ui.switch_to": "Switch to", + "ui.settings_are_locked": "settings are locked", + "ui.is_set_to": "is set to", + "ui.unknown_rule": "Unknown rule", + "ui.current_%(mod)s_startup_settings_from_%(conf)s": "Current %s Startup Settings from %s", + "ui.%(mod)s_settings_matching_'%(query)s'": "%s settings matching \"%s\" ", + "ui.all_%(mod)s_settings": "All %s settings", + "ui.tags": "Tags", + "ui.change_permanently": "Change permanently", + "ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts": "click to keep the settings in %s to save across restarts", + "ui.rule_%(rule)s_will_now_default_to_%(value)s": "rule %s will now default to %s", + "ui.current_value": "current value" } diff --git a/src/main/resources/assets/carpet/lang/zh_cn.json b/src/main/resources/assets/carpet/lang/zh_cn.json index 0ff8835f..9784f087 100644 --- a/src/main/resources/assets/carpet/lang/zh_cn.json +++ b/src/main/resources/assets/carpet/lang/zh_cn.json @@ -1,41 +1,41 @@ -{ - "carpet.rule.portalSuffocationFix.name": "传送门窒息修复", - - - "carpet.rule.portalSuffocationFix.desc": "使下界传送门正确地传送实体", - - - "carpet.rule.portalSuffocationFix.extra.0": "0000000", - "carpet.rule.portalSuffocationFix.extra.1": "1111111", - - - "carpet.ui.category.bugfix": "BUG修复", - "carpet.ui.category.survival": "生存", - "carpet.ui.category.creative": "创造", - "carpet.ui.category.experimental": "试验性", - "carpet.ui.category.optimization": "优化", - "carpet.ui.category.feature": "特性", - "carpet.ui.category.command": "指令", - "carpet.ui.category.tnt": "TNT", - "carpet.ui.category.dispenser": "发射器", - "carpet.ui.category.scarpet": "SCarpet脚本语言", - "carpet.ui.category.client": "客户端", - - "carpet.ui.statement.browse_categories": "浏览分类", - "carpet.ui.statement.list_all_%s_settings": "列出所有 %s 选项", - "carpet.ui.statement.version": "版本", - "carpet.ui.statement.current_%s_settings": "目前启用的 %s 选项", - "carpet.ui.statement.switch_to": "切换至", - "carpet.ui.statement.settings_are_locked": "选项被锁定", - "carpet.ui.statement.is_set_to": "被设置为", - "carpet.ui.statement.unknown_rule": "未知的规则选项", - "carpet.ui.statement.current_%s_startup_settings_from_%s": "目前启用的%s选项，从%s中读取得", - "carpet.ui.statement.%s_settings_matching_'%s'": "%s中符合\"%s\"的选项：", - "carpet.ui.statement.all_%s_settings": "所有的%s选项", - "carpet.ui.statement.tags": "分类", - "carpet.ui.statement.change_permanently": "永久更改", - "carpet.ui.statement.click_to_keep_the_settings_in_%s_to_save_across_restarts": "点击此按钮以使此选项保存于%s，重启后依旧生效", - "carpet.ui.statement.rule_%s_will_now_default_to_%s": "规则%s将会被默认设置为%s", - "carpet.ui.statement.current_value": "当前的值" - +{ + "rule.portalSuffocationFix.name": "传送门窒息修复", + + + "rule.portalSuffocationFix.desc": "使下界传送门正确地传送实体", + + + "rule.portalSuffocationFix.extra.0": "0000000", + "rule.portalSuffocationFix.extra.1": "1111111", + + + "category.bugfix": "BUG修复", + "category.survival": "生存", + "category.creative": "创造", + "category.experimental": "试验性", + "category.optimization": "优化", + "category.feature": "特性", + "category.command": "指令", + "category.tnt": "TNT", + "category.dispenser": "发射器", + "category.scarpet": "scarpet脚本语言", + "category.client": "客户端", + + "ui.browse_categories": "浏览分类", + "ui.list_all_%(cat)s_settings": "列出所有 %s 选项", + "ui.version": "版本", + "ui.current_%(mod)s_settings": "目前启用的 %s 选项", + "ui.switch_to": "切换至", + "ui.settings_are_locked": "选项被锁定", + "ui.is_set_to": "被设置为", + "ui.unknown_rule": "未知的规则选项", + "ui.current_%(mod)s_startup_settings_from_%(conf)s": "目前启用的%s选项，从%s中读取得", + "ui.%(mod)s_settings_matching_'%(query)s'": "%s中符合\"%s\"的选项：", + "ui.all_%(mod)s_settings": "所有的%s选项", + "ui.tags": "分类", + "ui.change_permanently": "永久更改", + "ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts": "点击此按钮以使此选项保存于%s，重启后依旧生效", + "ui.rule_%(rule)s_will_now_default_to_%(value)s": "规则%s将会被默认设置为%s", + "ui.current_value": "当前的值" + } \ No newline at end of file