Skip to content

Rebase Xanthin:master #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AntumDeluge wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Rebase Xanthin:master #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7db224
Call 'global_exists' in place of 'get_modpath' for 'intllib' check
AntumDeluge Jul 9, 2017
24dd6c5
Replace deprecated function 'intllib.Getter':
AntumDeluge Jul 9, 2017
3c1b5ca
Create german translation file
Xanthin Mar 8, 2014
d6dede6
Modified cocoa.lua for translation
Xanthin Mar 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocoa.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ minetest.register_node("farming_plus:cocoa", {
})

minetest.register_craftitem("farming_plus:cocoa_bean", {
description = "Cocoa Bean",
description = S("Cocoa Bean"),
inventory_image = "farming_cocoa_bean.png",
})

Expand Down
8 changes: 6 additions & 2 deletions init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
farming.registered_plants = {}

-- Boilerplate to support localized strings if intllib mod is installed.
if (minetest.get_modpath("intllib")) then
if (minetest.global_exists("intllib")) then
dofile(minetest.get_modpath("intllib").."/intllib.lua")
farming.S = intllib.Getter(minetest.get_current_modname())
if intllib.make_gettext_pair then
farming.S = intllib.make_gettext_pair(minetest.get_current_modname())
else
farming.S = intllib.Getter(minetest.get_current_modname())
end
else
farming.S = function ( s ) return s end
end
Expand Down
14 changes: 7 additions & 7 deletions locale/de.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ Potato Seeds = Kartoffelsamen
Potato = Kartoffel

### pumpkin.lua ###
Pumpkin Seed = Kuerbissamen
Pumpkin = Kuerbis
Pumpkin Face = Kuerbislaterne
Pumpkin Face With Light = Leuchtende Kuerbislaterne
Big Pumpkin = Riesen-Kuerbis
Pumpkin Seed = Kürbissamen
Pumpkin = Kürbis
Pumpkin Face = Kürbislaterne
Pumpkin Face With Light = Leuchtende Kürbislaterne
Big Pumpkin = Riesen-Kürbis
Scarecrow = Vogelscheuche
Scarecrow With Light = Leuchtende Vogelscheuche
Pumpkin Bread = Kuerbisbrot
Pumpkin Flour = Kuerbismehl
Pumpkin Bread = Kürbisbrot
Pumpkin Flour = Kürbismehl

### rhubarb.lua ###
Rhubarb Seeds = Rhabarbersamen
Expand Down