aboutsummaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-08-14 15:38:35 +0200
committerest31 <MTest31@outlook.com>2015-08-14 15:56:25 +0200
commit25dfd1bbf5cfdcf863e3281f87164915bccc4299 (patch)
tree021edf3cac8eafc6f306cd59163fb537622ce62b /builtin/mainmenu
parentbe9024a397506dff1151b16e5f7a91e393b00d7e (diff)
downloadminetest-25dfd1bbf5cfdcf863e3281f87164915bccc4299.tar.gz
minetest-25dfd1bbf5cfdcf863e3281f87164915bccc4299.tar.bz2
minetest-25dfd1bbf5cfdcf863e3281f87164915bccc4299.zip
Don't do formspec escaping twice for loading description
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/common.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 14a64361d..6266d0220 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -224,10 +224,10 @@ function menu_handle_key_up_down(fields,textlist,settingname)
configure_selected_world_params(newidx)
end
-
+
return true
end
-
+
return false
end
@@ -237,7 +237,7 @@ function asyncOnlineFavourites()
if not menudata.public_known then
menudata.public_known = {{
name = fgettext("Loading..."),
- description = fgettext("Try reenabling public serverlist and check your internet connection.")
+ description = fgettext_ne("Try reenabling public serverlist and check your internet connection.")
}}
end
menudata.favorites = menudata.public_known
@@ -262,22 +262,22 @@ end
--------------------------------------------------------------------------------
function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
local textlines = core.splittext(text,textlen)
-
+
local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
.. width .. "," .. height .. ";"
.. tl_name .. ";"
-
+
for i=1, #textlines, 1 do
textlines[i] = textlines[i]:gsub("\r","")
retval = retval .. core.formspec_escape(textlines[i]) .. ","
end
-
+
retval = retval .. ";0;"
-
+
if transparency then
retval = retval .. "true"
end
-
+
retval = retval .. "]"
return retval