master #1

Merged
BRNSystems merged 55 commits from Mirrorlandia_minetest/minetest:master into master 2023-11-24 22:11:18 +01:00
Showing only changes of commit af474d10a4 - Show all commits

@ -27,7 +27,6 @@ local full_settings = settingtypes.parse_config_file(false, true)
local info_icon_path = core.formspec_escape(defaulttexturedir .. "settings_info.png") local info_icon_path = core.formspec_escape(defaulttexturedir .. "settings_info.png")
local reset_icon_path = core.formspec_escape(defaulttexturedir .. "settings_reset.png") local reset_icon_path = core.formspec_escape(defaulttexturedir .. "settings_reset.png")
local gettext = fgettext_ne
local all_pages = {} local all_pages = {}
local page_by_id = {} local page_by_id = {}
local filtered_pages = all_pages local filtered_pages = all_pages
@ -66,23 +65,23 @@ local change_keys = {
add_page({ add_page({
id = "accessibility", id = "accessibility",
title = gettext("Accessibility"), title = fgettext_ne("Accessibility"),
content = { content = {
"language", "language",
{ heading = gettext("General") }, { heading = fgettext_ne("General") },
"font_size", "font_size",
"chat_font_size", "chat_font_size",
"gui_scaling", "gui_scaling",
"hud_scaling", "hud_scaling",
"show_nametag_backgrounds", "show_nametag_backgrounds",
{ heading = gettext("Chat") }, { heading = fgettext_ne("Chat") },
"console_height", "console_height",
"console_alpha", "console_alpha",
"console_color", "console_color",
{ heading = gettext("Controls") }, { heading = fgettext_ne("Controls") },
"autojump", "autojump",
"safe_dig_and_place", "safe_dig_and_place",
{ heading = gettext("Movement") }, { heading = fgettext_ne("Movement") },
"arm_inertia", "arm_inertia",
"view_bobbing_amount", "view_bobbing_amount",
"fall_bobbing_amount", "fall_bobbing_amount",
@ -97,7 +96,7 @@ local function load_settingtypes()
if not page then if not page then
page = add_page({ page = add_page({
id = (section or "general"):lower():gsub(" ", "_"), id = (section or "general"):lower():gsub(" ", "_"),
title = section or gettext("General"), title = section or fgettext_ne("General"),
section = section, section = section,
content = {}, content = {},
}) })
@ -123,7 +122,7 @@ local function load_settingtypes()
elseif entry.level == 2 then elseif entry.level == 2 then
ensure_page_started() ensure_page_started()
page.content[#page.content + 1] = { page.content[#page.content + 1] = {
heading = gettext(entry.readable_name or entry.name), heading = fgettext_ne(entry.readable_name or entry.name),
} }
end end
else else