minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CSM] Use more gettext (#5553)

master
red-001 2017-04-10 20:14:00 +01:00 committed by Loïc Blot
parent e8d8723320
commit eb587996e4
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/client/chatcommands.lua
View File

@ -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

25
builtin/common/chatcommands.lua
View File

@ -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,