From 204beaaaac7fcb39fa170ffa8aaf8ee857f73dd6 Mon Sep 17 00:00:00 2001
From: Louis Royer <4259825-lroyer@users.noreply.gitlab.com>
Date: Wed, 5 Aug 2020 00:51:58 +0200
Subject: [PATCH] MT5 translation for homedecor_wardrobe

- Add screwdriver to optional_depends
- Fix luacheck warnings
---
 .luacheckrc                                   |  2 ++
 homedecor_wardrobe/depends.txt                |  7 ----
 homedecor_wardrobe/init.lua                   | 35 +++++--------------
 .../locale/homedecor_wardrobe.de.tr           |  8 +++++
 .../locale/homedecor_wardrobe.es.tr           |  8 +++++
 .../locale/homedecor_wardrobe.fr.tr           |  8 +++++
 .../locale/homedecor_wardrobe.it.tr           |  8 +++++
 .../locale/homedecor_wardrobe.ms.tr           |  8 +++++
 .../locale/homedecor_wardrobe.pt.tr           |  8 +++++
 .../locale/homedecor_wardrobe.pt_BR.tr        |  8 +++++
 .../locale/homedecor_wardrobe.ru.tr           |  8 +++++
 .../locale/homedecor_wardrobe.zh_CN.tr        |  8 +++++
 homedecor_wardrobe/locale/template.txt        |  8 +++++
 homedecor_wardrobe/mod.conf                   |  4 +++
 14 files changed, 95 insertions(+), 33 deletions(-)
 delete mode 100644 homedecor_wardrobe/depends.txt
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.de.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.es.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.fr.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.it.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.ms.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.pt.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.pt_BR.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.ru.tr
 create mode 100644 homedecor_wardrobe/locale/homedecor_wardrobe.zh_CN.tr
 create mode 100644 homedecor_wardrobe/locale/template.txt
 create mode 100644 homedecor_wardrobe/mod.conf

diff --git a/.luacheckrc b/.luacheckrc
index 83ab1529..5e330dae 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -24,6 +24,8 @@ read_globals = {
 	"creative",
 	"homedecor_i18n",
 	"homedecor",
+	"player_api",
+	"skins",
 }
 
 globals = {
diff --git a/homedecor_wardrobe/depends.txt b/homedecor_wardrobe/depends.txt
deleted file mode 100644
index bb7fec08..00000000
--- a/homedecor_wardrobe/depends.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-homedecor_common
-default
-player_api
-homedecor_kitchen?
-homedecor_misc?
-3d_armor?
-skinsdb?
diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua
index 067acb30..ebbfb0e6 100644
--- a/homedecor_wardrobe/init.lua
+++ b/homedecor_wardrobe/init.lua
@@ -1,8 +1,6 @@
+local S = minetest.get_translator("homedecor_wardrobe")
 modpath = minetest.get_modpath("homedecor_wardrobe")
 
-screwdriver = screwdriver or {}
-
-local placeholder_node = "air"
 local wd_cbox = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}}
 
 -- cache set_textures function (fallback to old version)
@@ -28,7 +26,7 @@ if skinsdb_mod_path then
 
 			skin_obj:set_preview("homedecor_clothes_"..skin_name.."_preview.png")
 			skin_obj:set_texture("homedecor_clothes_"..skin_name..".png")
-			skin_obj:set_meta("name", "Wardrobe "..skin_name)
+			skin_obj:set_meta("name", S("Wardrobe").." "..skin_name)
 			skin_obj:set_meta("author", 'Calinou and Jordach')
 			skin_obj:set_meta("license", 'CC-by-SA-4.0')
 
@@ -44,16 +42,6 @@ if skinsdb_mod_path then
 	end
 end
 
-local function get_player_skin(player)
-
-	local skin = player:get_attribute("homedecor:player_skin")
-
-	if not skin or skin == "" then
-		return default_skin, true
-	end
-
-	return skin, false
-end
 
 local function set_player_skin(player, skin, save)
 
@@ -72,7 +60,6 @@ local function set_player_skin(player, skin, save)
 	if save and not skinsdb_mod_path then
 
 		if skin == default_skin then
-			skin = "default"
 			player:set_attribute("homedecor:player_skin", "")
 		else
 			player:set_attribute("homedecor:player_skin", skin)
@@ -80,13 +67,9 @@ local function set_player_skin(player, skin, save)
 	end
 end
 
