From: red-001 <red-001@outlook.ie>
Date: Tue, 11 Apr 2017 21:35:25 +0000 (+0100)
Subject: [CSM] Allow escaping chatcommands and add missing calls to gettext. (#5565)
X-Git-Tag: 0.4.16~256
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e2479e46a8d19fa0e943f84898b602cf38f6480;p=oweals%2Fminetest.git

[CSM] Allow escaping chatcommands and add missing calls to gettext. (#5565)
---

diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua
index bb698cdec..f425216f5 100644
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@@ -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,