From f96aecdef59dc5b72f5bd1749cfc6fa8c79dc653 Mon Sep 17 00:00:00 2001
From: MoNTE48 <MoNTE48@mail.ua>
Date: Thu, 6 May 2021 14:34:02 +0200
Subject: [PATCH] Minor mod update

---
 README.md                 |  2 +-
 init.lua                  | 21 ++++++++++++++-------
 locale/weather_lite.ru.tr |  9 ++++++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 0409d5f..eb4e349 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Copyright (C) HybridDog (2015)
 
 Copyright (C) theFox6 (2018)
 
-Copyright (C) MultiCraft Development Team (2019-2021)
+Copyright (C) MultiCraft Development Team (2019-2020)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
diff --git a/init.lua b/init.lua
index a71e5ce..913a736 100644
--- a/init.lua
+++ b/init.lua
@@ -47,6 +47,7 @@ end
 
 -- Rain
 weather.register("rain", {
+	desc = S("Rain"),
 	falling_speed = 5,
 	amount = 6,
 	size = 20,
@@ -57,6 +58,7 @@ weather.register("rain", {
 
 -- Snow
 weather.register("snow", {
+	desc = S("Snow"),
 	falling_speed = 2,
 	amount = 5,
 	size = 35,
@@ -82,9 +84,9 @@ function weather.set(weather_type, wind)
 	end
 end
 
-local function weather_change()
-	if weather.type == "none" then
-		for id, _ in pairs(weather.registered) do
+local function weather_change(disable)
+	if weather.type == "none" and not disable then
+		for id in pairs(weather.registered) do
 			if random(3) == 1 then
 				weather.set(id, {
 					x = random(0, 8),
@@ -95,7 +97,7 @@ local function weather_change()
 				break
 			end
 		end
-		minetest.after(random(60, 300), weather_change)
+		minetest.after(random(60, 300), function() weather_change(true) end)
 	else
 		weather.set("none")
 		minetest.after(random(1800, 3600), weather_change)
@@ -234,13 +236,18 @@ minetest.register_chatcommand("weather", {
 	func = function(name, param)
 		if param and (weather.registered[param] or param == "none") then
 			weather.set(param)
-			minetest.chat_send_player(name, S("Set weather type:") .. " " .. param)
+			if param == "none" then
+				minetest.chat_send_player(name, S("Set clear weather."))
+			else
+				local setw = weather.registered[param].desc or param:gsub("^%l", string.upper)
+				minetest.chat_send_player(name, S("Set weather type: @1.", setw))
+			end
 		else
 			local types = "none"
-			for w, _ in pairs(weather.registered) do
+			for w in pairs(weather.registered) do
 				types = types .. ", " .. w
 			end
-			minetest.chat_send_player(name, S("Avalible weather types:") .. " " .. types)
+			minetest.chat_send_player(name, S("Avalible weather types: @1.", types))
 		end
 	end
 })
diff --git a/locale/weather_lite.ru.tr b/locale/weather_lite.ru.tr
index 9461e50..c1f7175 100644
--- a/locale/weather_lite.ru.tr
+++ b/locale/weather_lite.ru.tr
@@ -1,4 +1,7 @@
 # textdomain: weather_lite
-Setting the weather type=Установка тип погоды
-Set weather type:=Установлен тип погоды:
-Avalible weather types:=Доступные типы погоды:
+Setting the weather type=Установка типа погоды
+Set weather type: @1.=Установлен тип погоды: @1.
+Avalible weather types: @1.=Доступные типы погоды: @1.
+Set clear weather.=Установлена ясная погода.
+Rain=Дождь
+Snow=Снег