From 04c91e7311b7c23a5bae86d7dc8af21013c1c277 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 21 Jun 2020 17:26:12 -0300 Subject: [PATCH] confirmation when rule removed from conf --- src/main/java/carpet/settings/SettingsManager.java | 3 ++- src/main/resources/assets/carpet/lang/en_us.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index b792de08..0c8803d3 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -470,7 +470,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("ui.rule_%(rule)s_will_now_default_to_%(value)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 @@ -482,6 +482,7 @@ public class SettingsManager conf.getLeft().remove(rule.name); writeSettingsToConf(conf.getLeft()); rules.get(rule.name).resetToDefault(source); + Messenger.m(source ,"gi "+String.format(tr("ui.rule_%(rule)s_not_set_restart","Rule %s will now not be set on restart"), rule.translatedName())); return 1; } diff --git a/src/main/resources/assets/carpet/lang/en_us.json b/src/main/resources/assets/carpet/lang/en_us.json index 34331d5c..100547f6 100644 --- a/src/main/resources/assets/carpet/lang/en_us.json +++ b/src/main/resources/assets/carpet/lang/en_us.json @@ -47,7 +47,8 @@ "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.rule_%(rule)s_will_now_default_to_%(value)s": "Rule %s will now default to %s", + "ui.rule_%(rule)s_not_set_restart": "Rule %s will now not be set on restart", "ui.current_value": "current value" }