Add Russian translation

Multiple improvements and add new supported mods

food/init.lua

@@ -98,7 +98,7 @@ function minetest.register_node(name, def)
 end
 
 function food.strip_name(name)
-	res = name:gsub('%"', '')
+	local res = name:gsub('%"', '')
 	if res:sub(1, 1) == ":" then
 		res = res:sub(2, #res)
 		--table.concat{res:sub(1, 1-1), "", res:sub(1+1)}
@@ -174,9 +174,9 @@ function food.item_eat(amt)
 	elseif minetest.get_modpath("hud") and global_exists("hud") and hud.item_eat then
 		return hud.item_eat(amt)
 	elseif minetest.get_modpath("hbhunger") then
-		if global_exists("hbhunger") then
+		if global_exists("hbhunger") and hbhunger.item_eat then
 			return hbhunger.item_eat(amt)
-		elseif global_exists("hunger") then
+		elseif global_exists("hunger") and hunger.item_eat then
 			-- For backwards compatibility
 			-- It used to be called `hunger` rather than `hbhunger`
 			return hunger.item_eat(amt)

food_basic/depends.txt

@@ -1,8 +1,10 @@
 food
 animalmaterials?
+bushes?
 bushes_classic?
 default?
 docfarming?
+ethereal?
 farming?
 farming_plus?
 intllib?
@@ -10,7 +12,9 @@ jkanimals?
 jkfarming?
 my_mobs?
 mobs?
+mobs_animal?
 mobfcooking?
+mtfoods?
 plantlib?
 veggies?
 vessels?

food_basic/ingredients.lua

@@ -8,9 +8,8 @@
 
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = 0
-if rawget(_G, "intllib") then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
 	S = function ( s ) return s end
 end
@@ -261,6 +260,23 @@ food.module("butter", function()
 		inventory_image = "food_butter.png",
 		groups = {food_butter=1}
 	})
