mtcontrib/display_modpack
1
0
Fork 1
mirror of https://github.com/pyrollo/display_modpack.git synced 2025-10-23 20:05:41 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Niklp
2023-07-24 09:59:26 +02:00
committed by GitHub
parent e0e0305836
commit 1440f35fa6
91 changed files with 415 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
steles/config.lua
View File

@@ -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',
}

5
steles/init.lua
View File

@@ -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")

45
steles/intllib.lua
View File

@@ -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

47
steles/locale/fr.po
View File

@@ -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"

46
steles/locale/ms.po
View File

@@ -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"

9
steles/locale/steles.de.tr Normal file
View File

@@ -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

9
steles/locale/steles.fr.tr Normal file
View File

@@ -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=

9
steles/locale/steles.ms.tr Normal file
View File

@@ -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=

46
steles/locale/template.pot
View File

@@ -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 ""

9
steles/locale/template.txt Normal file
View File

@@ -0,0 +1,9 @@
# textdomain: steles
Stone Stele=
Sandstone Stele=
Desert Stone Stele=
Marble Stele=
Granite Stele=
Displayed text (3 lines max)=
Font=
Write=

2
steles/mod.conf
View File

@@ -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

8
steles/nodes.lua
View File

@@ -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,

25
steles/tools/updatepo.sh
View File

@@ -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