From 7317fc0f5fe713a8384266f788e16169adf2c515 Mon Sep 17 00:00:00 2001
From: Louis <55180044+louisroyer@users.noreply.github.com>
Date: Sat, 8 Feb 2020 17:06:17 +0100
Subject: [PATCH] Use MT-5 translation system for concrete mod

---
 concrete/depends.txt                      |  1 -
 concrete/init.lua                         |  4 ++--
 concrete/locale/de.txt                    | 10 ----------
 concrete/locale/es.txt                    |  8 --------
 concrete/locale/fr.txt                    |  7 -------
 concrete/locale/pl.txt                    | 10 ----------
 concrete/locale/pt_BR.txt                 | 10 ----------
 concrete/locale/technic_concrete.de.tr    | 12 ++++++++++++
 concrete/locale/technic_concrete.es.tr    | 10 ++++++++++
 concrete/locale/technic_concrete.fr.tr    |  9 +++++++++
 concrete/locale/technic_concrete.pl.tr    | 12 ++++++++++++
 concrete/locale/technic_concrete.pt_BR.tr | 12 ++++++++++++
 concrete/locale/technic_concrete.tr.tr    |  9 +++++++++
 concrete/locale/template.txt              | 12 +++++++-----
 concrete/locale/tr.txt                    |  7 -------
 concrete/mod.conf                         |  2 +-
 16 files changed, 74 insertions(+), 61 deletions(-)
 delete mode 100644 concrete/locale/de.txt
 delete mode 100644 concrete/locale/es.txt
 delete mode 100644 concrete/locale/fr.txt
 delete mode 100644 concrete/locale/pl.txt
 delete mode 100644 concrete/locale/pt_BR.txt
 create mode 100644 concrete/locale/technic_concrete.de.tr
 create mode 100644 concrete/locale/technic_concrete.es.tr
 create mode 100644 concrete/locale/technic_concrete.fr.tr
 create mode 100644 concrete/locale/technic_concrete.pl.tr
 create mode 100644 concrete/locale/technic_concrete.pt_BR.tr
 create mode 100644 concrete/locale/technic_concrete.tr.tr
 delete mode 100644 concrete/locale/tr.txt

diff --git a/concrete/depends.txt b/concrete/depends.txt
index 5ca909c..0f8b4d9 100644
--- a/concrete/depends.txt
+++ b/concrete/depends.txt
@@ -1,4 +1,3 @@
 default
 basic_materials
-intllib?
 moreblocks?
diff --git a/concrete/init.lua b/concrete/init.lua
index ced0471..24330f5 100644
--- a/concrete/init.lua
+++ b/concrete/init.lua
@@ -4,8 +4,8 @@
 local technic = rawget(_G, "technic") or {}
 technic.concrete_posts = {}
 
