Merge branch 'master' into nalc-1.2

README.md

@@ -1,6 +1,6 @@
 # HUD bar for `3d_armor` [`hbarmor`]
 
-* Version: 0.4.0
+* Version: 1.0.0
 
 ## Description
 This mod adds a simple HUD bar which displays the current damage
@@ -16,8 +16,8 @@ only how worn out it already is.
 By default, the armor bar is hidden if the player wears no armor.
 
 ## Dependencies
-* HUD bars [`hudbars`], major version 1
+* HUD bars [`hudbars`], major version 2
-* 3D Armor [`3d_armor`] (tested with Minetest 0.4.14)
+* 3D Armor [`3d_armor`] (tested with Minetest 5.0.0)
 
 ## Licensing
 This mod is entirly free softare.

depends.txt

@@ -1,3 +0,0 @@
-hudbars
-3d_armor
-intllib?

description.txt

@@ -1 +0,0 @@
-Adds a HUD bar displaying the current damage of the player's armor.

init.lua

@@ -1,9 +1,5 @@
-local S
+local S = minetest.get_translator("hbarmor")
-if (minetest.get_modpath("intllib")) then
+local N = function(s) return s end
-	S = intllib.Getter()
-else
-	S = function ( s ) return s end
-end
 
 if (not armor) or (not armor.def) then
 	minetest.log("error", "[hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!")
@@ -65,7 +61,7 @@ local function custom_hud(player)
 end
 
 --register and define armor HUD bar
-hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, S("%s: %d%%"))
+hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, N("@1: @2%"), { order = { "label", "value" }, textdomain = "hbarmor" } )
 
 function hbarmor.get_armor(player)
 	if not player or not armor.def then

locale/de.txt

@@ -1,2 +0,0 @@
-Armor = Panzerung
-%s: %d%% = %s: %d%%

locale/hbarmor.de.tr

@@ -0,0 +1,3 @@
+# textdomain:hbarmor
+Armor=Panzerung
+@1: @2%=@1: @2%

locale/hbarmor.it.tr

@@ -0,0 +1,3 @@
+# textdomain:hbarmor
+Armor=Armatura
+@1: @2%=@1:@2%

locale/it.txt

@@ -1,4 +0,0 @@
-Armor = Armatura
-
-# Format string for displaying the armor. E.g. "Armor: 100%"
-%s: %d%% =

locale/template.txt

@@ -1,4 +1,5 @@
-Armor =
+# textdomain:hbarmor
+Armor=
 
 # Format string for displaying the armor. E.g. "Armor: 100%"
-%s: %d%% =
+@1: @2%=

mod.conf

@@ -1 +1,3 @@
 name = hbarmor
+description = Adds a HUD bar displaying the current damage of the player's armor.
+depends = hudbars, 3d_armor