From 94b9c545da09707764387aec479b9a196cc090ea Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 20 Mar 2019 13:30:28 +0100
Subject: [PATCH] Move away from intllib in favor of MT 5.0.0

---
 depends.txt                      |  1 -
 init.lua                         | 11 +----------
 locale/de.txt                    |  3 ---
 locale/hudbars.de.tr             |  4 ++++
 locale/{nl.txt => hudbars.it.tr} |  5 +++--
 locale/hudbars.ms.tr             |  4 ++++
 locale/{it.txt => hudbars.nl.tr} |  5 +++--
 locale/{pt.txt => hudbars.pt.tr} |  5 +++--
 locale/hudbars.tr.tr             |  4 ++++
 locale/ms.txt                    |  3 ---
 locale/template.txt              |  7 ++++---
 locale/tr.txt                    |  3 ---
 12 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 depends.txt
 delete mode 100644 locale/de.txt
 create mode 100644 locale/hudbars.de.tr
 rename locale/{nl.txt => hudbars.it.tr} (63%)
 create mode 100644 locale/hudbars.ms.tr
 rename locale/{it.txt => hudbars.nl.tr} (63%)
 rename locale/{pt.txt => hudbars.pt.tr} (69%)
 create mode 100644 locale/hudbars.tr.tr
 delete mode 100644 locale/ms.txt
 delete mode 100644 locale/tr.txt

diff --git a/depends.txt b/depends.txt
deleted file mode 100644
index 77e8d97..0000000
--- a/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-intllib?
diff --git a/init.lua b/init.lua
index fc43f85..d06455c 100644
--- a/init.lua
+++ b/init.lua
@@ -1,13 +1,4 @@
-local S
-if minetest.global_exists("intllib") then
-	if intllib.make_gettext_pair then
-		S = intllib.make_gettext_pair()
-	else
-		S = intllib.Getter()
-	end
-else
-	S = function ( s ) return s end
-end
+local S = minetest.get_translator("hudbars")
 
 hb = {}
 
diff --git a/locale/de.txt b/locale/de.txt
deleted file mode 100644
index 578764e..0000000
--- a/locale/de.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Health = Leben
-Breath = Atem
-%s: %d/%d = %s: %d/%d
diff --git a/locale/hudbars.de.tr b/locale/hudbars.de.tr
new file mode 100644
index 0000000..5188992
--- /dev/null
+++ b/locale/hudbars.de.tr
@@ -0,0 +1,4 @@
+# textdomain: hudbars
+Health=Leben
+Breath=Atem
+%s: %d/%d=%s: %d/%d
diff --git a/locale/nl.txt b/locale/hudbars.it.tr
similarity index 63%
rename from locale/nl.txt
rename to locale/hudbars.it.tr
index 33e161e..01b1c48 100644
--- a/locale/nl.txt
+++ b/locale/hudbars.it.tr
@@ -1,5 +1,6 @@
-Health = Gezondheid
-Breath = Adem
+# textdomain: hudbars
+Health=Salute
+Breath=Ossigeno
 
 # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
 %s: %d/%d
diff --git a/locale/hudbars.ms.tr b/locale/hudbars.ms.tr
new file mode 100644
index 0000000..0ab24fb
--- /dev/null
+++ b/locale/hudbars.ms.tr
@@ -0,0 +1,4 @@
+# textdomain: hudbars
+Health=Kesihatan
+Breath=Nafas
+%s: %d/%d=%s: %d/%d
diff --git a/locale/it.txt b/locale/hudbars.nl.tr
similarity index 63%
rename from locale/it.txt
rename to locale/hudbars.nl.tr
index 40558ac..e795d67 100644
--- a/locale/it.txt
+++ b/locale/hudbars.nl.tr
@@ -1,5 +1,6 @@
-Health = Salute
-Breath = Ossigeno
+# textdomain: hudbars
+Health=Gezondheid
+Breath=Adem
 
 # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
 %s: %d/%d
diff --git a/locale/pt.txt b/locale/hudbars.pt.tr
similarity index 69%
rename from locale/pt.txt
rename to locale/hudbars.pt.tr
index 2de6265..8d3fbee 100644
--- a/locale/pt.txt
+++ b/locale/hudbars.pt.tr
@@ -1,5 +1,6 @@
-Health = Saude
-Breath = Folego
+# textdomain: hudbars
+Health=Saude
+Breath=Folego
 
 # Formato de string padrão para progresso bar-style de barras do HUD, por exemplo “Saude 5/20”
 %s: %d/%d
diff --git a/locale/hudbars.tr.tr b/locale/hudbars.tr.tr
new file mode 100644
index 0000000..233f1be
--- /dev/null
+++ b/locale/hudbars.tr.tr
@@ -0,0 +1,4 @@
+# textdomain: hudbars
+Health=Can
+Breath=Nefes
+%s: %d/%d=%s: %d/%d
diff --git a/locale/ms.txt b/locale/ms.txt
deleted file mode 100644
index 35b4cc0..0000000
--- a/locale/ms.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Health = Kesihatan
-Breath = Nafas
-%s: %d/%d = %s: %d/%d
diff --git a/locale/template.txt b/locale/template.txt
index 0a26b8f..67398f0 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -1,5 +1,6 @@
-Health
-Breath
+# textdomain: hudbars
+Health=
+Breath=
 
 # Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
-%s: %d/%d
+%s: %d/%d=
diff --git a/locale/tr.txt b/locale/tr.txt
deleted file mode 100644
index b49c7a0..0000000
--- a/locale/tr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Health = Can
-Breath = Nefes
-%s: %d/%d = %s: %d/%d