From 25dfd1bbf5cfdcf863e3281f87164915bccc4299 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 14 Aug 2015 15:38:35 +0200 Subject: Don't do formspec escaping twice for loading description --- builtin/mainmenu/common.lua | 16 ++++++++-------- 1 file 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 -- cgit v1.2.3