From 3794e15769813cdea5b00af20dcd87a3411a5ef0 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 17 Sep 2019 19:38:28 +0200 Subject: [PATCH] default --- mods/default/craftitems.lua | 17 +++++++++-------- mods/default/nodes.lua | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index dd76d1e5..2d2da0cd 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -52,23 +52,24 @@ local function book_on_use(itemstack, user) end local formspec + local esc = minetest.formspec_escape if owner == player_name then formspec = "size[8,8]" .. - "field[0.5,1;7.5,0;title;Title:;" .. - minetest.formspec_escape(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;text;Contents:;" .. - minetest.formspec_escape(text) .. "]" .. - "button_exit[2.5,7.5;3,1;save;Save]" + "field[0.5,1;7.5,0;title;" .. esc(S("Title")) .. ":;" .. + esc(title) .. "]" .. + "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents")) .. ":;" .. + esc(text) .. "]" .. + "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" else formspec = "size[8,8]" .. - "label[0.5,0.5;by " .. owner .. "]" .. + "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. "tablecolumns[color;text]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[0.4,0;7,0.5;title;#FFFF00," .. minetest.formspec_escape(title) .. "]" .. + "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. "textarea[0.5,1.5;7.5,7;;" .. minetest.formspec_escape(string ~= "" and string or text) .. ";]" .. "button[2.4,7.6;0.8,0.8;book_prev;<]" .. - "label[3.2,7.7;Page " .. page .. " of " .. page_max .. "]" .. + "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. "button[4.9,7.6;0.8,0.8;book_next;>]" end diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 5dbee7d0..cee1242a 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2604,7 +2604,7 @@ local function register_sign(material, desc, def) meta:set_string("text", text) if #text > 0 then - meta:set_string("infotext", '"' .. text .. '"') + meta:set_string("infotext", S('"@1"', text)) else meta:set_string("infotext", '') end