From 17fcbff3081b1a3788fd999a8ecca9d652429d6c Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 23 Feb 2019 20:24:59 +0000 Subject: [PATCH] Update minetest.conf.example and settings_translation_file.cpp (#8278) --- builtin/mainmenu/dlg_settings_advanced.lua | 5 +++-- builtin/mainmenu/generate_from_settingtypes.lua | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index cbeb6fe..bff36d8 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -1072,7 +1072,8 @@ function create_adv_settings_dlg() return dlg end --- Uncomment to generate minetest.conf.example and settings_translation_file.cpp --- For RUN_IN_PLACE the generated files may appear in the bin folder +-- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'. +-- For RUN_IN_PLACE the generated files may appear in the 'bin' folder. +-- See comment and alternative line at the end of 'generate_from_settingtypes.lua'. --assert(loadfile(core.get_builtin_path().."mainmenu"..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false)) diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua index 25cc446..43fc57b 100644 --- a/builtin/mainmenu/generate_from_settingtypes.lua +++ b/builtin/mainmenu/generate_from_settingtypes.lua @@ -121,6 +121,9 @@ file:write(create_minetest_conf_example()) file:close() file = assert(io.open("src/settings_translation_file.cpp", "w")) +-- If 'minetest.conf.example' appears in the 'bin' folder, the line below may have to be +-- used instead. The file will also appear in the 'bin' folder. +--file = assert(io.open("settings_translation_file.cpp", "w")) file:write(create_translation_file()) file:close()