mtcontrib
/
minetest_hudbars
mirror of https://repo.or.cz/minetest_hudbars.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Fix translation of format string

This commit is contained in:
Wuzzy 2019-03-20 13:38:31 +01:00
parent 1568d1f418
commit 5710667766
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init.lua
View File

@ -1,4 +1,5 @@
local S = minetest.get_translator("hudbars") local S = minetest.get_translator("hudbars")
local N = function(s) return s end
hb = {} hb = {}
@ -123,7 +124,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
end end
end end
if format_string == nil then if format_string == nil then
format_string = S("%s: %d/%d") format_string = N("@1: @2/@3")
end end
hudtable.add_all = function(player, hudtable, start_value, start_max, start_hidden) hudtable.add_all = function(player, hudtable, start_value, start_max, start_hidden)
@ -148,7 +149,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
iconscale = { x=1, y=1 } iconscale = { x=1, y=1 }
barnumber = hb.value_to_barlength(start_value, start_max) barnumber = hb.value_to_barlength(start_value, start_max)
bgiconnumber = hb.settings.statbar_length bgiconnumber = hb.settings.statbar_length
text = string.format(format_string, label, start_value, start_max) text = S(format_string, label, start_value, start_max)
end end
if hb.settings.bar_type == "progress_bar" then if hb.settings.bar_type == "progress_bar" then
ids.bg = player:hud_add({ ids.bg = player:hud_add({
@ -298,7 +299,7 @@ function hb.change_hudbar(player, identifier, new_value, new_max_value, new_icon
end end
if new_label ~= nil then if new_label ~= nil then
hudtable.label = new_label hudtable.label = new_label
local new_text = string.format(hudtable.format_string, new_label, hudtable.hudstate[name].value, hudtable.hudstate[name].max) local new_text = S(hudtable.format_string, new_label, hudtable.hudstate[name].value, hudtable.hudstate[name].max)
player:hud_change(hudtable.hudids[name].text, "text", new_text) player:hud_change(hudtable.hudids[name].text, "text", new_text)
end end
if new_text_color ~= nil then if new_text_color ~= nil then
@ -342,7 +343,7 @@ function hb.change_hudbar(player, identifier, new_value, new_max_value, new_icon
end end
if hb.settings.bar_type == "progress_bar" then if hb.settings.bar_type == "progress_bar" then
local new_text = string.format(hudtable.format_string, hudtable.label, new_value, new_max_value) local new_text = S(hudtable.format_string, hudtable.label, new_value, new_max_value)
if new_text ~= hudtable.hudstate[name].text then if new_text ~= hudtable.hudstate[name].text then
player:hud_change(hudtable.hudids[name].text, "text", new_text) player:hud_change(hudtable.hudids[name].text, "text", new_text)
hudtable.hudstate[name].text = new_text hudtable.hudstate[name].text = new_text
@ -389,7 +390,7 @@ function hb.unhide_hudbar(player, identifier)
if hudtable.hudstate[name].max ~= 0 then if hudtable.hudstate[name].max ~= 0 then
player:hud_change(hudtable.hudids[name].bg, "scale", {x=1,y=1}) player:hud_change(hudtable.hudids[name].bg, "scale", {x=1,y=1})
end end
player:hud_change(hudtable.hudids[name].text, "text", tostring(string.format(hudtable.format_string, hudtable.label, value, max))) player:hud_change(hudtable.hudids[name].text, "text", tostring(S(hudtable.format_string, hudtable.label, value, max)))
elseif hb.settings.bar_type == "statbar_modern" then elseif hb.settings.bar_type == "statbar_modern" then
player:hud_change(hudtable.hudids[name].bg, "number", hb.settings.statbar_length) player:hud_change(hudtable.hudids[name].bg, "number", hb.settings.statbar_length)
end end

2
locale/hudbars.de.tr
View File

@ -1,4 +1,4 @@
# textdomain: hudbars # textdomain: hudbars
Health=Leben Health=Leben
Breath=Atem Breath=Atem
%s: %d/%d=%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/hudbars.it.tr
View File

@ -3,4 +3,4 @@ Health=Salute
Breath=Ossigeno Breath=Ossigeno
# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/hudbars.ms.tr
View File

@ -1,4 +1,4 @@
# textdomain: hudbars # textdomain: hudbars
Health=Kesihatan Health=Kesihatan
Breath=Nafas Breath=Nafas
%s: %d/%d=%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/hudbars.nl.tr
View File

@ -3,4 +3,4 @@ Health=Gezondheid
Breath=Adem Breath=Adem
# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/hudbars.pt.tr
View File

@ -3,4 +3,4 @@ Health=Saude
Breath=Folego Breath=Folego
# Formato de string padrão para progresso bar-style de barras do HUD, por exemplo “Saude 5/20” # Formato de string padrão para progresso bar-style de barras do HUD, por exemplo “Saude 5/20”
%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/hudbars.tr.tr
View File

@ -1,4 +1,4 @@
# textdomain: hudbars # textdomain: hudbars
Health=Can Health=Can
Breath=Nefes Breath=Nefes
%s: %d/%d=%s: %d/%d @1: @2/@3=@1: @2/@3

2
locale/template.txt
View File

@ -3,4 +3,4 @@ Health=
Breath= Breath=
# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
%s: %d/%d= @1: @2/@3=