Skip to content

Commit 95991f8

Browse files
authored
Fix description of overridden give privilege (#3230)
1 parent 90fa921 commit 95991f8

26 files changed

+38
-2
lines changed

.luacheckrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ unused_args = false
22
allow_defined_top = true
33

44
globals = {
5-
"default"
5+
"default",
66
}
77

88
read_globals = {
@@ -33,3 +33,6 @@ files["mods/player_api/api.lua"].globals = { "minetest" }
3333

3434
-- Don't report on legacy definitions of globals.
3535
files["mods/default/legacy.lua"].global = false
36+
37+
-- Overwrites a description of a privilege
38+
files["mods/default/chat.lua"].globals = { "core.registered_privileges" }

mods/default/chat.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
-- mods/default/chat.lua
22

3+
local S = default.get_translator
4+
35
local function match_old(privs)
46
local ok = false
57
for k, v in pairs(privs) do
@@ -14,15 +16,22 @@ end
1416

1517
-- Change /pulverize and /clearinv to not require give, like it used to be
1618
-- before Luanti 5.15
19+
local command_overridden = false
1720
for _, cmd in ipairs({"pulverize", "clearinv"}) do
1821
local def = core.registered_chatcommands[cmd]
1922
if def then
2023
if match_old(def.privs) then
2124
core.override_chatcommand(cmd, {
2225
privs = {interact=true},
2326
})
27+
command_overridden = true
2428
else
2529
minetest.log("info", "Privileges of command /" .. cmd .. " look modified, not overriding them.")
2630
end
2731
end
2832
end
33+
34+
-- Revert description of 'give' privilege to what it was in Luanti 5.14
35+
if command_overridden and core.registered_privileges["give"] then
36+
core.registered_privileges["give"].description = S("Can use /give and /giveme")
37+
end

mods/default/locale/default.bg.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=Може да използва /give и /giveme
23
Locked Chest=Заключен сандък
34
Locked Chest (owned by @1)=Заключен сандък (собственост на @1)
45
You do not own this chest.=Не притежавате този сандък.

mods/default/locale/default.da.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=
23
Locked Chest=Låst kiste
34
Locked Chest (owned by @1)=Låst kiste (ejet af @1)
45
You do not own this chest.=Du ejer ikke denne kiste.

mods/default/locale/default.de.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=Kann /give und /giveme benutzen
23
Locked Chest=Abgeschlossene Truhe
34
Locked Chest (owned by @1)=Abgeschlossene Truhe (Eigentum von @1)
45
You do not own this chest.=Ihnen gehört diese Truhe nicht.

mods/default/locale/default.eo.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=Povas uzi /give kaj /giveme
23
Locked Chest=Ŝlosita kesto
34
Locked Chest (owned by @1)=Ŝlosita kesto (de @1)
45
You do not own this chest.=Vi ne posedas ĉi tiun keston.

mods/default/locale/default.es.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=
23
Locked Chest=Cofre cerrado
34
Locked Chest (owned by @1)=Cofre cerrado (propiedad de @1)
45
You do not own this chest.=Este cofre no te pertenece.

mods/default/locale/default.eu.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=
23
Locked Chest=Itxitako kutxa
34
Locked Chest (owned by @1)=Itxitako kutxa (jabea: @1)
45
You do not own this chest.=Kutxa hau ez da zurea.

mods/default/locale/default.fr.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=Peut utiliser /give et /giveme
23
Locked Chest=Coffre verrouillé
34
Locked Chest (owned by @1)=Coffre verrouillé (possédé par @1)
45
You do not own this chest.=Ce coffre ne vous appartient pas.

mods/default/locale/default.hu.tr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# textdomain: default
2+
Can use /give and /giveme=
23
Locked Chest=Lezárt láda
34
Locked Chest (owned by @1)=Lezárt láda (@1 tulajdona)
45
You do not own this chest.=Nem a tiéd ez a láda.

0 commit comments

Comments
 (0)