-local function unset_player_skin(player)
-	set_player_skin(player, nil, true)
-end
-
 local def = {
 
-	description = "Wardrobe",
+	description = S("Wardrobe"),
 	drawtype = "mesh",
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
@@ -104,7 +87,7 @@ local def = {
 	collision_box = wd_cbox,
 	sounds = default.node_sound_wood_defaults(),
 
-	on_rotate = screwdriver.rotate_simple,
+	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
 
 	on_place = function(itemstack, placer, pointed_thing)
 
@@ -123,7 +106,7 @@ local def = {
 
 		local meta = minetest.get_meta(pos)
 
-		meta:set_string("infotext", "Wardrobe")
+		meta:set_string("infotext", S("Wardrobe"))
 
 		meta:get_inventory():set_size("main", 10)
 
@@ -143,10 +126,10 @@ local def = {
 
 		meta:set_string("formspec",  "size[5.5,8.5]" ..
 			default.gui_bg .. default.gui_bg_img .. default.gui_slots ..
-			"vertlabel[0,0.5;" .. minetest.formspec_escape("Clothes") .. "]" ..
+			"vertlabel[0,0.5;" .. minetest.formspec_escape(S("Clothes")) .. "]" ..
 			"button_exit[0,3.29;0.6,0.6;default;x]" ..
 			clothes_strings ..
-			"vertlabel[0,5.2;" .. minetest.formspec_escape("Storage") .. "]" ..
+			"vertlabel[0,5.2;" .. minetest.formspec_escape(S("Storage")) .. "]" ..
 			"list[current_name;main;0.5,4.5;5,2;]" ..
 			"list[current_player;main;0.5,6.8;5,2;]" ..
 			"listring[]"
@@ -195,8 +178,8 @@ if not skinsdb_mod_path then -- If not managed by skinsdb
 		if skin and skin ~= "" then
 
 			-- setting player skin on connect has no effect, so delay skin change
-			minetest.after(1, function(player, skin)
-				set_player_skin(player, skin)
+			minetest.after(1, function(player1, skin1)
+				set_player_skin(player1, skin1)
 			end, player, skin)
 		end
 	end)
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.de.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.de.tr
new file mode 100644
index 00000000..211248ae
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.de.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Kleidung
+Storage=Lagerraum
+Wardrobe=Kleiderschrank
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.es.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.es.tr
new file mode 100644
index 00000000..29b8b468
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.es.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Ropa
+Storage=Almacenamiento
+Wardrobe=Guardarropa
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.fr.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.fr.tr
new file mode 100644
index 00000000..6a816e84
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.fr.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Vêtements
+Storage=Rangement
+Wardrobe=Garde-robe
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.it.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.it.tr
new file mode 100644
index 00000000..869af94e
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.it.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=
+Storage=
+Wardrobe=
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.ms.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.ms.tr
new file mode 100644
index 00000000..66c44bb3
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.ms.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Pakaian
+Storage=Simpanan
+Wardrobe=Almari Pakaian
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.pt.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.pt.tr
new file mode 100644
index 00000000..73158523
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.pt.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Roupas
+Storage=Armazenamento
+Wardrobe=Guarda Roupa
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.pt_BR.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.pt_BR.tr
new file mode 100644
index 00000000..73158523
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.pt_BR.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Roupas
+Storage=Armazenamento
+Wardrobe=Guarda Roupa
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.ru.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.ru.tr
new file mode 100644
index 00000000..d1606573
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.ru.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=Одежда
+Storage=Хранилище
+Wardrobe=Гардероб
diff --git a/homedecor_wardrobe/locale/homedecor_wardrobe.zh_CN.tr b/homedecor_wardrobe/locale/homedecor_wardrobe.zh_CN.tr
new file mode 100644
index 00000000..d4a881d5
--- /dev/null
+++ b/homedecor_wardrobe/locale/homedecor_wardrobe.zh_CN.tr
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=衣服
+Storage=储藏间"
+Wardrobe=衣柜
diff --git a/homedecor_wardrobe/locale/template.txt b/homedecor_wardrobe/locale/template.txt
new file mode 100644
index 00000000..869af94e
--- /dev/null
+++ b/homedecor_wardrobe/locale/template.txt
@@ -0,0 +1,8 @@
+# textdomain: homedecor_wardrobe
+
+
+### init.lua ###
+
+Clothes=
+Storage=
+Wardrobe=
diff --git a/homedecor_wardrobe/mod.conf b/homedecor_wardrobe/mod.conf
new file mode 100644
index 00000000..8e9f955f
--- /dev/null
+++ b/homedecor_wardrobe/mod.conf
@@ -0,0 +1,4 @@
+name = homedecor_wardrobe
+description = Homedecor mod: wardrobe
+depends = homedecor_common, default, player_api
+optional_depends = homedecor_kitchen, homedecor_misc, 3d_armor, skinsdb, screwdriver