From 6a46d4ffc1b50d6a3efb03a1e7d1b6a08064a053 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Thu, 6 Jul 2017 21:39:22 -0700 Subject: [PATCH 1/2] Use 'minetest.global_exists' in place of 'minetest.get_modpath' --- cgpsmap.lua | 2 +- init.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cgpsmap.lua b/cgpsmap.lua index cab62ed..f02b9b8 100644 --- a/cgpsmap.lua +++ b/cgpsmap.lua @@ -9,7 +9,7 @@ local growing_wall_maps=false -- Boilerplate to support localized strings if intllib mod is installed. local S -if (minetest.get_modpath("intllib")) then +if (minetest.global_exists("intllib")) then dofile(minetest.get_modpath("intllib").."/intllib.lua") S = intllib.Getter(minetest.get_current_modname()) else diff --git a/init.lua b/init.lua index e46cd18..af0c20a 100644 --- a/init.lua +++ b/init.lua @@ -16,7 +16,7 @@ -- Boilerplate to support localized strings if intllib mod is installed. local S -if (minetest.get_modpath("intllib")) then +if (minetest.global_exists("intllib")) then S = intllib.Getter() else S = function ( s ) return s end From bed7d473ec131a14b4a7cbebb784350a8a9ec698 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Thu, 6 Jul 2017 21:42:46 -0700 Subject: [PATCH 2/2] Replace deprecated 'intllib.Getter' with 'intllib.make_gettext_pair': Checks for 'intllib.make_gettext_pair', otherwise uses older 'intllib.Getter'. --- cgpsmap.lua | 6 +++++- init.lua | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cgpsmap.lua b/cgpsmap.lua index f02b9b8..877ee69 100644 --- a/cgpsmap.lua +++ b/cgpsmap.lua @@ -11,7 +11,11 @@ local growing_wall_maps=false local S if (minetest.global_exists("intllib")) then dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) + if (intllib.make_gettext_pair) then + S = intllib.make_gettext_pair(minetest.get_current_modname()) + else + S = intllib.Getter(minetest.get_current_modname()) + end else S = function ( s ) return s end end diff --git a/init.lua b/init.lua index af0c20a..b13e1cc 100644 --- a/init.lua +++ b/init.lua @@ -17,7 +17,11 @@ -- Boilerplate to support localized strings if intllib mod is installed. local S if (minetest.global_exists("intllib")) then - S = intllib.Getter() + if (intllib.make_gettext_pair) then + S = intllib.make_gettext_pair() + else + S = intllib.Getter() + end else S = function ( s ) return s end end