Deprecate poconvert

6 files changed, 15 insertions, 10 deletions

diff --git a/advtrains/init.lua b/advtrains/init.lua
index 25098d9..f99de26 100644
--- a/advtrains/init.lua
+++ b/advtrains/init.lua
@@ -52,9 +52,9 @@ advtrains.TRAIN_MAX_WAGONS = 20
 
 advtrains.modpath = minetest.get_modpath("advtrains")
 
--- Initialize internationalization (using ywang's poconvert)
+-- Continue to provide poconvert for other mods that may depend on this
 advtrains.poconvert = dofile(advtrains.modpath.."/poconvert.lua")
-advtrains.poconvert.from_flat("advtrains")
+
 -- ask engine for translator instance, this will load the translation files
 advtrains.translate = core.get_translator("advtrains")
 
diff --git a/advtrains/poconvert.lua b/advtrains/poconvert.lua
index 2934a13..322acd3 100644
--- a/advtrains/poconvert.lua
+++ b/advtrains/poconvert.lua
@@ -153,7 +153,19 @@ local function convert_po_string(textdomain, str)
 	return table.concat(st, "\n")
 end
 
+local warn_mods = {}
+
+-- warn about poconvert deprecation
+local function warn_poconvert()
+	local modname = core.get_current_modname()
+	if not warn_mods[modname] then
+		warn_mods[modname] = true
+		core.log("warning", modname .. ": poconvert is deprecated; consider using .po files directly")
+	end
+end
+
 local function convert_po_file(textdomain, inpath, outpath)
+	warn_poconvert()
 	local f, err = io.open(inpath, "rb")
 	assert(f, err)
 	local str = convert_po_string(textdomain, f:read("*a"))
@@ -164,6 +176,7 @@ end
 
 local function convert_flat_po_directory(textdomain, modpath)
 	assert(textdomain, "No textdomain specified for po file conversion")
+	warn_poconvert()
 	local mp = modpath or minetest.get_modpath(textdomain)
 	assert(mp ~= nil, "No path to write for " .. textdomain)
 	local popath = mp .. "/po"
diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua
index c30a22f..c0aaefc 100644
--- a/advtrains_interlocking/init.lua
+++ b/advtrains_interlocking/init.lua
@@ -3,8 +3,6 @@
 
 advtrains.interlocking = {}
 
--- Initialize internationalization (using ywang's poconvert)
-advtrains.poconvert.from_flat("advtrains_interlocking")
 -- ask engine for translator instance, this will load the translation files
 advtrains.interlocking.translate = core.get_translator("advtrains_interlocking")
 
diff --git a/advtrains_line_automation/init.lua b/advtrains_line_automation/init.lua
index f59f94e..8bc7ee4 100644
--- a/advtrains_line_automation/init.lua
+++ b/advtrains_line_automation/init.lua
@@ -18,8 +18,6 @@ advtrains.lines = {
 
 local modpath = minetest.get_modpath(minetest.get_current_modname()) .. DIR_DELIM
 
--- Initialize internationalization (using ywang's poconvert)
-advtrains.poconvert.from_flat("advtrains_line_automation")
 -- ask engine for translator instance, this will load the translation files
 advtrains.lines.translate = core.get_translator("advtrains_line_automation")
 
diff --git a/advtrains_luaautomation/init.lua b/advtrains_luaautomation/init.lua
index 1947993..8723837 100644
--- a/advtrains_luaautomation/init.lua
+++ b/advtrains_luaautomation/init.lua
@@ -6,8 +6,6 @@
 
 atlatc = { envs = {}}
 
--- Initialize internationalization (using ywang's poconvert)
-advtrains.poconvert.from_flat("advtrains_luaautomation")
 -- ask engine for translator instance, this will load the translation files
 atlatc.translate = core.get_translator("advtrains_luaautomation")
 
diff --git a/advtrains_train_track/init.lua b/advtrains_train_track/init.lua
index c7bcb80..3c7d0ab 100644
--- a/advtrains_train_track/init.lua
+++ b/advtrains_train_track/init.lua
@@ -1,8 +1,6 @@
 -- Default tracks for advtrains
 -- (c) orwell96 and contributors
 
--- Initialize internationalization (using ywang's poconvert)
-advtrains.poconvert.from_flat("advtrains_train_track")
 -- ask engine for translator instance, this will load the translation files
 local S = core.get_translator("advtrains_train_track")