+	food.craft({
+		output = "food:butter",
+		recipe = {{"group:food_milkbucket","group:food_milkbucket"}},
+		replacements = { 
+			{"group:food_milkbucket","bucket:bucket_empty"},
+			{"group:food_milkbucket","bucket:bucket_empty"} 
+		},
+	})
+	food.craft({
+		output = "food:butter",
+		recipe = {
+			{"group:food_milk","group:food_milkbucket"}
+		},
+		replacements = { 
+			{"group:food_milkbucket","bucket:bucket_empty"},
+		},
+	})
 	food.craft({
 		output = "food:butter",
 		recipe = {

food_basic/init.lua

@@ -13,9 +13,8 @@ dofile(minetest.get_modpath("food_basic").."/ingredients.lua")
 
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = 0
-if rawget(_G, "intllib") then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
 	S = function ( s ) return s end
 end
@@ -95,9 +94,13 @@ food.module("pasta_bake", function()
 end)
 
 -- Register Soups
+local chicken = "meat"
+if minetest.get_modpath("mobs") and mobs.mod == "redo" then
+	chicken = "chicken"
+end
 local soups = {
 	{"tomato", "tomato"},
-	{"chicken", "meat"}
+	{"chicken", chicken}
 }
 for i=1, #soups do
 	local flav = soups[i]

food_basic/locale/es.txt

@@ -0,0 +1,40 @@
+# template
+
+Wheat = Trigo
+Flour = Harina
+Potato = Patata
+Tomato = Tomate
+Carrot = Zanahoria
+Orange = Naranja
+Milk = Leche
+Egg = Huevo
+Cocoa Bean = Grano de Cacao
+Raw meat = Carne cruda
+Venison = Venado
+Sugar = Azúcar
+Chocolate Powder = Polvo de Chocolate
+Dark Chocolate = Chocolate Oscuro
+Milk Chocolate = Chocolate con Leche
+Pasta = Pasta
+Bowl = Cuenco
+Butter = Manteca
+Cheese = Queso
+Baked Potato = Patata al Horno
+Pasta Bake = Horneado de Pasta
+Raw Pasta Bake = Horneado de Pasta Crudo
+chicken Soup = Sopa de Pollo
+tomato Soup = Sopa de Tomate
+Uncooked tomato Soup = Sopa de tomate sin Cocer
+Uncooked chicken Soup = Sopa de pollo sin Cocer
+apple Juice = Jugo de manzana
+cactus Juice = Jugo de cácto
+Rainbow Juice = Jugo de arcoíris
+Orange Juice = Jugo de naranja
+Cake = Pastel
+Chocolate Cake = Pastel de Chocolate
+Carrot Cake = Pastel de Zanahoria
+Cheese cake = Pastel de Queso
+Cake Mix = Mezcla para Pastel
+Chocolate Cake Mix = Mezcla para Pastel de Chocolate
+Carrot Cake Mix = Mezcla para Pastel de Zanahoria
+Cheese Cake Mix = Mezcla para Pastel de Queso

food_basic/locale/ru.txt

@@ -0,0 +1,37 @@
+# Translation by Xanthin and hawkril
+
+Wheat = Пшеница
+Flour = Мука
+Potato = Картофель
+Tomato = Помидор
+Carrot = Морковь
+Orange = Апельсин
+Milk = Молоко
+Egg = Яйцо
+Cocoa Bean = Какао-Бобы
+Raw meat = Сырое мясо
+Venison = Оленина
+Sugar = Сахар
+Chocolate Powder = Шоколадный порошок
+Dark Chocolate = Чёрный шоколад
+Milk Chocolate = Молочный шоколад
+Pasta = Паста
+Bowl = Чашка
+Butter = Масло
+Cheese = Сыр
+Baked Potato = Печёный картофель
+Pasta Bake = Макаронные изделия
+Raw Pasta Bake = Сырая паста
+chicken Soup = Куриный суп
+tomato Soup = Томатный суп
+Uncooked tomato Soup = Сырой томатный суп
+Uncooked chicken Soup = Сырой куриный суп
+apple Juice = Яблочный сок
+cactus Juice = Кактусовый сок
+Rainbow Juice = Радужный сок
+Cake = Торт
+Chocolate Cake = Шоколадный торт
+Carrot Cake = Морковный торт
+Cake Mix = Полуфабрикат торта
+Chocolate Cake Mix = Полуфабрикат шоколадного торта
+Carrot Cake Mix = Полуфабрикат морковного торта

food_basic/locale/tr.txt

@@ -0,0 +1,40 @@
+# mahmutelmas06@gmail.com
+
+Wheat = Buğday	
+Flour = Un
+Potato = Patates
+Tomato = Domates
+Carrot = Havuç
+Orange = Portakal
+Milk = Süt
+Egg = Yumurta
+Cocoa Bean = Kakao Çekirdeği
+Raw meat = Çiğ et
+Venison = Geyik Eti
+Sugar = Şeker
+Chocolate Powder = Çikolata tozu
+Dark Chocolate = Bitter çikolata
+Milk Chocolate = Sütlü çikolata
+Pasta = Makarna
+Bowl = Kase
+Butter = Tereyağı
+Cheese = Peynir
+Baked Potato = Fırında Patates
+Pasta Bake = Fırında Makarna
+Raw Pasta Bake = Çiğ Makarna
+chicken Soup = Tavuk çorbası
+tomato Soup = Domates çorbası
+Uncooked tomato Soup = Pişmemiş domates çorbası
+Uncooked chicken Soup = Pişmemiş tavuk çorbası
+apple Juice = Elma suyu
+cactus Juice = Kaktüs suyu
+Rainbow Juice = Gökkuşağı suyu
+Orange Juice = Portakal suyu
+Cake = Kek
+Chocolate Cake = Çikolatalı kek
+Carrot Cake = Havuçlu kek
+Cheese cake = Peynirli kek
+Cake Mix = Pişmemiş kek
+Chocolate Cake Mix = Pişmemiş çikolatalı kek
+Carrot Cake Mix = Pişmemiş havuçlu kek
+Cheese Cake Mix = Pişmemiş peynirli kek

food_basic/support.lua

@@ -16,7 +16,12 @@ food.support("cocoa", "farming_plus:cocoa_bean")
 food.support("cup", "vessels:drinking_glass")
 food.support("cactus", "default:cactus")
 food.support("apple", "default:apple")
-food.support("orange", "farming_plus:orange_item")
+food.support("orange", {
+	"farming_plus:orange_item",
+	"ethereal:orange",
+})
+food.disable_if("ethereal", "orange")
+
 food.support("potato", {
 	"docfarming:potato",
 	"veggies:potato",
@@ -35,8 +40,11 @@ food.support("carrot", {
 food.support("milk", {
 	"animalmaterials:milk",
 	"my_mobs:milk_glass_cup",
+	"mtfoods:dandelion_milk"
+})
+food.support("milkbucket", {
 	"jkanimals:bucket_milk",
-	"mobs:bucket_milk"
+	"mobs:bucket_milk",
 })
 food.support("egg", {
 	"animalmaterials:egg",
@@ -55,7 +63,8 @@ food.support("meat", {
 })
 food.support("sugar", {
 	"jkfarming:sugar",
-	"bushes:sugar"
+	"bushes:sugar",
+	"mtfoods:sugar"
 })
 
 if farming and farming.mod == "redo" then
@@ -65,6 +74,7 @@ if farming and farming.mod == "redo" then
 	food.support("potato", "farming:potato")
 	food.support("tomato", "farming:tomato")
 	food.support("cocoa", "farming:cocoa_beans")
+	food.support("coffee", "farming:coffee_beans")
 	food.support("dark_chocolate", "farming:chocolate_dark")
 	food.support("sugar", "farming:sugar")
 	food.support("cup", "farming:drinking_cup")
@@ -74,10 +84,10 @@ else
 	food.support("flour", "farming:flour")
 end
 
-if minetest.get_modpath("mtfoods") then
-	food.support("strawberry", "farming_plus:strawberry_item")
-	food.support("strawberry", "plantlib:strawberry")
-	food.support("strawberry", "bushes:strawberry")
-	food.support("rhubarb", "farming_plus:rhubarb_item")
+if minetest.get_modpath("mobs") and mobs.mod == "redo" then
+	if minetest.get_modpath("mobs_animal") then
+		food.support("chicken", "mobs:chicken_cooked")
+	else
+		food.support("chicken", "mobs:meat")
+	end
 end
-