Add luacheck, update translations, replace ABMs, bug fixes (#1)

* luacheck, mt 5 translation, german translation, maintenance

* fix luacheck warnings

* Fix digital clock nodebox and texture

* Fix luacheck usage

* Add comment why fonts are not split into several lines

13 files changed, 47 insertions, 221 deletions

diff --git a/steles/config.lua b/steles/config.lua
index 551429d..e53d9be 100644
--- a/steles/config.lua
+++ b/steles/config.lua
@@ -18,13 +18,13 @@
     along with steles.  If not, see <http://www.gnu.org/licenses/>.
 --]]
 
-local S = steles.intllib
+local S = steles.S
 
 steles.materials = {
-	'default:stone', 
-	'default:sandstone', 
+	'default:stone',
+	'default:sandstone',
 	'default:desert_stone',
-	'technic:marble', 
+	'technic:marble',
 	'technic:granite',
 }
 
diff --git a/steles/init.lua b/steles/init.lua
index e5d2430..43d9eed 100644
--- a/steles/init.lua
+++ b/steles/init.lua
@@ -22,9 +22,8 @@ steles = {}
 steles.name = minetest.get_current_modname()
 steles.path = minetest.get_modpath(steles.name)
 
--- Load support for intllib.
-local S, NS = dofile(steles.path.."/intllib.lua")
-steles.intllib = S
+-- Translation support
+steles.S = minetest.get_translator(steles.name)
 
 dofile(steles.path.."/config.lua")
 dofile(steles.path.."/nodes.lua")
