From ea73ff6f6e3f49fba48ff6c4c84a175b63270d85 Mon Sep 17 00:00:00 2001 From: Louis Royer <4259825-lroyer@users.noreply.gitlab.com> Date: Tue, 4 Aug 2020 19:58:37 +0200 Subject: [PATCH] MT5 translation for homedecor_bathroom - add screwdriver in optional_depends - Fixes luacheck warnings --- .luacheckrc | 2 ++ homedecor_bathroom/depends.txt | 7 ------- homedecor_bathroom/init.lua | 13 ++++++------ .../locale/homedecor_bathroom.de.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.es.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.fr.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.it.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.ms.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.pt.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.pt_BR.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.ru.tr | 20 +++++++++++++++++++ .../locale/homedecor_bathroom.zh_CN.tr | 20 +++++++++++++++++++ homedecor_bathroom/locale/template.txt | 20 +++++++++++++++++++ homedecor_bathroom/mod.conf | 4 ++++ 14 files changed, 213 insertions(+), 13 deletions(-) delete mode 100644 homedecor_bathroom/depends.txt create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.de.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.es.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.fr.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.it.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.ms.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.pt.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.pt_BR.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.ru.tr create mode 100644 homedecor_bathroom/locale/homedecor_bathroom.zh_CN.tr create mode 100644 homedecor_bathroom/locale/template.txt create mode 100644 homedecor_bathroom/mod.conf diff --git a/.luacheckrc b/.luacheckrc index 1161dfd6..e1a6f367 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -13,6 +13,7 @@ read_globals = { "PseudoRandom", "ItemStack", "intllib", "default", + "doors", "stairsplus", "stairs", "signs_lib", @@ -22,6 +23,7 @@ read_globals = { "unifieddyes", "creative", "homedecor_i18n", + "homedecor", } globals = { diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt deleted file mode 100644 index e778f7de..00000000 --- a/homedecor_bathroom/depends.txt +++ /dev/null @@ -1,7 +0,0 @@ -homedecor_common -default -basic_materials -unifieddyes -building_blocks -bucket? -homedecor_fences? diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 85cf43a8..4acbc2fa 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -1,5 +1,6 @@ +local S = minetest.get_translator("homedecor_bathroom") -local S = homedecor.gettext +local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil minetest.register_node(":homedecor:bathroom_tiles_dark", { description = S("Bathroom/kitchen tiles (dark)"), @@ -274,7 +275,7 @@ homedecor.register("taps", { sounds = default.node_sound_stone_defaults(), on_rightclick = taps_on_rightclick, on_destruct = homedecor.stop_particle_spawner, - on_rotate = screwdriver.disallow + on_rotate = sc_disallow or nil }) homedecor.register("taps_brass", { @@ -297,7 +298,7 @@ homedecor.register("taps_brass", { sounds = default.node_sound_stone_defaults(), on_rightclick = taps_on_rightclick, on_destruct = homedecor.stop_particle_spawner, - on_rotate = screwdriver.disallow + on_rotate = sc_disallow or nil, }) --Shower Tray @@ -347,7 +348,7 @@ homedecor.register("shower_head", { groups = {snappy=3}, selection_box = sh_cbox, walkable = false, - on_rotate = screwdriver.disallow, + on_rotate = sc_disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z}) if below and ( @@ -469,7 +470,7 @@ minetest.register_alias("table_lamp", "homedecor:table_lamp_off") -- convert old static nodes -homedecor.old_static_bathroom_tiles = { +local old_static_bathroom_tiles = { "homedecor:tiles_1", "homedecor:tiles_2", "homedecor:tiles_3", @@ -492,7 +493,7 @@ minetest.register_lbm({ name = ":homedecor:convert_bathroom_tiles", label = "Convert bathroom tiles to use param2 color", run_at_every_load = false, - nodenames = homedecor.old_static_bathroom_tiles, + nodenames = old_static_bathroom_tiles, action = function(pos, node) local name = node.name local newname = "homedecor:bathroom_tiles_light" diff --git a/homedecor_bathroom/locale/homedecor_bathroom.de.tr b/homedecor_bathroom/locale/homedecor_bathroom.de.tr new file mode 100644 index 00000000..baac732e --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.de.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Badezimmerwaschbecken +Bathroom sundries set=Badezimmerkrimskrams +Bathroom taps/faucet=Badezimmerwasserhahn +Bathroom taps/faucet (brass)=Badezimmerwasserhahn (Messing) +Bathroom/kitchen tiles (dark)=Badezimmer-/Küchenkacheln (dunkel) +Bathroom/kitchen tiles (light)=Badezimmer-/Küchenkacheln (hell) +Bathroom/kitchen tiles (medium)=Badezimmer-/Küchenkacheln (mittel) +Bathtub, clawfoot, with brass taps=Badewanne, Krallenfuß, mit Messingwasserhähnen +Bathtub, clawfoot, with chrome taps=Badewanne, Krallenfuß, mit Chromwasserhähnen +Medicine cabinet=Medizinschrank +Shower Head=Duschbrause +Shower Tray=Duschtasse +Toilet=Toilette +Toilet paper=Toilettenpapier +Towel rod with towel=Handtuchhalter mit Handtuch diff --git a/homedecor_bathroom/locale/homedecor_bathroom.es.tr b/homedecor_bathroom/locale/homedecor_bathroom.es.tr new file mode 100644 index 00000000..c105364b --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.es.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Lavabo de baño +Bathroom sundries set=Artículos de baño +Bathroom taps/faucet=Grifo de baño +Bathroom taps/faucet (brass)=Grifo de baño (latón) +Bathroom/kitchen tiles (dark)=Azulejo de baño/cocina (tonos oscuros) +Bathroom/kitchen tiles (light)=Azulejo de baño/cocina (tonos claros) +Bathroom/kitchen tiles (medium)=Azulejo de baño/cocina (tonos medios) +Bathtub, clawfoot, with brass taps= +Bathtub, clawfoot, with chrome taps= +Medicine cabinet=Gabinete de medicinas +Shower Head=Ducha +Shower Tray=Plato de ducha +Toilet=Inodoro +Toilet paper=Papel higiénico +Towel rod with towel=Toallero con toalla diff --git a/homedecor_bathroom/locale/homedecor_bathroom.fr.tr b/homedecor_bathroom/locale/homedecor_bathroom.fr.tr new file mode 100644 index 00000000..7f9ceb0b --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.fr.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Évier +Bathroom sundries set=Miroir et tablette de salle de bain +Bathroom taps/faucet=Robinetterie +Bathroom taps/faucet (brass)=Robinetterie (laiton) +Bathroom/kitchen tiles (dark)=Carreaux de salle de bain ou cuisine (foncées) +Bathroom/kitchen tiles (light)=Carreaux de salle de bain ou cuisine (claires) +Bathroom/kitchen tiles (medium)=Carreaux de salle de bain ou cuisine (moyennes) +Bathtub, clawfoot, with brass taps=Baignoire sur pieds, avec robinetterie en laiton +Bathtub, clawfoot, with chrome taps=Baignoire sur pieds, avec robinetterie en chrome +Medicine cabinet=Armoire à pharmacie +Shower Head=Pomme de douche +Shower Tray=Bac de douche +Toilet=Toilettes +Toilet paper=Papier toilette +Towel rod with towel=Porte serviette et serviette diff --git a/homedecor_bathroom/locale/homedecor_bathroom.it.tr b/homedecor_bathroom/locale/homedecor_bathroom.it.tr new file mode 100644 index 00000000..2a05cbf4 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.it.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink= +Bathroom sundries set= +Bathroom taps/faucet= +Bathroom taps/faucet (brass)= +Bathroom/kitchen tiles (dark)= +Bathroom/kitchen tiles (light)= +Bathroom/kitchen tiles (medium)= +Bathtub, clawfoot, with brass taps= +Bathtub, clawfoot, with chrome taps= +Medicine cabinet=Armadietto sotto il lavandino +Shower Head=Pigna della doccia +Shower Tray=Piatto della doccia +Toilet=Water +Toilet paper=Water +Towel rod with towel= diff --git a/homedecor_bathroom/locale/homedecor_bathroom.ms.tr b/homedecor_bathroom/locale/homedecor_bathroom.ms.tr new file mode 100644 index 00000000..ff2b8f04 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.ms.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Sinki Bilik Mandi +Bathroom sundries set=Set Barangan Bilik Mandi +Bathroom taps/faucet=Kepala Paip Bilik Mandi +Bathroom taps/faucet (brass)=Kepala Paip Bilik Mandi (Loyang) +Bathroom/kitchen tiles (dark)=Jubin Dapur/Bilik Mandi (Gelap) +Bathroom/kitchen tiles (light)=Jubin Dapur/Bilik Mandi (Cerah) +Bathroom/kitchen tiles (medium)=Jubin Dapur/Bilik Mandi (Biasa) +Bathtub, clawfoot, with brass taps=Tab Mandi Berkaki Cakar, dengan Kepala Paip Loyang +Bathtub, clawfoot, with chrome taps=Tab Mandi Berkaki Cakar, dengan Kepala Paip Krom +Medicine cabinet=Kabinet Ubat +Shower Head=Kepala Pancuran +Shower Tray=Lubang Air Mandi +Toilet=Tandas +Toilet paper=Tisu Tandas +Towel rod with towel=Ampaian Beserta Tuala diff --git a/homedecor_bathroom/locale/homedecor_bathroom.pt.tr b/homedecor_bathroom/locale/homedecor_bathroom.pt.tr new file mode 100644 index 00000000..02ba6f13 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.pt.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Pia de Banheiro +Bathroom sundries set=Espelho de Banheiro com bancada +Bathroom taps/faucet=Torneira de Banheiro +Bathroom taps/faucet (brass)=Torneira de Banheiro (latão) +Bathroom/kitchen tiles (dark)=Azulejo de Banheiro/Cozinha (escuro) +Bathroom/kitchen tiles (light)=Azulejo de Banheiro/Cozinha (claro) +Bathroom/kitchen tiles (medium)=Azulejo de Banheiro/Cozinha (médio) +Bathtub, clawfoot, with brass taps= +Bathtub, clawfoot, with chrome taps= +Medicine cabinet=Armário de remédios +Shower Head=Chuveiro +Shower Tray=Ralo do Chuveiro +Toilet=Vaso Sanitário +Toilet paper=Papel higiênico +Towel rod with towel=Haste de Toalha com Toalha diff --git a/homedecor_bathroom/locale/homedecor_bathroom.pt_BR.tr b/homedecor_bathroom/locale/homedecor_bathroom.pt_BR.tr new file mode 100644 index 00000000..02ba6f13 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.pt_BR.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Pia de Banheiro +Bathroom sundries set=Espelho de Banheiro com bancada +Bathroom taps/faucet=Torneira de Banheiro +Bathroom taps/faucet (brass)=Torneira de Banheiro (latão) +Bathroom/kitchen tiles (dark)=Azulejo de Banheiro/Cozinha (escuro) +Bathroom/kitchen tiles (light)=Azulejo de Banheiro/Cozinha (claro) +Bathroom/kitchen tiles (medium)=Azulejo de Banheiro/Cozinha (médio) +Bathtub, clawfoot, with brass taps= +Bathtub, clawfoot, with chrome taps= +Medicine cabinet=Armário de remédios +Shower Head=Chuveiro +Shower Tray=Ralo do Chuveiro +Toilet=Vaso Sanitário +Toilet paper=Papel higiênico +Towel rod with towel=Haste de Toalha com Toalha diff --git a/homedecor_bathroom/locale/homedecor_bathroom.ru.tr b/homedecor_bathroom/locale/homedecor_bathroom.ru.tr new file mode 100644 index 00000000..39a7d1a9 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.ru.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=Раковина для ванной комнаты +Bathroom sundries set=Набор для ванных комнат +Bathroom taps/faucet=м +Bathroom taps/faucet (brass)=Краны(смесители) для ванной комнаты (латунь) +Bathroom/kitchen tiles (dark)=Плитка для ванной/кухни (тёмная) +Bathroom/kitchen tiles (light)=Плитка для ванной/кухни (светлая) +Bathroom/kitchen tiles (medium)=Плитка для ванной/кухни (обычная) +Bathtub, clawfoot, with brass taps=Ванна на острых ножках с латунными кранами +Bathtub, clawfoot, with chrome taps=Ванна на острых ножках с хромированными кранами +Medicine cabinet=Медицинский кабинет +Shower Head=Душевая лейка +Shower Tray=Душевой поддон +Toilet=Туалет +Toilet paper=Туалетная бумага +Towel rod with towel=Полотенцедержатель с полотенцем diff --git a/homedecor_bathroom/locale/homedecor_bathroom.zh_CN.tr b/homedecor_bathroom/locale/homedecor_bathroom.zh_CN.tr new file mode 100644 index 00000000..97be2034 --- /dev/null +++ b/homedecor_bathroom/locale/homedecor_bathroom.zh_CN.tr @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink=浴室水槽 +Bathroom sundries set=浴室杂物套装 +Bathroom taps/faucet=浴室水龙头 +Bathroom taps/faucet (brass)=黄铜浴室水龙头 +Bathroom/kitchen tiles (dark)=深色浴室/厨房瓷砖 +Bathroom/kitchen tiles (light)=浅色浴室/厨房瓷砖 +Bathroom/kitchen tiles (medium)=浴室/厨房瓷砖 +Bathtub, clawfoot, with brass taps=带黄铜水龙头的浴缸 +Bathtub, clawfoot, with chrome taps=带镀铬水龙头的浴缸 +Medicine cabinet=药柜 +Shower Head=淋浴喷头 +Shower Tray=淋浴盆 +Toilet=卫生间 +Toilet paper=厕纸 +Towel rod with towel=毛巾杆 diff --git a/homedecor_bathroom/locale/template.txt b/homedecor_bathroom/locale/template.txt new file mode 100644 index 00000000..a692126b --- /dev/null +++ b/homedecor_bathroom/locale/template.txt @@ -0,0 +1,20 @@ +# textdomain: homedecor_bathroom + + +### init.lua ### + +Bathroom Sink= +Bathroom sundries set= +Bathroom taps/faucet= +Bathroom taps/faucet (brass)= +Bathroom/kitchen tiles (dark)= +Bathroom/kitchen tiles (light)= +Bathroom/kitchen tiles (medium)= +Bathtub, clawfoot, with brass taps= +Bathtub, clawfoot, with chrome taps= +Medicine cabinet= +Shower Head= +Shower Tray= +Toilet= +Toilet paper= +Towel rod with towel= diff --git a/homedecor_bathroom/mod.conf b/homedecor_bathroom/mod.conf new file mode 100644 index 00000000..66e6c7fb --- /dev/null +++ b/homedecor_bathroom/mod.conf @@ -0,0 +1,4 @@ +name = homedecor_bathroom +description = Homedecor mod: bathroom +depends = homedecor_common, default, basic_materials, unifieddyes, building_blocks +optional_depends = bucket, homedecor_fences, screwdriver