Merge branch 'master' into fix_duplication
commit
d39cd0d2e5
45
init.lua
45
init.lua
|
@ -3,6 +3,10 @@
|
|||
LGPLv2.1+
|
||||
See LICENSE for more information ]]
|
||||
|
||||
-- Translation support
|
||||
local S = minetest.get_translator("books")
|
||||
local F = minetest.formspec_escape
|
||||
|
||||
local lpp = 14 -- Lines per book's page
|
||||
|
||||
local function copymeta(frommeta, tometa)
|
||||
|
@ -38,8 +42,8 @@ local function after_place_node(pos, placer, itemstack, pointed_thing)
|
|||
if itemmeta then
|
||||
local nodemeta = minetest.get_meta(pos)
|
||||
copymeta(itemmeta, nodemeta)
|
||||
nodemeta:set_string("infotext", itemmeta:get_string("title") .. "\n\n" ..
|
||||
"by " .. itemmeta:get_string("owner"))
|
||||
nodemeta:set_string("infotext", S("@1\n\nby @2", itemmeta:get_string("title"),
|
||||
itemmeta:get_string("owner")))
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -73,13 +77,13 @@ local function formspec_display(meta, player_name, pos)
|
|||
formspec = "size[8,8]" ..
|
||||
default.gui_bg ..
|
||||
default.gui_bg_img ..
|
||||
"field[-4,-4;0,0;owner;Owner:;" .. owner .. "]" ..
|
||||
"field[-4,-4;0,0;owner;"..F(S("Owner:"))..";" .. owner .. "]" ..
|
||||
|
||||
"field[0.5,1;7.5,0;title;Title:;" ..
|
||||
minetest.formspec_escape(title) .. "]" ..
|
||||
"textarea[0.5,1.5;7.5,7;text;Contents:;" ..
|
||||
minetest.formspec_escape(text) .. "]" ..
|
||||
"button_exit[2.5,7.5;3,1;save;Save]"
|
||||
"field[0.5,1;7.5,0;title;"..F(S("Title:"))..";" ..
|
||||
F(title) .. "]" ..
|
||||
"textarea[0.5,1.5;7.5,7;text;"..F(S("Contents:"))..";" ..
|
||||
F(text) .. "]" ..
|
||||
"button_exit[2.5,7.5;3,1;save;"..F(S("Save")).."]"
|
||||
-- TODO FIXME WE NEED TO SET A HIDDEN "owner" FIELD !!
|
||||
else
|
||||
formspec = "size[8,8]" ..
|
||||
|
@ -88,11 +92,11 @@ local function formspec_display(meta, player_name, pos)
|
|||
"label[0.5,0.5;by " .. owner .. "]" ..
|
||||
"tablecolumns[color;text]" ..
|
||||
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
|
||||
"table[0.4,0;7,0.5;title;#FFFF00," .. minetest.formspec_escape(title) .. "]" ..
|
||||
"table[0.4,0;7,0.5;title;#FFFF00," .. F(title) .. "]" ..
|
||||
"textarea[0.5,1.5;7.5,7;;" ..
|
||||
minetest.formspec_escape(string ~= "" and string or text) .. ";]" ..
|
||||
F(string ~= "" and string or text) .. ";]" ..
|
||||
"button[2.4,7.6;0.8,0.8;book_prev;<]" ..
|
||||
"label[3.2,7.7;Page " .. page .. " of " .. page_max .. "]" ..
|
||||
"label[3.2,7.7;"..F(S("Page @1 of @2", page, page_max)) .. "]" ..
|
||||
"button[4.9,7.6;0.8,0.8;book_next;>]"
|
||||
end
|
||||
|
||||
|
@ -121,8 +125,8 @@ local function on_punch(pos, node, puncher, pointed_thing)
|
|||
local meta = minetest.get_meta(pos)
|
||||
if meta:get_string("owner") ~= "" then
|
||||
meta:set_string("infotext",
|
||||
meta:get_string("title") .. "\n\n" ..
|
||||
"by " .. meta:get_string("owner"))
|
||||
S("@1\n\nby @2", meta:get_string("title"),
|
||||
meta:get_string("owner")))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -157,7 +161,7 @@ minetest.override_item("default:book_written", {on_place = on_place})
|
|||
|
||||
-- TODO: for book_open, book_written_open
|
||||
minetest.register_node(":default:book_open", {
|
||||
description = "Book Open (you hacker you!)",
|
||||
description = S("Book Open"),
|
||||
inventory_image = "default_book.png",
|
||||
tiles = {
|
||||
"books_book_open_top.png", -- Top
|
||||
|
@ -179,13 +183,14 @@ minetest.register_node(":default:book_open", {
|
|||
}
|
||||
},
|
||||
--groups = {attached_node = 1}, -- FIXME
|
||||
groups = {not_in_creative_inventory = 1},
|
||||
on_punch = on_punch,
|
||||
on_rightclick = on_rightclick,
|
||||
})
|
||||
|
||||
-- TODO: for book_closed, book_written_closed
|
||||
minetest.register_node(":default:book_closed", {
|
||||
description = "Book Closed (you hacker you!)",
|
||||
description = S("Book Closed"),
|
||||
inventory_image = "default_book.png",
|
||||
tiles = {
|
||||
"books_book_closed_topbottom.png", -- Top
|
||||
|
@ -205,7 +210,7 @@ minetest.register_node(":default:book_closed", {
|
|||
{-0.25, -0.5, -0.3125, 0.25, -0.35, 0.3125},
|
||||
}
|
||||
},
|
||||
groups = {oddly_breakable_by_hand = 3, dig_immediate = 2}, --, attached_node = 1}, -- FIXME
|
||||
groups = {oddly_breakable_by_hand = 3, dig_immediate = 2, not_in_creative_inventory = 1}, --, attached_node = 1}, -- FIXME
|
||||
on_dig = on_dig,
|
||||
on_rightclick = on_rightclick,
|
||||
after_place_node = after_place_node,
|
||||
|
@ -249,11 +254,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||
end
|
||||
end)
|
||||
|
||||
if minetest.setting_getbool("books.editor") then
|
||||
minetest.register_privilege("editor", "Allow player to edit books with the Admin Pencil")
|
||||
if minetest.settings:get_bool("books.editor", false) then
|
||||
minetest.register_privilege("editor", S("Allow player to edit books with the Admin Pencil"))
|
||||
|
||||
minetest.register_craftitem("books:admin_pencil", {
|
||||
description = "Admin Pencil",
|
||||
description = S("Admin Pencil"),
|
||||
inventory_image = "books_admin_pencil.png",
|
||||
--[[
|
||||
-- FIXME - this does not work
|
||||
|
@ -277,7 +282,7 @@ if minetest.setting_getbool("books.editor") then
|
|||
minetest.register_craft({
|
||||
output = "books:admin_pencil",
|
||||
recipe = {
|
||||
{"default:stick"},
|
||||
{"group:stick"},
|
||||
{"default:mese_crystal_fragment"},
|
||||
{"default:obsidian_shard"},
|
||||
}
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
# textdomain: books
|
||||
|
||||
|
||||
### init.lua ###
|
||||
|
||||
@1@n@nby @2=@1@n@npar @2
|
||||
Admin Pencil=Crayon d’administrateur
|
||||
Allow player to edit books with the Admin Pencil=Autorise le joueur à écrire dans les livres avec le crayon d’administrateur
|
||||
Book Closed=Livre fermé
|
||||
Book Open=Livre ouvert
|
||||
Contents:=Contenu :
|
||||
Owner:=Propriétaire :
|
||||
Page @1 of @2=Page @1 sur @2
|
||||
Save=Sauvegarder
|
||||
Title:=Titre :
|
|
@ -0,0 +1,15 @@
|
|||
# textdomain: books
|
||||
|
||||
|
||||
### init.lua ###
|
||||
|
||||
@1@n@nby @2=
|
||||
Admin Pencil=
|
||||
Allow player to edit books with the Admin Pencil=
|
||||
Book Closed=
|
||||
Book Open=
|
||||
Contents:=
|
||||
Owner:=
|
||||
Page @1 of @2=
|
||||
Save=
|
||||
Title:=
|
|
@ -0,0 +1 @@
|
|||
books.editor (Enable Admin Pencil) bool false
|
Loading…
Reference in New Issue