diff --git a/README.txt b/README.txt index 383bcad..83c8c13 100644 --- a/README.txt +++ b/README.txt @@ -12,7 +12,6 @@ License: MIT (see LICENSE.txt) Dependencies: default (found in minetest_game) stairs (found in minetest_game) -intllib (optional, for translations) moreblocks or stairsplus (optional, for stairsplus support) Please report bugs at the GitHub issue tracker: diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 7f004f6..0000000 --- a/depends.txt +++ /dev/null @@ -1,5 +0,0 @@ -default -stairs -intllib? -moreblocks? -stairsplus? diff --git a/description.txt b/description.txt deleted file mode 100644 index f2afef2..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds quartz ore and some decorative quartz blocks. diff --git a/init.lua b/init.lua index 0d291df..696ea94 100644 --- a/init.lua +++ b/init.lua @@ -1,8 +1,6 @@ local settings = Settings(minetest.get_modpath("quartz").."/settings.txt") --- internationalization boilerplate -local MP = minetest.get_modpath(minetest.get_current_modname()) -local S, NS = dofile(MP.."/intllib.lua") +local S = minetest.get_translator("quartz") -- -- Item Registration 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/es.po b/locale/es.po deleted file mode 100644 index ee67dc3..0000000 --- a/locale/es.po +++ /dev/null @@ -1,59 +0,0 @@ -# Spanish translations for PACKAGE package -# Traducciones al español para el paquete PACKAGE. -# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Diego Martínez , 2017. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-19 21:50-0700\n" -"PO-Revision-Date: 2017-02-20 15:03-0300\n" -"Last-Translator: Diego Martínez \n" -"Language-Team: Spanish\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: init.lua:13 -msgid "Quartz Crystal" -msgstr "Cristal de cuarzo" - -#: init.lua:17 -msgid "Quartz Crystal Piece" -msgstr "Trozo de cristal de cuarzo" - -#: init.lua:27 -msgid "Quartz Ore" -msgstr "Mineral de cuarzo" - -#: init.lua:47 -msgid "Quartz Block" -msgstr "Bloque de cuarzo" - -#: init.lua:55 -msgid "Chiseled Quartz" -msgstr "Cuarzo cincelado" - -#: init.lua:63 -msgid "Quartz Pillar" -msgstr "Pilar de cuarzo" - -#: init.lua:75 -msgid "Quartz stair" -msgstr "Escaleras de cuarzo" - -#: init.lua:76 -msgid "Quartz slab" -msgstr "Losa de cuarzo" - -#: init.lua:82 -msgid "Quartz Pillar stair" -msgstr "Escaleras de pilar de cuarzo" - -#: init.lua:83 -msgid "Quartz Pillar slab" -msgstr "Losa de pilar de cuarzo" diff --git a/locale/fr.po b/locale/fr.po deleted file mode 100644 index 7932c8c..0000000 --- a/locale/fr.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-04 07:46+0100\n" -"PO-Revision-Date: 2017-03-04 07:48+0100\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.9\n" -"Last-Translator: Peppy \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr\n" - -#: init.lua:13 -msgid "Quartz Crystal" -msgstr "Cristal de quartz" - -#: init.lua:17 -msgid "Quartz Crystal Piece" -msgstr "Morceau de cristal de quartz" - -#: init.lua:27 -msgid "Quartz Ore" -msgstr "Minerai de quartz" - -#: init.lua:47 -msgid "Quartz Block" -msgstr "Bloc de quartz" - -#: init.lua:55 -msgid "Chiseled Quartz" -msgstr "Quartz ciselé" - -#: init.lua:63 -msgid "Quartz Pillar" -msgstr "Pilier en quartz" - -#: init.lua:75 -msgid "Quartz stair" -msgstr "Escalier en quartz" - -#: init.lua:76 -msgid "Quartz slab" -msgstr "Dalle en quartz" - -#: init.lua:82 -msgid "Quartz Pillar stair" -msgstr "Escalier en pilier en quartz" - -#: init.lua:83 -msgid "Quartz Pillar slab" -msgstr "Dalle en pilier en quartz" diff --git a/locale/pt_br.po b/locale/pt_br.po deleted file mode 100644 index ed83ab3..0000000 --- a/locale/pt_br.po +++ /dev/null @@ -1,57 +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. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-19 21:50-0700\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: init.lua:13 -msgid "Quartz Crystal" -msgstr "Cristal de Quartzo" - -#: init.lua:17 -msgid "Quartz Crystal Piece" -msgstr "Pedaço de Cristal de Quartzo" - -#: init.lua:27 -msgid "Quartz Ore" -msgstr "Minério de Quartzo" - -#: init.lua:47 -msgid "Quartz Block" -msgstr "Bloco de Quartzo" - -#: init.lua:55 -msgid "Chiseled Quartz" -msgstr "Quartzo Cinzelado" - -#: init.lua:63 -msgid "Quartz Pillar" -msgstr "Pilar de Quartzo" - -#: init.lua:75 -msgid "Quartz stair" -msgstr "Escada de quartzo" - -#: init.lua:76 -msgid "Quartz slab" -msgstr "Laje de quartzo" - -#: init.lua:82 -msgid "Quartz Pillar stair" -msgstr "Escada de Pilar de Quartzo" - -#: init.lua:83 -msgid "Quartz Pillar slab" -msgstr "Laje de Pilar de Quartzo" diff --git a/locale/quartz.es.tr b/locale/quartz.es.tr new file mode 100644 index 0000000..ed7d969 --- /dev/null +++ b/locale/quartz.es.tr @@ -0,0 +1,15 @@ +# textdomain: quartz + + +### init.lua ### + +Chiseled Quartz=Cuarzo cincelado +Quartz Block=Bloque de cuarzo +Quartz Crystal=Cristal de cuarzo +Quartz Crystal Piece=Trozo de cristal de cuarzo +Quartz Ore=Mineral de cuarzo +Quartz Pillar=Pilar de cuarzo +Quartz Pillar slab=Losa de pilar de cuarzo +Quartz Pillar stair=Escaleras de pilar de cuarzo +Quartz slab=Losa de cuarzo +Quartz stair=Escaleras de cuarzo diff --git a/locale/quartz.fr.tr b/locale/quartz.fr.tr new file mode 100644 index 0000000..941b632 --- /dev/null +++ b/locale/quartz.fr.tr @@ -0,0 +1,15 @@ +# textdomain: quartz + + +### init.lua ### + +Chiseled Quartz=Quartz ciselé +Quartz Block=Bloc de quartz +Quartz Crystal=Cristal de quartz +Quartz Crystal Piece=Morceau de cristal de quartz +Quartz Ore=Minerai de quartz +Quartz Pillar=Pilier en quartz +Quartz Pillar slab=Dalle en pilier en quartz +Quartz Pillar stair=Escalier en pilier en quartz +Quartz slab=Dalle en quartz +Quartz stair=Escalier en quartz diff --git a/locale/quartz.pt_BR.tr b/locale/quartz.pt_BR.tr new file mode 100644 index 0000000..6ce7454 --- /dev/null +++ b/locale/quartz.pt_BR.tr @@ -0,0 +1,15 @@ +# textdomain: quartz + + +### init.lua ### + +Chiseled Quartz=Quartzo Cinzelado +Quartz Block=Bloco de Quartzo +Quartz Crystal=Cristal de Quartzo +Quartz Crystal Piece=Pedaço de Cristal de Quartzo +Quartz Ore=Minério de Quartzo +Quartz Pillar=Pilar de Quartzo +Quartz Pillar slab=Laje de Pilar de Quartzo +Quartz Pillar stair=Escada de Pilar de Quartzo +Quartz slab=Laje de quartzo +Quartz stair=Escada de quartzo diff --git a/locale/template.pot b/locale/template.pot deleted file mode 100644 index 9c78dda..0000000 --- a/locale/template.pot +++ /dev/null @@ -1,57 +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. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-19 21:50-0700\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: init.lua:13 -msgid "Quartz Crystal" -msgstr "" - -#: init.lua:17 -msgid "Quartz Crystal Piece" -msgstr "" - -#: init.lua:27 -msgid "Quartz Ore" -msgstr "" - -#: init.lua:47 -msgid "Quartz Block" -msgstr "" - -#: init.lua:55 -msgid "Chiseled Quartz" -msgstr "" - -#: init.lua:63 -msgid "Quartz Pillar" -msgstr "" - -#: init.lua:75 -msgid "Quartz stair" -msgstr "" - -#: init.lua:76 -msgid "Quartz slab" -msgstr "" - -#: init.lua:82 -msgid "Quartz Pillar stair" -msgstr "" - -#: init.lua:83 -msgid "Quartz Pillar slab" -msgstr "" diff --git a/locale/template.txt b/locale/template.txt new file mode 100644 index 0000000..0a4d44d --- /dev/null +++ b/locale/template.txt @@ -0,0 +1,15 @@ +# textdomain: quartz + + +### init.lua ### + +Chiseled Quartz= +Quartz Block= +Quartz Crystal= +Quartz Crystal Piece= +Quartz Ore= +Quartz Pillar= +Quartz Pillar slab= +Quartz Pillar stair= +Quartz slab= +Quartz stair= diff --git a/mod.conf b/mod.conf index 40a9866..b3feca0 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = quartz description = Adds quartz ore and some decorative quartz blocks. depends = default,stairs -optional_depends = intllib,moreblocks,stairsplus +optional_depends = moreblocks,stairsplus