Merge branch 'master' into contentdb

This commit is contained in:
Alexander Weber 2020-01-14 14:58:47 +01:00
commit 04b43a5969
5 changed files with 5 additions and 6 deletions

View File

@ -8,9 +8,6 @@ skins = {}
skins.modpath = minetest.get_modpath(minetest.get_current_modname()) skins.modpath = minetest.get_modpath(minetest.get_current_modname())
skins.default = "character" skins.default = "character"
local S = minetest.get_translator("skinsdb")
print("Translator:", dump(S))
dofile(skins.modpath.."/skin_meta_api.lua") dofile(skins.modpath.."/skin_meta_api.lua")
dofile(skins.modpath.."/api.lua") dofile(skins.modpath.."/api.lua")
dofile(skins.modpath.."/skinlist.lua") dofile(skins.modpath.."/skinlist.lua")

View File

@ -15,3 +15,4 @@ see /help skinsdb for supported parameters=Lese /help für erlaubte Parameter
skin set to=Skin ist jetzt skin set to=Skin ist jetzt
invalid skin=unbekannter Skin invalid skin=unbekannter Skin
unknown parameter=unbekannter Parameter unknown parameter=unbekannter Parameter
Skins=Aussehen

View File

@ -15,3 +15,4 @@ skin set to=
invalid skin= invalid skin=
unknown parameter= unknown parameter=
unknown skin= unknown skin=
Skins=

View File

@ -1,4 +1,4 @@
local S = skins.S local S = minetest.get_translator("skinsdb")
-- generate the current formspec -- generate the current formspec
local function get_formspec(player, context) local function get_formspec(player, context)
@ -9,7 +9,7 @@ local function get_formspec(player, context)
end end
sfinv.register_page("skins:overview", { sfinv.register_page("skins:overview", {
title = "Skins", title = S("Skins"),
get = function(self, player, context) get = function(self, player, context)
-- collect skins data -- collect skins data
return sfinv.make_formspec(player, context, get_formspec(player, context)) return sfinv.make_formspec(player, context, get_formspec(player, context))

View File

@ -1,4 +1,4 @@
local S = skins.S local S = minetest.get_translator("skinsdb")
unified_inventory.register_page("skins", { unified_inventory.register_page("skins", {
get_formspec = function(player) get_formspec = function(player)