Add '@n' escape sequences and some documentation on translated strings.

[dragonfireclient.git] / builtin / mainmenu / dlg_create_world.lua

diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 32e1fbf8304b1779a14a7569417a1942d1114da2..4e88ccc48a1f1205b02a5eadf1219078f96d0ba3 100644 (file)
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -18,8 +18,8 @@
 local function create_world_formspec(dialogdata)
        local mapgens = core.get_mapgen_names()
 
-       local current_seed = core.setting_get("fixed_map_seed") or ""
-       local current_mg   = core.setting_get("mg_name")
+       local current_seed = core.settings:get("fixed_map_seed") or ""
+       local current_mg   = core.settings:get("mg_name")
 
        local mglist = ""
        local selindex = 1
@@ -33,7 +33,7 @@ local function create_world_formspec(dialogdata)
        end
        mglist = mglist:sub(1, -2)
        
-       local gameid = core.setting_get("menu_last_game")
+       local gameid = core.settings:get("menu_last_game")
        
        local game, gameidx = nil , 0
        if gameid ~= nil then
@@ -46,7 +46,7 @@ local function create_world_formspec(dialogdata)
 
        current_seed = core.formspec_escape(current_seed)
        local retval =
-               "size[12,6,true]" ..
+               "size[11.5,6.5,true]" ..
                "label[2,0;" .. fgettext("World name") .. "]"..
                "field[4.5,0.4;6,0.5;te_world_name;;]" ..
 
@@ -60,8 +60,8 @@ local function create_world_formspec(dialogdata)
                "textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() ..
                ";" .. gameidx .. ";true]" ..
 
-               "button[5,5.5;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
-               "button[7.5,5.5;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
+               "button[3.25,6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
+               "button[5.75,6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
                
        if #gamemgr.games == 0 then
                retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..
@@ -85,35 +85,37 @@ local function create_world_buttonhandler(this, fields)
                local worldname = fields["te_world_name"]
                local gameindex = core.get_textlist_index("games")
 
-               if gameindex ~= nil and
-                       worldname ~= "" then
-
+               if gameindex ~= nil then
+                       if worldname == "" then
+                               local random_number = math.random(10000, 99999)
+                               local random_world_name = "Unnamed" .. random_number
+                               worldname = random_world_name
+                       end
                        local message = nil
 
+                       core.settings:set("fixed_map_seed", fields["te_seed"])
+
                        if not menudata.worldlist:uid_exists_raw(worldname) then
-                               core.setting_set("mg_name",fields["dd_mapgen"])
+                               core.settings:set("mg_name",fields["dd_mapgen"])
                                message = core.create_world(worldname,gameindex)
                        else
                                message = fgettext("A world named \"$1\" already exists", worldname)
                        end
 
-                       core.setting_set("fixed_map_seed", fields["te_seed"])
-
                        if message ~= nil then
                                gamedata.errormessage = message
                        else
-                               core.setting_set("menu_last_game",gamemgr.games[gameindex].id)
+                               core.settings:set("menu_last_game",gamemgr.games[gameindex].id)
                                if this.data.update_worldlist_filter then
                                        menudata.worldlist:set_filtercriteria(gamemgr.games[gameindex].id)
                                        mm_texture.update("singleplayer", gamemgr.games[gameindex].id)
                                end
                                menudata.worldlist:refresh()
-                               core.setting_set("mainmenu_last_selected_world",
+                               core.settings:set("mainmenu_last_selected_world",
                                                                        menudata.worldlist:raw_index_by_uid(worldname))
                        end
                else
-                       gamedata.errormessage =
-                               fgettext("No worldname given or no game selected")
+                       gamedata.errormessage = fgettext("No game selected")
                end
                this:delete()
                return true