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

Don't do formspec escaping twice for loading description

master
est31 2015-08-14 15:38:35 +02:00
parent be9024a397
commit 25dfd1bbf5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/mainmenu/common.lua
View File

@ -224,10 +224,10 @@ function menu_handle_key_up_down(fields,textlist,settingname)
configure_selected_world_params(newidx) configure_selected_world_params(newidx)
end end
return true return true
end end
return false return false
end end
@ -237,7 +237,7 @@ function asyncOnlineFavourites()
if not menudata.public_known then if not menudata.public_known then
menudata.public_known = {{ menudata.public_known = {{
name = fgettext("Loading..."), 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 end
menudata.favorites = menudata.public_known menudata.favorites = menudata.public_known
@ -262,22 +262,22 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency) function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
local textlines = core.splittext(text,textlen) local textlines = core.splittext(text,textlen)
local retval = "textlist[" .. xpos .. "," .. ypos .. ";" local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
.. width .. "," .. height .. ";" .. width .. "," .. height .. ";"
.. tl_name .. ";" .. tl_name .. ";"
for i=1, #textlines, 1 do for i=1, #textlines, 1 do
textlines[i] = textlines[i]:gsub("\r","") textlines[i] = textlines[i]:gsub("\r","")
retval = retval .. core.formspec_escape(textlines[i]) .. "," retval = retval .. core.formspec_escape(textlines[i]) .. ","
end end
retval = retval .. ";0;" retval = retval .. ";0;"
if transparency then if transparency then
retval = retval .. "true" retval = retval .. "true"
end end
retval = retval .. "]" retval = retval .. "]"
return retval return retval