diff --git a/.luacheckrc b/.luacheckrc index 38c2559..5c9af0f 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -12,6 +12,5 @@ read_globals = { "ItemStack", "vector", "default", -- Mod deps - "intllib", "screwdriver", } diff --git a/api.lua b/api.lua index c2c329e..35384d0 100644 --- a/api.lua +++ b/api.lua @@ -1,6 +1,6 @@ -- signs_lib api, backported from street_signs -local S = signs_lib.gettext +local S = signs_lib.S local function get_sign_formspec() end diff --git a/init.lua b/init.lua index d094dbb..7ee6c59 100644 --- a/init.lua +++ b/init.lua @@ -7,8 +7,7 @@ signs_lib = {} signs_lib.path = minetest.get_modpath(minetest.get_current_modname()) -local S = dofile(signs_lib.path .. "/intllib.lua") -signs_lib.gettext = S +signs_lib.S = minetest.get_translator(minetest.get_current_modname()) dofile(signs_lib.path.."/encoding.lua") dofile(signs_lib.path.."/api.lua") diff --git a/intllib.lua b/intllib.lua deleted file mode 100644 index 6669d72..0000000 --- a/intllib.lua +++ /dev/null @@ -1,45 +0,0 @@ - --- Fallback functions for when `intllib` is not installed. --- Code released under Unlicense . - --- 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/locale/de.po b/locale/de.po deleted file mode 100644 index a2f4150..0000000 --- a/locale/de.po +++ /dev/null @@ -1,97 +0,0 @@ -# German Translation for the signs_lib mod. -# Copyright (C) 2018 Vanessa Ezekowitz -# This file is distributed under the same license as the signs_lib package. -# Xanthin, 2017. -# CodeXP , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 18:31+0200\n" -"PO-Revision-Date: 2018-03-24 22:00+0100\n" -"Last-Translator: CodeXP \n" -"Language-Team: \n" -"Language: de\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" - -#: init.lua -msgid "Write" -msgstr "schreiben" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "gesperrter Schild, gehört @1\n" - -#: init.lua -msgid "locked " -msgstr "gesperrt " - -#: init.lua -#, fuzzy -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "@1 schrieb \"@2\" auf das @3Schild bei @4" - -#: init.lua -msgid "Sign" -msgstr "Schild" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "Kann alle gesperrte Schilder bearbeiten" - -#: init.lua -msgid "Locked Sign" -msgstr "gesperrter Schild" - -#: init.lua -msgid "green" -msgstr "grün" - -#: init.lua -msgid "yellow" -msgstr "gelb" - -#: init.lua -msgid "red" -msgstr "rot" - -#: init.lua -msgid "white_red" -msgstr "weißrot" - -#: init.lua -msgid "white_black" -msgstr "schwarzweiß" - -#: init.lua -msgid "orange" -msgstr "orange" - -#: init.lua -msgid "blue" -msgstr "blau" - -#: init.lua -msgid "brown" -msgstr "braun" - -#: init.lua -msgid "Sign (@1, metal)" -msgstr "Schild (@1, Metall)" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "Versuch ein unbekanntes Element als Zaun zu registrieren" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "Registrierte @1 und @2" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "[MOD] Schilder-Mod geladen" diff --git a/locale/es.po b/locale/es.po deleted file mode 100644 index 8579937..0000000 --- a/locale/es.po +++ /dev/null @@ -1,95 +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 , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 18:22+0200\n" -"PO-Revision-Date: 2017-07-31 18:30+0200\n" -"Language-Team: \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" -"Last-Translator: Carlos Barraza\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: es\n" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "" - -#: init.lua -msgid "locked " -msgstr "bloqueada " - -#: init.lua -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "@1 escribio \"@2\" en el cartel @3en @4" - -#: init.lua -msgid "Sign" -msgstr "Letrero" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "" - -#: init.lua -#, fuzzy -msgid "Locked Sign" -msgstr "Letrero bloqueada" - -#: init.lua -msgid "green" -msgstr "verde" - -#: init.lua -msgid "yellow" -msgstr "amarillo" - -#: init.lua -msgid "red" -msgstr "rojo" - -#: init.lua -#, fuzzy -msgid "white_red" -msgstr "rojo y blanco" - -#: init.lua -#, fuzzy -msgid "white_black" -msgstr "negro y blanco" - -#: init.lua -msgid "orange" -msgstr "naranja" - -#: init.lua -msgid "blue" -msgstr "azul" - -#: init.lua -msgid "brown" -msgstr "marrón" - -#: init.lua -#, fuzzy -msgid "Sign (@1, metal)" -msgstr "Letrero (@1, metal)" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "Registrado @1 y @2" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "[MOD] signs cargados" diff --git a/locale/fr.po b/locale/fr.po deleted file mode 100644 index a503574..0000000 --- a/locale/fr.po +++ /dev/null @@ -1,91 +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 , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 18:13+0200\n" -"PO-Revision-Date: 2017-07-31 18:22+0200\n" -"Language-Team: \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" -"Last-Translator: fat115 \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr\n" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "Panneau verrouillé, appartient à @1\n" - -#: init.lua -msgid "locked " -msgstr "verrouillé " - -#: init.lua -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "@1 a écrit \"@2\" sur le panneau @3en @4" - -#: init.lua -msgid "Sign" -msgstr "Panneau" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "Peut modifier les panneaux verrouillés" - -#: init.lua -msgid "Locked Sign" -msgstr "Panneau (verrouillé)" - -#: init.lua -msgid "green" -msgstr "vert" - -#: init.lua -msgid "yellow" -msgstr "jaune" - -#: init.lua -msgid "red" -msgstr "rouge" - -#: init.lua -msgid "white_red" -msgstr "rouge et blanc" - -#: init.lua -msgid "white_black" -msgstr "noir et blanc" - -#: init.lua -msgid "orange" -msgstr "orange" - -#: init.lua -msgid "blue" -msgstr "bleu" - -#: init.lua -msgid "brown" -msgstr "marron" - -#: init.lua -msgid "Sign (@1, metal)" -msgstr "Panneau (@1, métal)" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "Tentative d'enregistrer un nœud inconnu comme barrière" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "Enregistrement de @1 et @" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "[MOD] signs chargé" diff --git a/locale/ms.po b/locale/ms.po deleted file mode 100644 index da11512..0000000 --- a/locale/ms.po +++ /dev/null @@ -1,91 +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 , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 18:00+0200\n" -"PO-Revision-Date: 2017-11-17 02:38+0800\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.4\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=1; plural=0;\n" -"Language: ms\n" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "Papan tanda berkunci, milik @1\n" - -#: init.lua -msgid "locked " -msgstr "berkunci " - -#: init.lua -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "@1 menulis \"@2\" atas papan tanda @3dekat @4" - -#: init.lua -msgid "Sign" -msgstr "Papan Tanda" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "Boleh sunting semua papan tanda berkunci" - -#: init.lua -msgid "Locked Sign" -msgstr "Papan Tanda Berkunci" - -#: init.lua -msgid "green" -msgstr "hijau" - -#: init.lua -msgid "yellow" -msgstr "kuning" - -#: init.lua -msgid "red" -msgstr "merah" - -#: init.lua -msgid "white_red" -msgstr "putih_merah" - -#: init.lua -msgid "white_black" -msgstr "putih_hitam" - -#: init.lua -msgid "orange" -msgstr "jingga" - -#: init.lua -msgid "blue" -msgstr "biru" - -#: init.lua -msgid "brown" -msgstr "perang" - -#: init.lua -msgid "Sign (@1, metal)" -msgstr "Papan Tanda (@1, logam)" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "Cuba untuk mendaftar nod tidak diketahui sebagai pagar" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "Telah daftar @1 dan @2" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "[MODS] signs telah dimuatkan" diff --git a/locale/ru.po b/locale/ru.po deleted file mode 100644 index 9cd01aa..0000000 --- a/locale/ru.po +++ /dev/null @@ -1,94 +0,0 @@ -# Russian Translation for the signs_lib mod. -# Copyright (C) 2018 Vanessa Ezekowitz -# This file is distributed under the same license as the signs_lib package. -# CodeXP , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: signs_lib\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-24 22:23+0100\n" -"PO-Revision-Date: \n" -"Last-Translator: CodeXP \n" -"Language-Team: \n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: init.lua -msgid "Write" -msgstr "записать" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "защищенная табличка, пренадлежит @1\n" - -#: init.lua -msgid "locked " -msgstr "защищенный " - -#: init.lua -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "@1 записал \"@2\" в @3sign на @4" - -#: init.lua -msgid "Sign" -msgstr "табличка" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "Может редактировать все защищенные таблички" - -#: init.lua -msgid "Locked Sign" -msgstr "защищенная табличка" - -#: init.lua -msgid "green" -msgstr "зеленая" - -#: init.lua -msgid "yellow" -msgstr "желтая" - -#: init.lua -msgid "red" -msgstr "красная" - -#: init.lua -msgid "white_red" -msgstr "краснобелая" - -#: init.lua -msgid "white_black" -msgstr "чернобелая" - -#: init.lua -msgid "orange" -msgstr "оранжевая" - -#: init.lua -msgid "blue" -msgstr "синея" - -#: init.lua -msgid "brown" -msgstr "коричневая" - -#: init.lua -msgid "Sign (@1, metal)" -msgstr "Табличка (@1, металл)" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "Попытка зарегистрировать неизвестный узел как забор" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "Зарегистрировано @1 для @2" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "[MOD] мод табличек загружен" diff --git a/locale/signs_lib.de.tr b/locale/signs_lib.de.tr new file mode 100644 index 0000000..0922c26 --- /dev/null +++ b/locale/signs_lib.de.tr @@ -0,0 +1,27 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n=gesperrter Schild, gehört @1@n +Write=schreiben +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= + + +##### not used anymore ##### + +locked =gesperrt +@1 wrote "@2" to @3sign at @4=@1 schrieb "@2" auf das @3Schild bei @4 +Sign=Schild +Can edit all locked signs=Kann alle gesperrte Schilder bearbeiten +Locked Sign=gesperrter Schild +green=grün +yellow=gelb +red=rot +white_red=weißrot +white_black=schwarzweiß +orange=orange +blue=blau +brown=braun +Sign (@1, metal)=Schild (@1, Metall) +Attempt to register unknown node as fence=Versuch ein unbekanntes Element als Zaun zu registrieren +Registered @1 and @2=Registrierte @1 und @2 +[MOD] signs loaded=[MOD] Schilder-Mod geladen diff --git a/locale/signs_lib.es.tr b/locale/signs_lib.es.tr new file mode 100644 index 0000000..d66faf4 --- /dev/null +++ b/locale/signs_lib.es.tr @@ -0,0 +1,25 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n= +Write= +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= + + +##### not used anymore ##### + +locked =bloqueada +@1 wrote "@2" to @3sign at @4=@1 escribio "@2" en el cartel @3en @4 +Sign=Letrero +Locked Sign=Letrero bloqueada +green=verde +yellow=amarillo +red=rojo +white_red=rojo y blanco +white_black=negro y blanco +orange=naranja +blue=azul +brown=marrón +Sign (@1, metal)=Letrero (@1, metal) +Registered @1 and @2=Registrado @1 y @2 +[MOD] signs loaded=[MOD] signs cargados diff --git a/locale/signs_lib.fr.tr b/locale/signs_lib.fr.tr new file mode 100644 index 0000000..a00ddfc --- /dev/null +++ b/locale/signs_lib.fr.tr @@ -0,0 +1,27 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n=Panneau verrouillé, appartient à @1@n +Write= +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= + + +##### not used anymore ##### + +locked =verrouillé +@1 wrote "@2" to @3sign at @4=@1 a écrit "@2" sur le panneau @3en @4 +Sign=Panneau +Can edit all locked signs=Peut modifier les panneaux verrouillés +Locked Sign=Panneau (verrouillé) +green=vert +yellow=jaune +red=rouge +white_red=rouge et blanc +white_black=noir et blanc +orange=orange +blue=bleu +brown=marron +Sign (@1, metal)=Panneau (@1, métal) +Attempt to register unknown node as fence=Tentative d'enregistrer un nœud inconnu comme barrière +Registered @1 and @2=Enregistrement de @1 et @ +[MOD] signs loaded=[MOD] signs chargé diff --git a/locale/signs_lib.ms.tr b/locale/signs_lib.ms.tr new file mode 100644 index 0000000..bcf4324 --- /dev/null +++ b/locale/signs_lib.ms.tr @@ -0,0 +1,27 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n=Papan tanda berkunci, milik @1@n +Write= +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= + + +##### not used anymore ##### + +locked =berkunci +@1 wrote "@2" to @3sign at @4=@1 menulis "@2" atas papan tanda @3dekat @4 +Sign=Papan Tanda +Can edit all locked signs=Boleh sunting semua papan tanda berkunci +Locked Sign=Papan Tanda Berkunci +green=hijau +yellow=kuning +red=merah +white_red=putih_merah +white_black=putih_hitam +orange=jingga +blue=biru +brown=perang +Sign (@1, metal)=Papan Tanda (@1, logam) +Attempt to register unknown node as fence=Cuba untuk mendaftar nod tidak diketahui sebagai pagar +Registered @1 and @2=Telah daftar @1 dan @2 +[MOD] signs loaded=[MODS] signs telah dimuatkan diff --git a/locale/signs_lib.ru.tr b/locale/signs_lib.ru.tr new file mode 100644 index 0000000..6698074 --- /dev/null +++ b/locale/signs_lib.ru.tr @@ -0,0 +1,27 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n=защищенная табличка, пренадлежит @1@n +Write=записать +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= + + +##### not used anymore ##### + +locked =защищенный +@1 wrote "@2" to @3sign at @4=@1 записал "@2" в @3sign на @4 +Sign=табличка +Can edit all locked signs=Может редактировать все защищенные таблички +Locked Sign=защищенная табличка +green=зеленая +yellow=желтая +red=красная +white_red=краснобелая +white_black=чернобелая +orange=оранжевая +blue=синея +brown=коричневая +Sign (@1, metal)=Табличка (@1, металл) +Attempt to register unknown node as fence=Попытка зарегистрировать неизвестный узел как забор +Registered @1 and @2=Зарегистрировано @1 для @2 +[MOD] signs loaded=[MOD] мод табличек загружен diff --git a/locale/template.pot b/locale/template.pot deleted file mode 100644 index e277437..0000000 --- a/locale/template.pot +++ /dev/null @@ -1,94 +0,0 @@ -# LANGUAGE Translation for the signs_lib mod. -# Copyright (C) 2018 Vanessa Ezekowitz -# This file is distributed under the same license as the signs_lib package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: signs_lib\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-24 22:23+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: init.lua -msgid "Write" -msgstr "" - -#: init.lua -msgid "Locked sign, owned by @1\n" -msgstr "" - -#: init.lua -msgid "locked " -msgstr "" - -#: init.lua -msgid "@1 wrote \"@2\" to @3sign at @4" -msgstr "" - -#: init.lua -msgid "Sign" -msgstr "" - -#: init.lua -msgid "Can edit all locked signs" -msgstr "" - -#: init.lua -msgid "Locked Sign" -msgstr "" - -#: init.lua -msgid "green" -msgstr "" - -#: init.lua -msgid "yellow" -msgstr "" - -#: init.lua -msgid "red" -msgstr "" - -#: init.lua -msgid "white_red" -msgstr "" - -#: init.lua -msgid "white_black" -msgstr "" - -#: init.lua -msgid "orange" -msgstr "" - -#: init.lua -msgid "blue" -msgstr "" - -#: init.lua -msgid "brown" -msgstr "" - -#: init.lua -msgid "Sign (@1, metal)" -msgstr "" - -#: init.lua -msgid "Attempt to register unknown node as fence" -msgstr "" - -#: init.lua -msgid "Registered @1 and @2" -msgstr "" - -#: init.lua -msgid "[MOD] signs loaded" -msgstr "" diff --git a/locale/template.txt b/locale/template.txt new file mode 100644 index 0000000..562f990 --- /dev/null +++ b/locale/template.txt @@ -0,0 +1,6 @@ +# textdomain: signs_lib +Locked sign, owned by @1@n= +Write= +@1 wrote "@2" to sign at @3= +@1 flipped the wide-font switch to "@2" at @3= +@1 flipped the unicode-font switch to "@2" at @3= diff --git a/mod.conf b/mod.conf index cdc185b..84414c9 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ name = signs_lib author = VanessaE -optional_depends = intllib, screwdriver, streetspoles, streetlamps, cottages, prefab_redo, default +optional_depends = screwdriver, streetspoles, streetlamps, cottages, prefab_redo, default description = Adds signs with readable text. min_minetest_version = 5.4.0