Merge branch 'crabman77-translation'

Moved support of ethereal strawberry from food_basic to here

depends.txt

@@ -1,5 +0,0 @@
-food
-farming_plus?
-plantlib?
-bushes_classic?
-bushes?

description.txt

@@ -1 +0,0 @@
-Expansion pack for the food mod. Adds cakes, buns and tarts.

init.lua

@@ -13,20 +13,27 @@ if not food or not food.version or food.version < 2.3 then
 	error("You need to update your version of the Food mod - it is too old")
 end
 
--- Boilerplate to support localized strings if intllib mod is installed.
+-- Boilerplate to support localized strings.
-local S
+local S = minetest.get_translator("food_sweet")
-if (minetest.get_modpath("intllib")) then
+
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
+food.support("strawberry", {
-	S = intllib.Getter(minetest.get_current_modname())
+		"farming_plus:strawberry_item",
-else
+		"plantlib:strawberry",
-	S = function ( s ) return s end
+		"bushes:strawberry",
-end
+		"ethereal:strawberry"
+})
+
+food.support("blueberry", {"default:blueberries", "bushes:blueberry"})
 
-food.support("strawberry", {"farming_plus:strawberry_item", "plantlib:strawberry", "bushes:strawberry"})
 food.support("rhubarb", "farming_plus:rhubarb_item")
 
-if minetest.setting_get("food_sweet_use_2d")==nil then
+if farming and farming.mod == "redo" then
-	minetest.setting_set("food_sweet_use_2d", "1")
+	food.support("rhubarb", "farming:rhubarb")
+	food.support("blueberry", "farming:blueberries")
+end
+
+if minetest.settings:get("food_sweet_use_2d")==nil then
+	minetest.settings:set("food_sweet_use_2d", "1")
 end
 
 food.module("walnut",function()
@@ -426,3 +433,4 @@ food.module("muffin_choco", function()
 	})
 end)
 
+minetest.log("action", "[food_sweet] loaded.")

locale/de.txt

@@ -1 +0,0 @@
-Strawberry = Erdbeere

locale/food_sweet.de.tr

@@ -0,0 +1,37 @@
+# textdomain: food_sweet
+
+### init.lua ###
+Walnut=
+Strawberry=Strawberry
+Blueberry=
+Rhubarb=
+Lemon=
+
+# Cakes
+Walnut and Coffee Cake=
+Walnut and Coffee Cake Mix=
+Strawberry Cheese Cake=
+Strawberry Cheese Cake Mix=
+Blueberry Cheese Cake=
+Blueberry Cheese Cake Mix=
+Triple Chocolate Cake=
+Triple Chocolate Cake Mix=
+Wedding Cake=
+
+# Crumbles
+Rhubarb Crumble=
+Raw Rhubarb Crumble=
+
+# Cupcake and derivs
+Cupcake=
+Cupcake Mix=
+Chocolate Cupcake=
+Chocolate Cupcake Mix=
+Lemon Drizzle Cupcake=
+Fairy Cake=
+
+# Muffins
+Blueberry Muffin=
+Blueberry Muffin Mix=
+Chocolate Chip Muffin=
+Chocolate Chip Muffin Mix=

locale/food_sweet.fr.tr

@@ -0,0 +1,41 @@
+# textdomain: food_sweet
+
+### init.lua ###
+
+
+Walnut=Noix
+Strawberry=Fraise
+Blueberry=Myrtille
+Rhubarb=Rhubarbe
+Lemon=Citron
+
+# Cakes
+Walnut and Coffee Cake=Gâteau aux noix et au café
+Walnut and Coffee Cake Mix=Mélange à gâteau aux noix et au café
+Strawberry Cheese Cake=Gâteau au fromage et aux fraises
+Strawberry Cheese Cake Mix=Mélange à gâteau au fromage et aux fraises
+Blueberry Cheese Cake=Gateau au fromage et aux myrtilles
+Blueberry Cheese Cake Mix=Mélange à gâteau au fromage et aux myrtilles
+Triple Chocolate Cake=Gâteau aux trois chocolats
+Triple Chocolate Cake Mix=Mélange à gâteau triple chocolat
+Wedding Cake=Gâteau de mariage
+
+# Crumbles
+Rhubarb Crumble=Crumble à la rhubarbe
+Raw Rhubarb Crumble=Crumble à la rhubarbe crue
+
+
+# Cupcake and derivs
+Cupcake=Cupcake
+Cupcake Mix=Mélange à cupcakes
+Chocolate Cupcake=Cupcake au chocolat
+Chocolate Cupcake Mix=Mélange à cupcakes au chocolat
+Lemon Drizzle Cupcake=Cupcake au citron
+Fairy Cake=Gateau féerique
+
+
+# Muffins
+Blueberry Muffin=Muffin aux myrtilles
+Blueberry Muffin Mix=Mélange pour muffins aux myrtilles
+Chocolate Chip Muffin=Muffin aux pépites de chocolat
+Chocolate Chip Muffin Mix=Mélange pour muffins aux pépites de chocolat

locale/template.txt

@@ -1,37 +1,37 @@
-# template
+# textdomain: food_sweet
-# Supported
+
-Walnut =
+### init.lua ###
-Strawberry =
+Walnut=
-Blueberry =
+Strawberry=
-Rhubarb =
+Blueberry=
-Lemon =
+Rhubarb=
+Lemon=
 
 # Cakes
-Walnut and Coffee Cake =
+Walnut and Coffee Cake=
-Walnut and Coffee Cake Mix =
+Walnut and Coffee Cake Mix=
-Strawberry Cheese Cake =
+Strawberry Cheese Cake=
-Strawberry Cheese Cake Mix =
+Strawberry Cheese Cake Mix=
-Blueberry Cheese Cake =
+Blueberry Cheese Cake=
-Blueberry Cheese Cake Mix =
+Blueberry Cheese Cake Mix=
-Triple Chocolate Cake =
+Triple Chocolate Cake=
-Triple Chocolate Cake Mix =
+Triple Chocolate Cake Mix=
-Wedding Cake =
+Wedding Cake=
 
 # Crumbles
-Rhubarb Crumble =
+Rhubarb Crumble=
-Raw Rhubarb Crumble =
+Raw Rhubarb Crumble=
 
 # Cupcake and derivs
-Cupcake =
+Cupcake=
-Cupcake Mix =
+Cupcake Mix=
-Chocolate Cupcake =
+Chocolate Cupcake=
-Chocolate Cupcake Mix =
+Chocolate Cupcake Mix=
-Lemon Drizzle Cupcake =
+Lemon Drizzle Cupcake=
-Fairy Cake =
+Fairy Cake=
 
 # Muffins
-Chocolate Chip Muffin =
+Blueberry Muffin=
-Chocolate Chip Muffin Mix =
+Blueberry Muffin Mix=
-Blueberry Muffin =
+Chocolate Chip Muffin=
-Blueberry Muffin Mix =
+Chocolate Chip Muffin Mix=
-

mod.conf

@@ -0,0 +1,4 @@
+name = food_sweet
+title = Food Sweet
+description = Adds cakes, buns and tarts. Expansion pack for the food mod.
+depends = food_basic