From c81666694587dc49936eb2122607de1efd1589fd Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 6 Aug 2016 17:23:46 +0200 Subject: [PATCH] Ensure formspec escaping for translated strings --- api.lua | 9 +++++---- bags.lua | 19 ++++++++++--------- init.lua | 4 +++- internal.lua | 31 ++++++++++++++++--------------- register.lua | 25 +++++++++++++------------ waypoints.lua | 31 ++++++++++++++++--------------- 6 files changed, 63 insertions(+), 56 deletions(-) diff --git a/api.lua b/api.lua index c4e76c6..0b25701 100644 --- a/api.lua +++ b/api.lua @@ -1,4 +1,5 @@ local S = unified_inventory.gettext +local F = unified_inventory.fgettext -- Create detached creative inventory after loading all mods minetest.after(0.01, function() @@ -158,7 +159,7 @@ end unified_inventory.register_craft_type("normal", { - description = S("Crafting"), + description = F("Crafting"), icon = "ui_craftgrid_icon.png", width = 3, height = 3, @@ -174,7 +175,7 @@ unified_inventory.register_craft_type("normal", { unified_inventory.register_craft_type("shapeless", { - description = S("Mixing"), + description = F("Mixing"), icon = "ui_craftgrid_icon.png", width = 3, height = 3, @@ -189,7 +190,7 @@ unified_inventory.register_craft_type("shapeless", { unified_inventory.register_craft_type("cooking", { - description = S("Cooking"), + description = F("Cooking"), icon = "default_furnace_front.png", width = 1, height = 1, @@ -197,7 +198,7 @@ unified_inventory.register_craft_type("cooking", { unified_inventory.register_craft_type("digging", { - description = S("Digging"), + description = F("Digging"), icon = "default_tool_steelpick.png", width = 1, height = 1, diff --git a/bags.lua b/bags.lua index 9b16c96..08c25f9 100644 --- a/bags.lua +++ b/bags.lua @@ -4,16 +4,17 @@ -- License: GPLv3 local S = unified_inventory.gettext +local F = unified_inventory.fgettext unified_inventory.register_page("bags", { get_formspec = function(player) local player_name = player:get_player_name() local formspec = "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]" - formspec = formspec.."label[0,0;"..S("Bags").."]" - formspec = formspec.."button[0,2;2,0.5;bag1;"..S("Bag 1").."]" - formspec = formspec.."button[2,2;2,0.5;bag2;"..S("Bag 2").."]" - formspec = formspec.."button[4,2;2,0.5;bag3;"..S("Bag 3").."]" - formspec = formspec.."button[6,2;2,0.5;bag4;"..S("Bag 4").."]" + formspec = formspec.."label[0,0;"..F("Bags").."]" + formspec = formspec.."button[0,2;2,0.5;bag1;"..F("Bag 1").."]" + formspec = formspec.."button[2,2;2,0.5;bag2;"..F("Bag 2").."]" + formspec = formspec.."button[4,2;2,0.5;bag3;"..F("Bag 3").."]" + formspec = formspec.."button[6,2;2,0.5;bag4;"..F("Bag 4").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag1;0.5,1;1,1;]" formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag2;2.5,1;1,1;]" @@ -36,7 +37,7 @@ unified_inventory.register_button("bags", { local stack = player:get_inventory():get_stack("bag1", 1) local image = stack:get_definition().inventory_image local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;"..S("Bag 1").."]" + formspec = formspec.."label[0,0;"..F("Bag 1").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;bag1contents;0,1;8,3;]" formspec = formspec.."listring[current_name;bag1contents]" @@ -57,7 +58,7 @@ unified_inventory.register_button("bags", { local stack = player:get_inventory():get_stack("bag2", 1) local image = stack:get_definition().inventory_image local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;"..S("Bag 2").."]" + formspec = formspec.."label[0,0;"..F("Bag 2").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;bag2contents;0,1;8,3;]" formspec = formspec.."listring[current_name;bag2contents]" @@ -78,7 +79,7 @@ unified_inventory.register_button("bags", { local stack = player:get_inventory():get_stack("bag3", 1) local image = stack:get_definition().inventory_image local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;"..S("Bag 3").."]" + formspec = formspec.."label[0,0;"..F("Bag 3").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;bag3contents;0,1;8,3;]" formspec = formspec.."listring[current_name;bag3contents]" @@ -99,7 +100,7 @@ unified_inventory.register_button("bags", { local stack = player:get_inventory():get_stack("bag4", 1) local image = stack:get_definition().inventory_image local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;"..S("Bag 4").."]" + formspec = formspec.."label[0,0;"..F("Bag 4").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;bag4contents;0,1;8,3;]" formspec = formspec.."listring[current_name;bag4contents]" diff --git a/init.lua b/init.lua index d311ace..e24fff2 100644 --- a/init.lua +++ b/init.lua @@ -2,6 +2,7 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) local worldpath = minetest.get_worldpath() +local mygettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end -- Data tables definitions unified_inventory = { @@ -31,7 +32,8 @@ unified_inventory = { default = "craft", -- intllib - gettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end, + gettext = mygettext, + fgettext = function(s) return minetest.formspec_escape(mygettext(s)) end, -- "Lite" mode lite_mode = minetest.setting_getbool("unified_inventory_lite"), diff --git a/internal.lua b/internal.lua index b99cf72..ee783ce 100644 --- a/internal.lua +++ b/internal.lua @@ -1,4 +1,5 @@ local S = unified_inventory.gettext +local F = unified_inventory.fgettext -- This pair of encoding functions is used where variable text must go in -- button names, where the text might contain formspec metacharacters. @@ -135,39 +136,39 @@ function unified_inventory.get_formspec(player, page) formspec[n] = "image_button[" .. (start_x + 0.6 * 0) .. ",9;.8,.8;ui_skip_backward_icon.png;start_list;]" - .. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]" + .. "tooltip[start_list;" .. F("First page") .. "]" .. "image_button[" .. (start_x + 0.6 * 1) .. ",9;.8,.8;ui_doubleleft_icon.png;rewind3;]" - .. "tooltip[rewind3;" .. minetest.formspec_escape(S("Back three pages")) .. "]" + .. "tooltip[rewind3;" .. F("Back three pages") .. "]" .. "image_button[" .. (start_x + 0.6 * 2) .. ",9;.8,.8;ui_left_icon.png;rewind1;]" - .. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]" + .. "tooltip[rewind1;" .. F("Back one page") .. "]" .. "image_button[" .. (start_x + 0.6 * 3) .. ",9;.8,.8;ui_right_icon.png;forward1;]" - .. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]" + .. "tooltip[forward1;" .. F("Forward one page") .. "]" .. "image_button[" .. (start_x + 0.6 * 4) .. ",9;.8,.8;ui_doubleright_icon.png;forward3;]" - .. "tooltip[forward3;" .. minetest.formspec_escape(S("Forward three pages")) .. "]" + .. "tooltip[forward3;" .. F("Forward three pages") .. "]" .. "image_button[" .. (start_x + 0.6 * 5) .. ",9;.8,.8;ui_skip_forward_icon.png;end_list;]" - .. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]" + .. "tooltip[end_list;" .. F("Last page") .. "]" else formspec[n] = "image_button[" .. (8.2 + 0.65 * 0) .. ",5.8;.8,.8;ui_skip_backward_icon.png;start_list;]" - .. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]" + .. "tooltip[start_list;" .. F("First page") .. "]" .. "image_button[" .. (8.2 + 0.65 * 1) .. ",5.8;.8,.8;ui_left_icon.png;rewind1;]" - .. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]" + .. "tooltip[rewind1;" .. F("Back one page") .. "]" .. "image_button[" .. (8.2 + 0.65 * 2) .. ",5.8;.8,.8;ui_right_icon.png;forward1;]" - .. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]" + .. "tooltip[forward1;" .. F("Forward one page") .. "]" .. "image_button[" .. (8.2 + 0.65 * 3) .. ",5.8;.8,.8;ui_skip_forward_icon.png;end_list;]" - .. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]" + .. "tooltip[end_list;" .. F("Last page") .. "]" end n = n+1 @@ -177,12 +178,12 @@ function unified_inventory.get_formspec(player, page) formspec[n] = "field[9.5,8.325;3,1;searchbox;;" .. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]" formspec[n+1] = "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]" - .. "tooltip[searchbutton;" ..S("Search") .. "]" + .. "tooltip[searchbutton;" ..F("Search") .. "]" else formspec[n] = "field[8.5,5.225;2.2,1;searchbox;;" .. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]" formspec[n+1] = "image_button[10.3,5;.8,.8;ui_search_icon.png;searchbutton;]" - .. "tooltip[searchbutton;" ..S("Search") .. "]" + .. "tooltip[searchbutton;" ..F("Search") .. "]" end n = n+2 @@ -193,7 +194,7 @@ function unified_inventory.get_formspec(player, page) -- Items list if #unified_inventory.filtered_items_list[player_name] == 0 then - formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. S(no_matches) .. "]" + formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. F(no_matches) .. "]" else local dir = unified_inventory.active_search_direction[player_name] local list_index = unified_inventory.current_index[player_name] @@ -216,13 +217,13 @@ function unified_inventory.get_formspec(player, page) end end end - formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..S("Page") .. ": " + formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..F("Page") .. ": " .. S("%s of %s"):format(page,pagemax).."]" end n= n+1 if unified_inventory.activefilter[player_name] ~= "" then - formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. S("Filter") .. ":]" + formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. F("Filter") .. ":]" formspec[n+1] = "label[9.1,"..(ui_peruser.form_header_y + 0.4)..";"..minetest.formspec_escape(unified_inventory.activefilter[player_name]).."]" end return table.concat(formspec, "") diff --git a/register.lua b/register.lua index 8cc9123..978646b 100644 --- a/register.lua +++ b/register.lua @@ -1,4 +1,5 @@ local S = unified_inventory.gettext +local F = unified_inventory.fgettext minetest.register_privilege("creative", { description = S("Can use the creative inventory"), @@ -150,16 +151,16 @@ unified_inventory.register_page("craft", { local player_name = player:get_player_name() local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]" formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]" - formspec = formspec.."label[0,"..formheadery..";" ..S("Crafting").."]" + formspec = formspec.."label[0,"..formheadery..";" ..F("Crafting").."]" formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]" formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]" - formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. S("Trash:") .. "]" + formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]" formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]" formspec = formspec.."listring[current_name;craft]" formspec = formspec.."listring[current_player;main]" if unified_inventory.is_creative(player_name) then - formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. S("Refill:") .. "]" + formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. F("Refill:") .. "]" formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."refill;main;0,"..(formspecy +2)..";1,1;]" end return {formspec=formspec} @@ -223,7 +224,7 @@ unified_inventory.register_page("craftguide", { local player_privs = minetest.get_player_privs(player_name) local formspec = "" formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]" - formspec = formspec.."label[0,"..formheadery..";" .. S("Crafting Guide") .. "]" + formspec = formspec.."label[0,"..formheadery..";" .. F("Crafting Guide") .. "]" formspec = formspec.."listcolors[#00000000;#00000000]" local item_name = unified_inventory.current_item[player_name] if not item_name then return {formspec=formspec} end @@ -242,20 +243,20 @@ unified_inventory.register_page("craftguide", { formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]" formspec = formspec.."textarea["..craftresultx..","..craftresulty - ..";10,1;;"..minetest.formspec_escape(S(role_text[dir])..": "..item_name)..";]" + ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..item_name)..";]" formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_" .. rdir .. "_", ItemStack(item_name)) if not craft then formspec = formspec.."label[5.5,"..(formspecy + 2.35)..";" - ..minetest.formspec_escape(S(no_recipe_text[dir])).."]" + ..minetest.formspec_escape(F(no_recipe_text[dir])).."]" local no_pos = dir == "recipe" and 4.5 or 6.5 local item_pos = dir == "recipe" and 6.5 or 4.5 formspec = formspec.."image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]" formspec = formspec..stack_image_button(item_pos, formspecy, 1.1, 1.1, "item_button_" ..other_dir[dir].."_", ItemStack(item_name)) if player_privs.give == true then - formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. S("Give me:") .. "]" + formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. F("Give me:") .. "]" .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" .."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]" @@ -297,13 +298,13 @@ unified_inventory.register_page("craftguide", { end if craft_type.uses_crafting_grid then - formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. S("To craft grid:") .. "]" + formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. F("To craft grid:") .. "]" .."button[0, "..(formspecy + 1.5)..";0.6,0.5;craftguide_craft_1;1]" .."button[0.6,"..(formspecy + 1.5)..";0.7,0.5;craftguide_craft_10;10]" - .."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. S("All") .. "]" + .."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. F("All") .. "]" end if player_privs.give then - formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. S("Give me:") .. "]" + formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. F("Give me:") .. "]" .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" .."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]" @@ -311,8 +312,8 @@ unified_inventory.register_page("craftguide", { if alternates and alternates > 1 then formspec = formspec.."label[5.5,"..(formspecy + 1.6)..";" - ..string.format(S(recipe_text[dir]), alternate, alternates).."]" - .."button[5.5,"..(formspecy + 2)..";2,1;alternate;" .. S("Alternate") .. "]" + ..string.format(F(recipe_text[dir]), alternate, alternates).."]" + .."button[5.5,"..(formspecy + 2)..";2,1;alternate;" .. F("Alternate") .. "]" end return {formspec = formspec} end, diff --git a/waypoints.lua b/waypoints.lua index 5e6081f..3ab7eb7 100644 --- a/waypoints.lua +++ b/waypoints.lua @@ -1,4 +1,5 @@ local S = unified_inventory.gettext +local F = unified_inventory.fgettext local hud_colors = { {"#FFFFFF", 0xFFFFFF, S("White")}, @@ -24,7 +25,7 @@ unified_inventory.register_page("waypoints", { local waypoints = datastorage.get(player_name, "waypoints") local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" .. "image[0,0;1,1;ui_waypoints_icon.png]" .. - "label[1,0;" .. S("Waypoints") .. "]" + "label[1,0;" .. F("Waypoints") .. "]" -- Tabs buttons: for i = 1, 5, 1 do @@ -34,7 +35,7 @@ unified_inventory.register_page("waypoints", { "ui_" .. i .. "_icon.png;" .. "select_waypoint" .. i .. ";]" .. "tooltip[select_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Select Waypoint #%d"):format(i)).."]" + .. (S("Select Waypoint #%d"):format(i)).."]" end local i = waypoints.selected or 1 @@ -48,43 +49,43 @@ unified_inventory.register_page("waypoints", { "ui_waypoint_set_icon.png;".. "set_waypoint"..i..";]".. "tooltip[set_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Set waypoint to current location")).."]" + .. F("Set waypoint to current location").."]" formspec = formspec .. "image_button[5.2,3.7;.8,.8;".. (waypoint.active and "ui_on_icon.png" or "ui_off_icon.png")..";".. "toggle_waypoint"..i..";]".. "tooltip[toggle_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Make waypoint " - ..(waypoint.active and "invisible" or "visible"))).."]" + .. F("Make waypoint " + ..(waypoint.active and "invisible" or "visible")).."]" formspec = formspec .. "image_button[5.9,3.7;.8,.8;".. (waypoint.display_pos and "ui_green_icon_background.png" or "ui_red_icon_background.png").."^ui_xyz_icon.png;".. "toggle_display_pos" .. i .. ";]".. "tooltip[toggle_display_pos" .. i .. ";" - .. minetest.formspec_escape(S((waypoint.display_pos and "Disable" or "Enable") - .." display of waypoint coordinates")).."]" + .. F((waypoint.display_pos and "Disable" or "Enable") + .." display of waypoint coordinates").."]" formspec = formspec .. "image_button[6.6,3.7;.8,.8;".. "ui_circular_arrows_icon.png;".. "toggle_color"..i..";]".. "tooltip[toggle_color" .. i .. ";" - .. minetest.formspec_escape(S("Change color of waypoint display")).."]" + .. F("Change color of waypoint display").."]" formspec = formspec .. "image_button[7.3,3.7;.8,.8;".. "ui_pencil_icon.png;".. "rename_waypoint"..i..";]".. "tooltip[rename_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Edit waypoint name")).."]" + .. F("Edit waypoint name").."]" -- Waypoint's info: if waypoint.active then - formspec = formspec .. "label[1,0.8;"..S("Waypoint active").."]" + formspec = formspec .. "label[1,0.8;"..F("Waypoint active").."]" else - formspec = formspec .. "label[1,0.8;"..S("Waypoint inactive").."]" + formspec = formspec .. "label[1,0.8;"..F("Waypoint inactive").."]" end if temp.edit then @@ -95,13 +96,13 @@ unified_inventory.register_page("waypoints", { "ui_ok_icon.png;".. "confirm_rename"..i.. ";]".. "tooltip[confirm_rename" .. i .. ";" - .. minetest.formspec_escape(S("Finish editing")).."]" + .. F("Finish editing").."]" end - formspec = formspec .. "label[1,1.3;"..S("World position")..": " .. + formspec = formspec .. "label[1,1.3;"..F("World position")..": " .. minetest.pos_to_string(waypoint.world_pos or vector.new()) .. "]" .. - "label[1,1.8;"..S("Name")..": ".. (waypoint.name or default_name) .. "]" .. - "label[1,2.3;"..S("HUD text color")..": " .. + "label[1,1.8;"..F("Name")..": ".. (waypoint.name or default_name) .. "]" .. + "label[1,2.3;"..F("HUD text color")..": " .. hud_colors[waypoint.color or 1][3] .. "]" return {formspec=formspec}