more lang check

NyaaCat · May 6, 2017 · 38300ca · 38300ca
1 parent 88460ac
commit 38300ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/cat/nyaa/nyaacore/CommandReceiver.java b/src/main/java/cat/nyaa/nyaacore/CommandReceiver.java
@@ -61,12 +61,12 @@ public BadCommandException() {
          * @param msg_internal msg template key. e.g. `internal.warn.***'
          * @param args         arguments
          */
-        public BadCommandException(String msg_internal, Object... args) {
+        public BadCommandException(@LangKey String msg_internal, Object... args) {
             super(msg_internal);
             objs = args;
         }
 
-        public BadCommandException(String msg_internal, Throwable cause, Object... args) {
+        public BadCommandException(@LangKey(varArgsPosition = 1) String msg_internal, Throwable cause, Object... args) {
             super(msg_internal, cause);
             objs = args;
         }
@@ -200,7 +200,7 @@ public void acceptCommand(CommandSender sender, Arguments cmd) {
         } catch (NoItemInHandException ex) {
             msg(sender, ex.isOffHand ? "internal.error.no_item_offhand" : "internal.error.no_item_hand");
         } catch (BadCommandException ex) {
-            @LangKey String msg = ex.getMessage();
+            @LangKey(skipCheck = true) String msg = ex.getMessage();
             if (msg != null && !msg.equals("")) {
                 if (ex.objs == null) {
                     msg(sender, msg);
@@ -254,7 +254,7 @@ public List<String> acceptTabComplete(CommandSender sender, Arguments args) thro
     public abstract String getHelpPrefix();
 
     private String getHelpContent(@LangKey(type = LangKeyType.SUFFIX, skipCheck = true) String type, String... subkeys) {
-        @LangKey String key = "manual";
+        @LangKey(type = LangKeyType.PREFIX, skipCheck = true) String key = "manual";
         for (String s : subkeys) {
             if (s.length() > 0)
                 key += "." + s;

diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml
@@ -12,10 +12,10 @@ internal:
     no_required_permission: "You do not have the required permission: %s"
     invalid_command_arg: "Invalid command line arguments."
 
-    bad_int: "Not a valid integer"
-    bad_double: "Not a valid number"
+    bad_int: "Not a valid integer: %s"
+    bad_double: "Not a valid number: %s"
     bad_enum: "Not valid for enum type: %s. Values: %s"
-    bad_decimal_pattern: "Not a valid pattern"
+    bad_decimal_pattern: "Not a valid pattern: %s"
 
     no_more_int: "No more integers in argument"
     no_more_double: "No more numbers in argument"