Merge pull request 'Signs fixes' (#2899) from mcl_signs_rewrite_tranlsations into master

Reviewed-on: MineClone2/MineClone2#2899

mods/ITEMS/mcl_signs/init.lua

@@ -129,6 +129,23 @@ mcl_signs.register_sign_craft("mcl_core", "mcl_core:acaciawood", "_acaciawood")
 mcl_signs.register_sign("mcl_core", "#b8693d", "_mangrove_wood", "Mangrove Sign")
 mcl_signs.register_sign_craft("mcl_core", "mcl_core:mangrove_wood", "_mangrove_wood")
 
+-- add in the nether wood signs
+if minetest.get_modpath("mcl_crimson") then
+
+    -- warped_hyphae_wood Sign
+    mcl_signs.register_sign_custom("mcl_crimson","_warped_hyphae_wood", "mcl_signs_sign_greyscale.png",
+            "#9f7dcf", "default_sign_greyscale.png", "default_sign_greyscale.png",
+            "Warped Hyphae Sign")
+    mcl_signs.register_sign_craft("mcl_crimson", "mcl_crimson:warped_hyphae_wood", "_warped_hyphae_wood")
+
+    -- crimson_hyphae_wood Sign
+    mcl_signs.register_sign_custom("mcl_crimson", "_crimson_hyphae_wood","mcl_signs_sign_greyscale.png",
+            "#c35f51","default_sign_greyscale.png", "default_sign_greyscale.png",
+            "Crimson Hyphae Sign")
+    mcl_signs.register_sign_craft("mcl_crimson", "mcl_crimson:crimson_hyphae_wood", "_crimson_hyphae_wood")
+
+end
+
 -- Register the LBMs for the created signs.
 mcl_signs.make_lbm()
 

mods/ITEMS/mcl_signs/locale/mcl_signs.de.tr

@@ -1,9 +1,18 @@
 # textdomain: mcl_signs
-Sign=Schild
+Sign=Zeichen / Schild
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Schilder können beschrieben werden und kommen in zwei Varianten: Wandschild und stehendes Schild. Sie können auf und an den Seiten von anderen Blöclen platziert werden, aber nicht unter ihnen.
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Nachdem das Schild platziert wurde, kann man etwas darauf schreiben. 4 Zeilen mit je 15 Zeichen pro Zeile sind verfügbar, alles darüber geht verloren. Es werden nicht alle Zeichen unterstützt. Der Text kann nicht geändert werden, sobald er geschrieben wurde; man muss das Schild erneut platzieren.
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=Nachdem das Schild platziert wurde, kann man etwas darauf schreiben. 4 Zeilen mit je 15 Zeichen pro Zeile sind verfügbar, alles darüber geht verloren. Es werden nicht alle Zeichen unterstützt. Der Text kann nicht geändert werden, sobald er geschrieben wurde; man muss das Schild erneut platzieren. Kann gefärbt und zum Leuchten gebracht werden.
 Enter sign text:=Schildtext eingeben:
 Maximum line length: 15=Maximale Zeilenlänge: 15
 Maximum lines: 4=Maximale Zeilen: 4
 Done=Fertig
 Can be written=Kann beschriftet werden
+Oak Sign=Eichezeichen
+Birch Sign=Birke Zeichen
+Spruce Sign=Fichtenzeichen
+Dark Oak Sign=Dunkles Eichenschild
+Jungle Sign=Dschungelzeichen
+Acacia Sign=Akazienzeichen
+Mangrove Sign=Mangroven-Zeichen
+Warped Hyphae Sign=Verzerrtes Hyphen-Zeichen
+Crimson Hyphae Sign=Hochrotes Hyphen-Zeichen

mods/ITEMS/mcl_signs/locale/mcl_signs.es.tr

@@ -1,8 +1,18 @@
 # textdomain: mcl_signs
-Sign=Firmar
+Sign=Signo / Firmar
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Los letreros se pueden escribir y vienen en dos variantes: letrero de muro y letrero en un poste de letrero. Los letreros se pueden colocar en la parte superior y en los costados de otros bloques, pero no debajo de ellos.
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Después de colocar el letrero, puede escribir algo en él. Tiene 4 líneas de texto con hasta 15 caracteres para cada línea; todo lo que esté más allá de estos límites se pierde. No todos los personajes son compatibles. El texto no se puede cambiar una vez que se ha escrito; tienes que romper y colocar el letrero nuevamente.
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=Después de colocar el letrero, puede escribir algo en él. Tiene 4 líneas de texto con hasta 15 caracteres para cada línea; todo lo que esté más allá de estos límites se pierde. No todos los personajes son compatibles. El texto no se puede cambiar una vez que se ha escrito; tienes que romper y colocar el letrero nuevamente.
 Enter sign text:=Inserte el texto del letrero:
 Maximum line length: 15=Longitud máxima de línea: 15
 Maximum lines: 4=Líneas máximas: 4
+Can be written=Los letreros se pueden escribir
 Done=Escribir cartel
+Oak Sign=Signo de roble
+Birch Sign=Signo de abedul
+Spruce Sign=Signo de abeto
+Dark Oak Sign=Signo de roble oscuro
+Jungle Sign= Signo de la selva
+Acacia Sign= Signo de acacia
+Mangrove Sign= Signo de manglar
+Warped Hyphae Sign=Signo de hifas deformadas
+Crimson Hyphae Sign=Signo de hifas carmesí

mods/ITEMS/mcl_signs/locale/mcl_signs.fr.tr

@@ -1,9 +1,18 @@
 # textdomain: mcl_signs
-Sign=Panneau
+Sign=Panneau / signe
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Les panneaux peuvent être écrits et se déclinent en deux variantes: panneau mural et panneau sur poteau. Des panneaux peuvent être placés en haut et sur les côtés des autres blocs, mais pas en dessous.
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Après avoir placé le panneau, vous pouvez écrire quelque chose dessus. Vous avez 4 lignes de texte avec jusqu'à 15 caractères pour chaque ligne; tout ce qui dépasse ces limites est perdu. Tous les caractères ne sont pas pris en charge. Le texte ne peut pas être modifié une fois qu'il a été écrit; vous devez casser et placer à nouveau le panneau.
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=Après avoir placé le panneau, vous pouvez écrire quelque chose dessus. Vous avez 4 lignes de texte avec jusqu'à 15 caractères pour chaque ligne; tout ce qui dépasse ces limites est perdu. Tous les caractères ne sont pas pris en charge. Le texte ne peut pas être modifié une fois qu'il a été écrit; vous devez casser et placer à nouveau le panneau. Peut être coloré et rendu brillant.
 Enter sign text:=Saisir le texte du panneau:
 Maximum line length: 15=Longueur maximum des lignes: 15
 Maximum lines: 4=Nombre maximum de lignes: 4
 Done=Terminé
 Can be written=Peut être écrit
+Oak Sign=Signe de chêne
+Birch Sign=Signe de bouleau
+Spruce Sign=Signe d'épinette
+Dark Oak Sign=Enseigne Chêne Foncé
+Jungle Sign=Signe de la jungle
+Acacia Sign=Signe d'acacia
+Mangrove Sign=Signe de la mangrove
+Warped Hyphae Sign=Signe hyphe déformé
+Crimson Hyphae Sign=Signe d'hyphes cramoisi

mods/ITEMS/mcl_signs/locale/mcl_signs.pl.tr

@@ -1,9 +1,18 @@
 # textdomain: mcl_signs
 Sign=Znak
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Na znakach można pisać i postawić je w dwóch wariantach: znak ścienny i znak na patyku. Znaki mogą być stawiane na górze i na bokach bloków, ale nie pod nimi.
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Po postawieniu znaku możesz coś na nim napisać. Masz miejsce na cztery linie tekstu po 15 znaków każda; cokolwiek poza limitami będzie utracone. Nie wszystkie znaki są wspierane. Tekstu nie można zmienić po napisaniu; musisz zniszczyć znak i postawić go ponownie.
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=Po postawieniu znaku możesz coś na nim napisać. Masz miejsce na cztery linie tekstu po 15 znaków każda; cokolwiek poza limitami będzie utracone. Nie wszystkie znaki są wspierane. Tekstu nie można zmienić po napisaniu; musisz zniszczyć znak i postawić go ponownie. Może być pokolorowany i rozświetlony.
 Enter sign text:=Wpisz tekst znaku:
 Maximum line length: 15=Maksymalna długość linii: 15
 Maximum lines: 4=Maksymalna liczba linii: 4
 Done=Skończone
 Can be written=Można na nim coś napisać
+Oak Sign=Znak dębu
+Birch Sign=Brzoza Znak
+Spruce Sign=Świerk Znak
+Dark Oak Sign=Znak ciemnego dębu
+Jungle Sign=Znak Dżungli
+Acacia Sign=Znak akacji
+Mangrove Sign=Znak namorzynowy
+Warped Hyphae Sign=Wypaczony znak strzępek
+Crimson Hyphae Sign=Karmazynowy znak strzępek

mods/ITEMS/mcl_signs/locale/mcl_signs.ru.tr

@@ -1,9 +1,18 @@
 # textdomain: mcl_signs
 Sign=Табличка
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=На табличках можно писать. Таблички бывают двух видов: настенные и отдельно стоящие. Таблички можно размещать на верхушках и сторонах блоков, но не под блоками.
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=После установки таблички вы можете написать на ней что-то. Вам доступны 4 строки текста, до 15 символов в каждой; всё, что вы напишете сверх лимита, потеряется. Поддерживаются не все символы. Текст нельзя изменить. Чтобы изменить его, вам придётся сломать табличку и подписать её снова.
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=После установки таблички вы можете написать на ней что-то. Вам доступны 4 строки текста, до 15 символов в каждой; всё, что вы напишете сверх лимита, потеряется. Поддерживаются не все символы. Текст нельзя изменить. Чтобы изменить его, вам придётся сломать табличку и подписать её снова. Можно раскрасить и заставить светиться.
 Enter sign text:=Текст на табличке:
 Maximum line length: 15=Максимальная длина строки: 15
 Maximum lines: 4=Максимум строк: 4
 Done=Готово
 Can be written=Может быть подписана
+Oak Sign=Дубовый знак
+Birch Sign=Березовый знак
+Spruce Sign=Ель Знак
+Dark Oak Sign=Знак темного дуба
+Jungle Sign=Знак джунглей
+Acacia Sign=Знак акации
+Mangrove Sign=Знак мангровых зарослей
+Warped Hyphae Sign=Знак искривленных гиф
+Crimson Hyphae Sign=Багровый знак гиф

mods/ITEMS/mcl_signs/locale/mcl_signs.zh_TW.tr

@@ -1,9 +1,16 @@
 # textdomain: mcl_signs
 Sign=告示牌
 Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=告示牌可以寫字，有兩種變體：牆上的告示牌和柱上的告示牌。告示牌可以放在其他方塊的頂部和側面，但不能放在下面。
-After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=放置告示牌後，你可以在上面寫東西。你最多可以寫4行文字，每行最多可以寫15個字符；超過這些限制的文字就會丟失。不是所有的字符都被支持。文字一旦寫完就不能更改；你必須打破並重新放置標誌。
+After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.=放置告示牌後，你可以在上面寫東西。你最多可以寫4行文字，每行最多可以寫15個字符；超過這些限制的文字就會丟失。不是所有的字符都被支持。文字一旦寫完就不能更改；你必須打破並重新放置標誌。可以著色並發光。
 Enter sign text:=輸入告示牌文字：
 Maximum line length: 15=每行最多可以寫15個字符
 Maximum lines: 4=最多可以寫4行文字
 Done=確認
 Can be written=可以寫字
+Oak Sign=橡木標誌
+Birch Sign=樺木標誌
+Spruce Sign=雲杉標誌
+Dark Oak Sign=深色橡木標誌
+Jungle Sign=叢林標誌
+Acacia Sign=相思標誌
+Mangrove Sign=紅樹林標誌

mods/ITEMS/mcl_signs/locale/template.txt

@@ -7,3 +7,10 @@ Maximum line length: 15=
 Maximum lines: 4=
 Done=
 Can be written=
+Oak Sign=
+Birch Sign=
+Spruce Sign=
+Dark Oak Sign=
+Jungle Sign=
+Acacia Sign=
+Mangrove Sign=

mods/ITEMS/mcl_signs/signs_api.lua

@@ -70,6 +70,8 @@ end
 
 local pi = 3.1415926 -- enough accuracy, to build an engine for a car.
 
+local math = math
+
 -- locally cached copy of the official colors; this way, it updates as mcl_colors updates.
 local mcl_colors_official = mcl_colors
 if DEBUG then
@@ -662,6 +664,18 @@ function mcl_signs.register_sign (modname, color, _name, ttsign)
     new_sign_standing.wield_image = "(default_sign.png^[multiply:" .. color .. ")"
     new_sign_standing.tiles = { "(mcl_signs_sign.png^[multiply:" .. color .. ")" }
     new_sign_standing.inventory_image = "(default_sign.png^[multiply:" .. color .. ")"
+
+    new_sign_standing.on_rotate = function(pos, node, user, mode)
+        if mode == screwdriver.ROTATE_FACE then
+            node.name = "mcl_signs:standing_sign22_5" .. _name
+            minetest.swap_node(pos, node)
+        elseif mode == screwdriver.ROTATE_AXIS then
+            return false
+        end
+        mcl_signs:update_sign(pos, nil, nil, true)
+        return true
+    end,
+
     minetest.register_node("mcl_signs:standing_sign" .. _name, new_sign_standing)
     update_sign_registry("standing", "mcl_signs:standing_sign" .. _name)
     -- debug step
@@ -879,6 +893,16 @@ function mcl_signs.register_sign_custom (modname, _name, tiles, color, inventory
     new_sign_standing.wield_image ="("..wield_image.."^[multiply:" .. color .. ")"
     new_sign_standing.tiles = { "("..tiles.."^[multiply:" .. color .. ")" }
     new_sign_standing.inventory_image = "("..inventory_image.."^[multiply:" .. color .. ")"
+    new_sign_standing.on_rotate = function(pos, node, user, mode)
+        if mode == screwdriver.ROTATE_FACE then
+            node.name = "mcl_signs:standing_sign22_5" .. _name
+            minetest.swap_node(pos, node)
+        elseif mode == screwdriver.ROTATE_AXIS then
+            return false
+        end
+        mcl_signs:update_sign(pos, nil, nil, true)
+        return true
+    end,
     minetest.register_node("mcl_signs:standing_sign" .. _name, new_sign_standing)
     update_sign_registry("standing", "mcl_signs:standing_sign" .. _name)
 
@@ -1098,6 +1122,16 @@ function mcl_signs.reregister_sign (modname, color, _name, ttsign)
     new_sign_standing.wield_image = "(default_sign.png^[multiply:" .. color .. ")"
     new_sign_standing.tiles = { "(mcl_signs_sign.png^[multiply:" .. color .. ")" }
     new_sign_standing.inventory_image = "(default_sign.png^[multiply:" .. color .. ")"
+    new_sign_standing.on_rotate = function(pos, node, user, mode)
+        if mode == screwdriver.ROTATE_FACE then
+            node.name = "mcl_signs:standing_sign22_5" .. _name
+            minetest.swap_node(pos, node)
+        elseif mode == screwdriver.ROTATE_AXIS then
+            return false
+        end
+        mcl_signs:update_sign(pos, nil, nil, true)
+        return true
+    end,
     minetest.override_item("mcl_signs:standing_sign" .. _name, new_sign_standing)
     update_sign_registry("standing", "mcl_signs:standing_sign" .. _name)
     -- debug step
@@ -1315,6 +1349,16 @@ function mcl_signs.reregister_sign_custom (modname, _name, tiles, color, invento
     new_sign_standing.wield_image ="("..wield_image.."^[multiply:" .. color .. ")"
     new_sign_standing.tiles = { "("..tiles.."^[multiply:" .. color .. ")" }
     new_sign_standing.inventory_image = "("..inventory_image.."^[multiply:" .. color .. ")"
+    new_sign_standing.on_rotate = function(pos, node, user, mode)
+        if mode == screwdriver.ROTATE_FACE then
+            node.name = "mcl_signs:standing_sign22_5" .. _name
+            minetest.swap_node(pos, node)
+        elseif mode == screwdriver.ROTATE_AXIS then
+            return false
+        end
+        mcl_signs:update_sign(pos, nil, nil, true)
+        return true
+    end,
     minetest.override_item("mcl_signs:standing_sign" .. _name, new_sign_standing)
     update_sign_registry("standing", "mcl_signs:standing_sign" .. _name)