]> git.lizzy.rs Git - minetest.git/commitdiff
[CSM] Allow escaping chatcommands and add missing calls to gettext. (#5565)
authorred-001 <red-001@outlook.ie>
Tue, 11 Apr 2017 21:35:25 +0000 (22:35 +0100)
committerLoïc Blot <nerzhul@users.noreply.github.com>
Tue, 11 Apr 2017 21:35:25 +0000 (23:35 +0200)
builtin/client/chatcommands.lua

index bb698cdecd9e53a2e1046326ae2f31cb89cf39bb..f425216f5ead3dc580499a5e19ef166393dac103 100644 (file)
@@ -2,6 +2,10 @@
 
 
 core.register_on_sending_chat_messages(function(message)
+       if message:sub(1,2) == ".." then
+               return false
+       end
+
        local first_char = message:sub(1,1)
        if first_char == "/" or first_char == "." then
                core.display_chat_message(core.gettext("issued command: ") .. message)
@@ -12,9 +16,7 @@ core.register_on_sending_chat_messages(function(message)
        end
 
        local cmd, param = string.match(message, "^%.([^ ]+) *(.*)")
-       if not param then
-               param = ""
-       end
+       param = param or ""
 
        if not cmd then
                core.display_chat_message(core.gettext("-!- Empty command"))
@@ -36,15 +38,15 @@ core.register_on_sending_chat_messages(function(message)
 end)
 
 core.register_chatcommand("list_players", {
-       description = "List online players",
+       description = core.gettext("List online players"),
        func = function(param)
                local players = table.concat(core.get_player_names(), ", ")
-               core.display_chat_message("Online players: " .. players)
+               core.display_chat_message(core.gettext("Online players: ") .. players)
        end
 })
 
 core.register_chatcommand("disconnect", {
-       description = "Exit to main menu",
+       description = core.gettext("Exit to main menu"),
        func = function(param)
                core.disconnect()
        end,