[CSM] Use more gettext (#5553)

diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua
index bb5b905d89bd440815de61ec87f55305d82986a7..bb698cdecd9e53a2e1046326ae2f31cb89cf39bb 100644 (file)
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@@ -4,7 +4,7 @@
 core.register_on_sending_chat_messages(function(message)
        local first_char = message:sub(1,1)
        if first_char == "/" or first_char == "." then
-               core.display_chat_message("issued command: " .. message)
+               core.display_chat_message(core.gettext("issued command: ") .. message)
        end
 
        if first_char ~= "." then
@@ -17,7 +17,7 @@ core.register_on_sending_chat_messages(function(message)
        end
 
        if not cmd then
-               core.display_chat_message("-!- Empty command")
+               core.display_chat_message(core.gettext("-!- Empty command"))
                return true
        end
 
@@ -29,7 +29,7 @@ core.register_on_sending_chat_messages(function(message)
                        core.display_chat_message(message)
                end
        else
-               core.display_chat_message("-!- Invalid command: " .. cmd)
+               core.display_chat_message(core.gettext("-!- Invalid command: ") .. cmd)
        end
 
        return true

diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index 05dd94e8d3bb9a552ae468f4d99789b1a3d2a8c9..e8955c6b41405cd1074f172dd3c4e30c3f1768f6 100644 (file)
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -31,8 +31,19 @@ end
 
 local cmd_marker = "/"
 
+local function gettext(...)
+       return ...
+end
+
+local function gettext_replace(text, replace)
+       return text:gsub("$1", replace)
+end
+
+
 if INIT == "client" then
        cmd_marker = "."
+       gettext = core.gettext
+       gettext_replace = fgettext_ne
 end
 
 local function do_help_cmd(name, param)
@@ -54,9 +65,9 @@ local function do_help_cmd(name, param)
                        end
                end
                table.sort(cmds)
-               return true, "Available commands: " .. table.concat(cmds, " ") .. "\n"
-                               .. "Use '"..cmd_marker.."help <cmd>' to get more information,"
-                               .. " or '"..cmd_marker.."help all' to list everything."
+               return true, gettext("Available commands: ") .. table.concat(cmds, " ") .. "\n"
+                               .. gettext_replace("Use '$1help <cmd>' to get more information,"
+                               .. " or '$1help all' to list everything.", cmd_marker)
        elseif param == "all" then
                local cmds = {}
                for cmd, def in pairs(core.registered_chatcommands) do
@@ -65,7 +76,7 @@ local function do_help_cmd(name, param)
                        end
                end
                table.sort(cmds)
-               return true, "Available commands:\n"..table.concat(cmds, "\n")
+               return true, gettext("Available commands:").."\n"..table.concat(cmds, "\n")
        elseif INIT == "game" and param == "privs" then
                local privs = {}
                for priv, def in pairs(core.registered_privileges) do
@@ -77,7 +88,7 @@ local function do_help_cmd(name, param)
                local cmd = param
                local def = core.registered_chatcommands[cmd]
                if not def then
-                       return false, "Command not available: "..cmd
+                       return false, gettext("Command not available: ")..cmd
                else
                        return true, format_help_line(cmd, def)
                end
@@ -86,8 +97,8 @@ end
 
 if INIT == "client" then
        core.register_chatcommand("help", {
-               params = "[all/<cmd>]",
-               description = "Get help for commands",
+               params = gettext("[all/<cmd>]"),
+               description = gettext("Get help for commands"),
                func = function(param)
                        return do_help_cmd(nil, param)
                end,