diff --git a/steles/intllib.lua b/steles/intllib.lua
deleted file mode 100644
index 6669d72..0000000
--- a/steles/intllib.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext
diff --git a/steles/locale/fr.po b/steles/locale/fr.po
deleted file mode 100644
index 1785d8a..0000000
--- a/steles/locale/fr.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-05 10:06+0200\n"
-"PO-Revision-Date: 2017-08-05 09:03+0200\n"
-"Last-Translator: fat115 <fat115@framasoft.org>\n"
-"Language-Team: \n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: config.lua
-msgid "Stone Stele"
-msgstr "Stèle en pierre"
-
-#: config.lua
-msgid "Sandstone Stele"
-msgstr "Stèle en grès"
-
-#: config.lua
-msgid "Desert Stone Stele"
-msgstr "Stèle en pierre du désert"
-
-#: config.lua
-msgid "Marble Stele"
-msgstr "Stèle en marbre"
-
-#: config.lua
-msgid "Granite Stele"
-msgstr "Stèle en granit"
-
-#: nodes.lua
-msgid "Displayed text (3 lines max)"
-msgstr "Texte à afficher (3 lignes maxi.)"
-
-#: nodes.lua
-msgid "Write"
-msgstr "Écrire"
diff --git a/steles/locale/ms.po b/steles/locale/ms.po
deleted file mode 100644
index 1c58983..0000000
--- a/steles/locale/ms.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Yaya (Nurul Azeera Hidayah @ Muhammad Nur Hidayat) <translation@mnh48.moe>, 2017.
-msgid ""
-msgstr ""
-"Project-Id-Version: Display Modpack\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-26 11:29+0200\n"
-"PO-Revision-Date: 2020-07-05 11:34+0000\n"
-"Last-Translator: Yaya MNH48 <translation@mnh48.moe>\n"
-"Language-Team: Malay <translation@mnh48.moe>\n"
-"Language: ms\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.3\n"
-
-#: config.lua
-msgid "Stone Stele"
-msgstr "Tulisan Batu"
-
-#: config.lua
-msgid "Sandstone Stele"
-msgstr "Tulisan Batu Pasir"
-
-#: config.lua
-msgid "Desert Stone Stele"
-msgstr "Tulisan Batu Gurun"
-
-#: config.lua
-msgid "Marble Stele"
-msgstr "Tulisan Marmar"
-
-#: config.lua
-msgid "Granite Stele"
-msgstr "Tulisan Granit"
-
-#: nodes.lua
-msgid "Displayed text (3 lines max)"
-msgstr "Teks terpapar (maksimum 3 baris)"
-
-#: nodes.lua
-msgid "Write"
-msgstr "Tulis"
diff --git a/steles/locale/steles.de.tr b/steles/locale/steles.de.tr
new file mode 100644
index 0000000..10c32d6
--- /dev/null
+++ b/steles/locale/steles.de.tr
@@ -0,0 +1,9 @@
+# textdomain: steles
+Stone Stele=Stein Stele
+Sandstone Stele=Sandstein Stele
+Desert Stone Stele=Wüstenstein Stele
+Marble Stele=Mamor Stele
+Granite Stele=Granit Stele
+Displayed text (3 lines max)=Angezeigter Text (max. 3 Zeilen)
+Font=Schriftart
+Write=Schreiben
diff --git a/steles/locale/steles.fr.tr b/steles/locale/steles.fr.tr
new file mode 100644
index 0000000..7b0f91d
--- /dev/null
+++ b/steles/locale/steles.fr.tr
@@ -0,0 +1,9 @@
+# textdomain: steles
+Stone Stele=Stèle en pierre
+Sandstone Stele=Stèle en grès
+Desert Stone Stele=Stèle en pierre du désert
+Marble Stele=Stèle en marbre
+Granite Stele=Stèle en granit
+Displayed text (3 lines max)=
+Font=
+Write=
diff --git a/steles/locale/steles.ms.tr b/steles/locale/steles.ms.tr
new file mode 100644
index 0000000..38d3b15
--- /dev/null
+++ b/steles/locale/steles.ms.tr
@@ -0,0 +1,9 @@
+# textdomain: steles
+Stone Stele=Tulisan Batu
+Sandstone Stele=Tulisan Batu Pasir
+Desert Stone Stele=Tulisan Batu Gurun
+Marble Stele=Tulisan Marmar
+Granite Stele=Tulisan Granit
+Displayed text (3 lines max)=
+Font=
+Write=
diff --git a/steles/locale/template.pot b/steles/locale/template.pot
deleted file mode 100644
index 0144ace..0000000
--- a/steles/locale/template.pot
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-26 11:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: config.lua
-msgid "Stone Stele"
-msgstr ""
-
-#: config.lua
-msgid "Sandstone Stele"
-msgstr ""
-
-#: config.lua
-msgid "Desert Stone Stele"
-msgstr ""
-
-#: config.lua
-msgid "Marble Stele"
-msgstr ""
-
-#: config.lua
-msgid "Granite Stele"
-msgstr ""
-
-#: nodes.lua
-msgid "Displayed text (3 lines max)"
-msgstr ""
-
-#: nodes.lua
-msgid "Write"
-msgstr ""
diff --git a/steles/locale/template.txt b/steles/locale/template.txt
new file mode 100644
index 0000000..a8925b2
--- /dev/null
+++ b/steles/locale/template.txt
@@ -0,0 +1,9 @@
+# textdomain: steles
+Stone Stele=
+Sandstone Stele=
+Desert Stone Stele=
+Marble Stele=
+Granite Stele=
+Displayed text (3 lines max)=
+Font=
+Write=
diff --git a/steles/mod.conf b/steles/mod.conf
index b3d5264..cfbc038 100644
--- a/steles/mod.conf
+++ b/steles/mod.conf
@@ -2,4 +2,4 @@ name = steles
 title = Steles
 description = Stone steles with text display on them
 depends = default,display_api,font_api
-optional_depends = intllib,technic
+optional_depends = technic
diff --git a/steles/nodes.lua b/steles/nodes.lua
index 2245e20..a2aaa7d 100644
--- a/steles/nodes.lua
+++ b/steles/nodes.lua
@@ -18,8 +18,8 @@
     along with steles.  If not, see <http://www.gnu.org/licenses/>.
 --]]
 
-local S = steles.intllib
-local F = function(...) return minetest.formspec_escape(S(...)) end
+local S = steles.S
+local FS = function(...) return minetest.formspec_escape(S(...)) end
 
 display_api.register_display_entity("steles:text")
 
@@ -69,8 +69,8 @@ for i, material in ipairs(steles.materials) do
 						button[1,3;2,1;font;%s]
 						button_exit[3,3;2,1;ok;%s]]=],
 						default.gui_bg, default.gui_bg_img, default.gui_slots,
-						F("Displayed text (3 lines max)"),
-						F("Font"), F("Write")))
+						FS("Displayed text (3 lines max)"),
+						FS("Font"), FS("Write")))
 					display_api.on_construct(pos)
 				end,
 			on_destruct = display_api.on_destruct,
diff --git a/steles/tools/updatepo.sh b/steles/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/steles/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done