Skip to content
Permalink
Browse files

Don't do formspec escaping twice for loading description

  • Loading branch information
est31 committed Aug 14, 2015
1 parent be9024a commit 25dfd1bbf5cfdcf863e3281f87164915bccc4299
Showing with 8 additions and 8 deletions.
  1. +8 −8 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

0 comments on commit 25dfd1b

Please sign in to comment.