From 60b1ce2229128e9acc85f7368373301d47a8655c Mon Sep 17 00:00:00 2001 From: DomtronVox Date: Mon, 4 May 2020 17:54:39 -0400 Subject: [PATCH] Updated the translation bits of the code so they use the now builtin minetest functions. Not able to add any more translations myself though. --- core.lua | 14 ++++---------- formspecs.lua | 8 +------- hud.lua | 12 +++--------- locale/de.txt | 20 -------------------- locale/quests.de.tr | 23 +++++++++++++++++++++++ locale/quests.template.tr | 22 ++++++++++++++++++++++ locale/template.txt | 20 -------------------- 7 files changed, 53 insertions(+), 66 deletions(-) delete mode 100644 locale/de.txt create mode 100644 locale/quests.de.tr create mode 100644 locale/quests.template.tr delete mode 100644 locale/template.txt diff --git a/core.lua b/core.lua index 9dc4f79..a4ae072 100644 --- a/core.lua +++ b/core.lua @@ -2,13 +2,7 @@ -- @module core -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - -- If you don't use insertions (@1, @2, etc) you can use this: - S = function(s) return s end -end +local S = minetest.get_translator("quests") local empty_callback = function(...) end local function compute_tasks(playername, questname, nocallback) @@ -230,7 +224,7 @@ function quests.start_quest(playername, questname, metadata) end quests.update_hud(playername) - quests.show_message("new", playername, S("New quest:") .. " " .. quest.title) + quests.show_message("new", playername, S("New quest") .. ": " .. quest.title) return true end @@ -522,7 +516,7 @@ function quests.accept_quest(playername, questname) end end handle_quest_end(playername, questname) - quests.show_message("success", playername, S("Quest completed:") .. " " .. quests.registered_quests[questname].title) + quests.show_message("success", playername, S("Quest completed") .. ": " .. quests.registered_quests[questname].title) minetest.after(3, function(playername, questname) quests.active_quests[playername][questname] = nil quests.update_hud(playername) @@ -565,7 +559,7 @@ function quests.abort_quest(playername, questname) local quest = quests.registered_quests[questname] quest.abortcallback(playername, questname, quests.active_quests[playername][questname].metadata) handle_quest_end(playername, questname) - quests.show_message("failed", playername, S("Quest failed:") .. " " .. quest.title) + quests.show_message("failed", playername, S("Quest failed") .. ": " .. quest.title) minetest.after(3, function(playername, questname) quests.active_quests[playername][questname] = nil quests.update_hud(playername) diff --git a/formspecs.lua b/formspecs.lua index 7c8860a..c573008 100644 --- a/formspecs.lua +++ b/formspecs.lua @@ -1,11 +1,5 @@ -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - -- If you don't use insertions (@1, @2, etc) you can use this: - S = function(s) return s end -end +local S = minetest.get_translator("quests") -- construct the questlog function quests.create_formspec(playername, tab, integrated) diff --git a/hud.lua b/hud.lua index 6b408f1..a806f18 100644 --- a/hud.lua +++ b/hud.lua @@ -2,13 +2,7 @@ -- @module hud -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - -- If you don't use insertions (@1, @2, etc) you can use this: - S = function(s) return s end -end +local S = minetest.get_translator("quests") local show_max = 10 -- the maximum visible quests. @@ -55,7 +49,7 @@ function quests.show_hud(playername, autohide) position = {x = hud_config.position.x, y = hud_config.position.y}, offset = {x = hud_config.offset.x, y = hud_config.offset.y - 20}, number = hud_config.number, - text = S("Quests:") + text = S("Quests") .. ":" }) quests.hud[playername].list = {} @@ -190,7 +184,7 @@ function quests.update_hud(playername) player:hud_change(quests.hud[playername].header, "text", S("No more Quests")) minetest.after(3, function(playername) if next(quests.active_quests[playername]) ~= nil then - player:hud_change(quests.hud[playername].header, "text", S("Quests:")) + player:hud_change(quests.hud[playername].header, "text", S("Quests")..":") quests.update_hud(playername) else quests.hide_hud(playername) diff --git a/locale/de.txt b/locale/de.txt deleted file mode 100644 index 10ca0d5..0000000 --- a/locale/de.txt +++ /dev/null @@ -1,20 +0,0 @@ -missing description = fehlende Beschreibung -missing title = fehlender Titel -Quests: = Quests: -No more Quests = Keine weiteren Quests -Abort quest = Quest abbrechen -Configure = Konfigurieren -Enable HUD = HUD einschalten -Autohide HUD = HUD automatisch verstecken -Exit = Verlassen -Failed quests = Gescheiterte Quests -Finished quests = Beendete Quests -Info = Info -No quest specified. = Keine Quest ausgewählt. -Open quests = Offene Quests -Return = Zurück -Show all open quests = Zeige alle offenen Quests -There are no quests in this category. = Es gibt keine Quests in dieser Kategorie. -New quest: = Neue Quest: -Quest completed: = Quest beendet: -Quest failed: = Quest gescheitert: diff --git a/locale/quests.de.tr b/locale/quests.de.tr new file mode 100644 index 0000000..27460e6 --- /dev/null +++ b/locale/quests.de.tr @@ -0,0 +1,23 @@ +# textdomain: quests +missing description=fehlende Beschreibung +missing title=fehlender Titel +Quests=Quests +No more Quests=Keine weiteren Quests +Abort quest=Quest abbrechen +Configure=Konfigurieren +Enable HUD=HUD einschalten +Autohide HUD=HUD automatisch verstecken +Exit=Verlassen +Failed quests=Gescheiterte Quests +Finished quests=Beendete Quests +Info=Info +No quest specified.=Keine Quest ausgewählt. +Open quests=Offene Quests +Return=Zurück +Show all open quests=Zeige alle offenen Quests +There are no quests in this category.=Es gibt keine Quests in dieser Kategorie. +New quest=Neue Quest +Quest completed=Quest beendet +Quest failed=Quest gescheitert +Central messages=Zentrale nachrichten + diff --git a/locale/quests.template.tr b/locale/quests.template.tr new file mode 100644 index 0000000..8c24a95 --- /dev/null +++ b/locale/quests.template.tr @@ -0,0 +1,22 @@ +# textdomain: quests +missing description= +missing title= +Quests= +No more Quests= +Abort quest= +Configure= +Enable HUD= +Autohide HUD= +Exit= +Failed quests= +Finished quests= +Info= +No quest specified.= +Open quests= +Return= +Show all open quests= +There are no quests in this category.= +New quest= +Quest completed= +Quest failed= +Central messages= diff --git a/locale/template.txt b/locale/template.txt deleted file mode 100644 index 76e1b77..0000000 --- a/locale/template.txt +++ /dev/null @@ -1,20 +0,0 @@ -missing description = -missing title = -Quests: = -No more Quests = -Abort quest = -Configure = -Enable HUD = -Autohide HUD = -Exit = -Failed quests = -Finished quests = -Info = -No quest specified. = -Open quests = -Return = -Show all open quests = -There are no quests in this category. = -New quest: = -Quest completed: = -Quest failed: =