mirror of
https://github.com/pyrollo/display_modpack.git
synced 2025-10-25 12:45:26 +02:00
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
This commit is contained in:
Niklp
GitHub
@@ -195,7 +195,8 @@ minetest.register_craft({
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = 'signs_road:large_street_sign',
|
||||
recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'},
|
||||
type = "shapeless",
|
||||
output = 'signs_road:large_street_sign',
|
||||
recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign',
|
||||
'signs_road:white_street_sign', 'signs_road:white_street_sign'},
|
||||
})
|
||||
|
||||
@@ -23,9 +23,8 @@ signs_road = {}
|
||||
signs_road.name = minetest.get_current_modname()
|
||||
signs_road.path = minetest.get_modpath(signs_road.name)
|
||||
|
||||
-- Load support for intllib.
|
||||
local S, NS = dofile(signs_road.path.."/intllib.lua")
|
||||
signs_road.intllib = S
|
||||
-- Translation support
|
||||
signs_road.S = minetest.get_translator(signs_road.name)
|
||||
|
||||
dofile(signs_road.path.."/nodes.lua")
|
||||
dofile(signs_road.path.."/crafts.lua")
|
||||
|
||||
@@ -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
|
||||
@@ -1,56 +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-26 11:26+0200\n"
|
||||
"PO-Revision-Date: 2017-05-08 06:40+0200\n"
|
||||
"Last-Translator: Peppy <peppy@twang-factory.com>\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"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Blue street sign"
|
||||
msgstr "Plaque de rue bleue"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Red and white town sign"
|
||||
msgstr "Panneau de ville rouge et blanc"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White street sign"
|
||||
msgstr "Panneau blanc"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green street sign"
|
||||
msgstr "Panneau vert"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow street sign"
|
||||
msgstr "Panneau jaune"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Black direction sign"
|
||||
msgstr "Panneau de direction noir"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green direction sign"
|
||||
msgstr "Panneau de direction vert"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow direction sign"
|
||||
msgstr "Panneau de direction jaune"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White direction sign"
|
||||
msgstr "Panneau de direction blanc"
|
||||
|
||||
@@ -1,54 +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:28+0200\n"
|
||||
"PO-Revision-Date: 2020-07-05 11:32+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"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Blue street sign"
|
||||
msgstr "Papan tanda jalan biru"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Red and white town sign"
|
||||
msgstr "Papan tanda bandar merah dan putih"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White street sign"
|
||||
msgstr "Papan tanda jalan putih"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green street sign"
|
||||
msgstr "Papan tanda jalan hijau"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow street sign"
|
||||
msgstr "Papan tanda jalan kuning"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Black direction sign"
|
||||
msgstr "Papan tanda arah hitam"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green direction sign"
|
||||
msgstr "Papan tanda arah hijau"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow direction sign"
|
||||
msgstr "Papan tanda arah kuning"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White direction sign"
|
||||
msgstr "Papan tanda arah putih"
|
||||
15
signs_road/locale/signs_road.de.tr
Normal file
15
signs_road/locale/signs_road.de.tr
Normal file
@@ -0,0 +1,15 @@
|
||||
# textdomain: signs_road
|
||||
Blue street sign=Blaues Straßenschild
|
||||
Large banner=Großes Banner
|
||||
Red and white town sign=Rot-weißes Ortsschild
|
||||
White street sign=Weißes Straßenschild
|
||||
Blue road sign=Blaues Straßenschild
|
||||
Green road sign=Grünes Straßenschild
|
||||
Yellow road sign=Gelbes Straßenschild
|
||||
Red road sign=Rotes Straßenschild
|
||||
Black direction sign=Schwarzer Wegweiser
|
||||
White direction sign=Weißer Wegweiser
|
||||
Blue direction sign=Blauer Wegweiser
|
||||
Green direction sign=Grüner Wegweiser
|
||||
Yellow direction sign=Gelber Wegweiser
|
||||
Red direction sign=Roter Wegweiser
|
||||
15
signs_road/locale/signs_road.fr.tr
Normal file
15
signs_road/locale/signs_road.fr.tr
Normal file
@@ -0,0 +1,15 @@
|
||||
# textdomain: signs_road
|
||||
Blue street sign=Plaque de rue bleue
|
||||
Large banner=
|
||||
Red and white town sign=Panneau de ville rouge et blanc
|
||||
White street sign=Panneau blanc
|
||||
Blue road sign=
|
||||
Green road sign=
|
||||
Yellow road sign=
|
||||
Red road sign=
|
||||
Black direction sign=Panneau de direction noir
|
||||
White direction sign=Panneau de direction blanc
|
||||
Blue direction sign=
|
||||
Green direction sign=Panneau de direction vert
|
||||
Yellow direction sign=Panneau de direction jaune
|
||||
Red direction sign=
|
||||
15
signs_road/locale/signs_road.ms.tr
Normal file
15
signs_road/locale/signs_road.ms.tr
Normal file
@@ -0,0 +1,15 @@
|
||||
# textdomain: signs_road
|
||||
Blue street sign=Papan tanda jalan biru
|
||||
Large banner=
|
||||
Red and white town sign=Papan tanda bandar merah dan putih
|
||||
White street sign=Papan tanda jalan putih
|
||||
Blue road sign=
|
||||
Green road sign=
|
||||
Yellow road sign=
|
||||
Red road sign=
|
||||
Black direction sign=Papan tanda arah hitam
|
||||
White direction sign=Papan tanda arah putih
|
||||
Blue direction sign=
|
||||
Green direction sign=Papan tanda arah hijau
|
||||
Yellow direction sign=Papan tanda arah kuning
|
||||
Red direction sign=
|
||||
@@ -1,54 +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:28+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"
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Blue street sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Red and white town sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White street sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green street sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow street sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Black direction sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Green direction sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "Yellow direction sign"
|
||||
msgstr ""
|
||||
|
||||
#: nodes.lua
|
||||
msgid "White direction sign"
|
||||
msgstr ""
|
||||
15
signs_road/locale/template.txt
Normal file
15
signs_road/locale/template.txt
Normal file
@@ -0,0 +1,15 @@
|
||||
# textdomain: signs_road
|
||||
Blue street sign=
|
||||
Large banner=
|
||||
Red and white town sign=
|
||||
White street sign=
|
||||
Blue road sign=
|
||||
Green road sign=
|
||||
Yellow road sign=
|
||||
Red road sign=
|
||||
Black direction sign=
|
||||
White direction sign=
|
||||
Blue direction sign=
|
||||
Green direction sign=
|
||||
Yellow direction sign=
|
||||
Red direction sign=
|
||||
@@ -2,4 +2,3 @@ name = signs_road
|
||||
title = Signs Road
|
||||
description = Various road signs with text display using signs_api
|
||||
depends = default,dye,signs_api
|
||||
optional_depends = intllib
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
along with signs_road. If not, see <http://www.gnu.org/licenses/>.
|
||||
--]]
|
||||
|
||||
local S = signs_road.intllib
|
||||
local S = signs_road.S
|
||||
|
||||
local models = {
|
||||
blue_street_sign = {
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user