--- Boilerplate to support localized strings if intllib mod is installed.
-local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+-- Translation support
+local S = minetest.get_translator("technic_concrete")
 
 for i = 0, 31 do
 	minetest.register_alias("technic:concrete_post"..i,
diff --git a/concrete/locale/de.txt b/concrete/locale/de.txt
deleted file mode 100644
index 83fdc19..0000000
--- a/concrete/locale/de.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# German Translation for technic_concrete
-# Deutsche Übersetzung von technic_concrete
-# by Xanthin
-
-Rebar = Bewehrungsstab
-Concrete Block = Betonblock
-Blast-resistant Concrete Block = Explosionsbestaendiger Betonblock
-Concrete Post Platform = Betonpfostenplattform
-Concrete Post = Betonpfosten
-
diff --git a/concrete/locale/es.txt b/concrete/locale/es.txt
deleted file mode 100644
index b7ea30a..0000000
--- a/concrete/locale/es.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# technic_concrete traducido por Carlos Barraza
-
-Rebar = Barra de refuerzo
-Concrete Block = Bloque de concreto
-Blast-resistant Concrete Block = Bloque de concreto resistente a explosiones
-Concrete Post Platform = Plataforma de concreto
-Concrete Post = Postes de concreto
-
diff --git a/concrete/locale/fr.txt b/concrete/locale/fr.txt
deleted file mode 100644
index 4af4530..0000000
--- a/concrete/locale/fr.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# technic_concrete translation template
-
-Rebar                           = Armature
-Concrete Block                  = Bloc de béton
-Blast-resistant Concrete Block  = Bloc de béton anti explosions
-Concrete Post Platform          = Plateforme en béton
-Concrete Post                   = Pilier en béton
diff --git a/concrete/locale/pl.txt b/concrete/locale/pl.txt
deleted file mode 100644
index 3b2e6f5..0000000
--- a/concrete/locale/pl.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Polish Translation for technic_concrete
-# Polskie tłumaczenie technic_concrete
-# by mat9117
-
-Rebar = Pręt zbrojeniowy
-Concrete Block = Blok betonu
-Blast-resistant Concrete Block = Przeciwwybuchowy blok betonu
-Concrete Post Platform = Betonowa platforma
-Concrete Post = Betonowy słup
-
diff --git a/concrete/locale/pt_BR.txt b/concrete/locale/pt_BR.txt
deleted file mode 100644
index 057ace5..0000000
--- a/concrete/locale/pt_BR.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Braziliam portuguese translation for technic_concrete
-# Tradução portuguesa brasileira para technic_concrete
-# By Sires
-
-Rebar = Vergalhão
-Concrete Block = Bloco de Concreto
-Blast-resistant Concrete Block = Bloco de Concreto resistente-a-explosões
-Concrete Post Platform = Plataforma para Poste de Concreto
-Concrete Post = Poste de Concreto
-
diff --git a/concrete/locale/technic_concrete.de.tr b/concrete/locale/technic_concrete.de.tr
new file mode 100644
index 0000000..171b4e1
--- /dev/null
+++ b/concrete/locale/technic_concrete.de.tr
@@ -0,0 +1,12 @@
+# textdomain: technic_concrete
+
+# German Translation for technic_concrete
+# Deutsche Übersetzung von technic_concrete
+# by Xanthin
+
+Rebar=Bewehrungsstab
+Concrete Block=Betonblock
+Blast-resistant Concrete Block=Explosionsbestaendiger Betonblock
+Concrete Post Platform=Betonpfostenplattform
+Concrete Post=Betonpfosten
+
diff --git a/concrete/locale/technic_concrete.es.tr b/concrete/locale/technic_concrete.es.tr
new file mode 100644
index 0000000..1856711
--- /dev/null
+++ b/concrete/locale/technic_concrete.es.tr
@@ -0,0 +1,10 @@
+# textdomain: technic_concrete
+
+# technic_concrete traducido por Carlos Barraza
+
+Rebar=Barra de refuerzo
+Concrete Block=Bloque de concreto
+Blast-resistant Concrete Block=Bloque de concreto resistente a explosiones
+Concrete Post Platform=Plataforma de concreto
+Concrete Post=Postes de concreto
+
diff --git a/concrete/locale/technic_concrete.fr.tr b/concrete/locale/technic_concrete.fr.tr
new file mode 100644
index 0000000..ef23c54
--- /dev/null
+++ b/concrete/locale/technic_concrete.fr.tr
@@ -0,0 +1,9 @@
+# textdomain: technic_concrete
+
+# technic_concrete translation template
+
+Rebar=Armature
+Concrete Block=Bloc de béton
+Blast-resistant Concrete Block=Bloc de béton anti explosions
+Concrete Post Platform=Plateforme en béton
+Concrete Post=Pilier en béton
diff --git a/concrete/locale/technic_concrete.pl.tr b/concrete/locale/technic_concrete.pl.tr
new file mode 100644
index 0000000..1d51a56
--- /dev/null
+++ b/concrete/locale/technic_concrete.pl.tr
@@ -0,0 +1,12 @@
+# textdomain: technic_concrete
+
+# Polish Translation for technic_concrete
+# Polskie tłumaczenie technic_concrete
+# by mat9117
+
+Rebar=Pręt zbrojeniowy
+Concrete Block=Blok betonu
+Blast-resistant Concrete Block=Przeciwwybuchowy blok betonu
+Concrete Post Platform=Betonowa platforma
+Concrete Post=Betonowy słup
+
diff --git a/concrete/locale/technic_concrete.pt_BR.tr b/concrete/locale/technic_concrete.pt_BR.tr
new file mode 100644
index 0000000..56d2daa
--- /dev/null
+++ b/concrete/locale/technic_concrete.pt_BR.tr
@@ -0,0 +1,12 @@
+# textdomain: technic_concrete
+
+# Braziliam portuguese translation for technic_concrete
+# Tradução portuguesa brasileira para technic_concrete
+# By Sires
+
+Rebar=Vergalhão
+Concrete Block=Bloco de Concreto
+Blast-resistant Concrete Block=Bloco de Concreto resistente-a-explosões
+Concrete Post Platform=Plataforma para Poste de Concreto
+Concrete Post=Poste de Concreto
+
diff --git a/concrete/locale/technic_concrete.tr.tr b/concrete/locale/technic_concrete.tr.tr
new file mode 100644
index 0000000..1d407ff
--- /dev/null
+++ b/concrete/locale/technic_concrete.tr.tr
@@ -0,0 +1,9 @@
+# textdomain: technic_concrete
+
+# turkish translation by mahmutelmas06
+
+Rebar=Beton demiri
+Concrete Block=Beton blok
+Blast-resistant Concrete Block=Patlamaya dayanıklı beton blok
+Concrete Post Platform=Beton direk platformu
+Concrete Post=Beton direk
diff --git a/concrete/locale/template.txt b/concrete/locale/template.txt
index 451adaf..9bab91c 100644
--- a/concrete/locale/template.txt
+++ b/concrete/locale/template.txt
@@ -1,8 +1,10 @@
+# textdomain: technic_concrete
+
 # technic_concrete translation template
 
-Rebar =
-Concrete Block =
-Blast-resistant Concrete Block =
-Concrete Post Platform =
-Concrete Post =
+Rebar=
+Concrete Block=
+Blast-resistant Concrete Block=
+Concrete Post Platform=
+Concrete Post=
 
diff --git a/concrete/locale/tr.txt b/concrete/locale/tr.txt
deleted file mode 100644
index 179d29b..0000000
--- a/concrete/locale/tr.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# turkish translation by mahmutelmas06
-
-Rebar = Beton demiri
-Concrete Block = Beton blok
-Blast-resistant Concrete Block = Patlamaya dayanıklı beton blok
-Concrete Post Platform = Beton direk platformu
-Concrete Post = Beton direk
diff --git a/concrete/mod.conf b/concrete/mod.conf
index 506f906..df9a461 100644
--- a/concrete/mod.conf
+++ b/concrete/mod.conf
@@ -1,3 +1,3 @@
 name = concrete
 depends = default
-optional_depends = basic_materials, intllib, moreblocks
+optional_depends = basic_materials, moreblocks