From 44da339202747490a20fe6bb60c8c772c29eb94c Mon Sep 17 00:00:00 2001
From: Bill Ferguson <wpferguson@gmail.com>
Date: Thu, 17 Oct 2024 22:17:38 -0400
Subject: [PATCH] alias gettext to darktable.gettext.gettext then change the
 call to gettext to only pass the message to be translated

---
 contrib/AutoGrouper.lua            | 4 ++--
 contrib/auto_snapshot.lua          | 2 +-
 contrib/dbmaint.lua                | 2 +-
 contrib/gpx_export.lua             | 4 ++--
 contrib/passport_guide_germany.lua | 4 ++--
 contrib/transfer_hierarchy.lua     | 3 ++-
 lib/dtutils/file.lua               | 7 ++-----
 lib/dtutils/string.lua             | 3 ++-
 tools/script_manager.lua           | 4 ++--
 9 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/contrib/AutoGrouper.lua b/contrib/AutoGrouper.lua
index 72654ae2..f8d8061b 100644
--- a/contrib/AutoGrouper.lua
+++ b/contrib/AutoGrouper.lua
@@ -43,10 +43,10 @@ du.check_min_api_version("7.0.0", "AutoGrouper")
 
 local MOD = 'autogrouper'
 
-local gettext = dt.gettext
+local gettext = dt.gettext.gettext
 
 local function _(msgid)
-  return gettext.gettext(msgid)
+  return gettext(msgid)
 end
 
 -- return data structure for script_manager
diff --git a/contrib/auto_snapshot.lua b/contrib/auto_snapshot.lua
index 3b883412..e3ede5b1 100644
--- a/contrib/auto_snapshot.lua
+++ b/contrib/auto_snapshot.lua
@@ -60,7 +60,7 @@ du.check_min_api_version("7.0.0", MODULE)   -- choose the minimum version that c
 local gettext = dt.gettext.gettext
 
 local function _(msgid)
-    return gettext(MODULE, msgid)
+    return gettext(msgid)
 end
 
 
diff --git a/contrib/dbmaint.lua b/contrib/dbmaint.lua
index 8d24f1d2..044a9ac5 100644
--- a/contrib/dbmaint.lua
+++ b/contrib/dbmaint.lua
@@ -64,7 +64,7 @@ du.check_min_api_version("7.0.0", MODULE)   -- choose the minimum version that c
 local gettext = dt.gettext.gettext
 
 local function _(msgid)
-    return gettext(MODULE, msgid)
+    return gettext(msgid)
 end
 
 
diff --git a/contrib/gpx_export.lua b/contrib/gpx_export.lua
index 84fc7bf9..1525aff8 100644
--- a/contrib/gpx_export.lua
+++ b/contrib/gpx_export.lua
@@ -25,12 +25,12 @@ For each source folder, a separate <trk> is generated in the gpx file.
 local dt = require "darktable"
 local df = require "lib/dtutils.file"
 local dl = require "lib/dtutils"
-local gettext = dt.gettext
+local gettext = dt.gettext.gettext
 
 dl.check_min_api_version("7.0.0", "gpx_export") 
 
 local function _(msgid)
-  return gettext.dgettext("gpx_export", msgid)
+  return gettext(msgid)
 end
 
 -- return data structure for script_manager
diff --git a/contrib/passport_guide_germany.lua b/contrib/passport_guide_germany.lua
index 9b34d0b1..745f86df 100644
--- a/contrib/passport_guide_germany.lua
+++ b/contrib/passport_guide_germany.lua
@@ -40,13 +40,13 @@ USAGE
 
 local dt = require "darktable"
 local du = require "lib/dtutils"
-local gettext = dt.gettext
+local gettext = dt.gettext.gettext
 
 du.check_min_api_version("2.0.0", "passport_guide_germany") 
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
 local function _(msgid)
-  return gettext.dgettext("passport_guide_germany", msgid)
+  return gettext(msgid)
 end
 
 local script_data = {}
diff --git a/contrib/transfer_hierarchy.lua b/contrib/transfer_hierarchy.lua
index 465b4f7e..16c23593 100755
--- a/contrib/transfer_hierarchy.lua
+++ b/contrib/transfer_hierarchy.lua
@@ -76,12 +76,13 @@ local darktable = require("darktable")
 local dtutils = require("lib/dtutils")
 local dtutils_file = require("lib/dtutils.file")
 local dtutils_system = require("lib/dtutils.system")
+local gettext = darktable.gettext.gettext
 
 local LIB_ID = "transfer_hierarchy"
 dtutils.check_min_api_version("7.0.0", LIB_ID) 
 
 local function _(msgid)
-    return darktable.gettext.gettext(msgid)
+    return gettext(msgid)
 end
 
 -- return data structure for script_manager
diff --git a/lib/dtutils/file.lua b/lib/dtutils/file.lua
index e33fa5aa..13197b97 100644
--- a/lib/dtutils/file.lua
+++ b/lib/dtutils/file.lua
@@ -24,15 +24,12 @@ dtutils_file.libdoc = {
   functions = {}
 }
 
-local gettext = dt.gettext
+local gettext = dt.gettext.gettext
 
 du.check_min_api_version("5.0.0", "dtutils.file")
 
--- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("dtutils.file",dt.configuration.config_dir.."/lua/locale/")
-
 local function _(msgid)
-    return gettext.dgettext("dtutils.file", msgid)
+    return gettext(msgid)
 end
 
 --[[
diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua
index 2310a496..5cf49cd3 100644
--- a/lib/dtutils/string.lua
+++ b/lib/dtutils/string.lua
@@ -3,11 +3,12 @@ local dtutils_string = {}
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local log = require "lib/dtutils.log"
+local gettext = dt.gettext.gettext
 
 local DEFAULT_LOG_LEVEL = log.error
 
 local function _(msg)
-  return dt.gettext.gettext(msg)
+  return gettext(msg)
 end
 
 dtutils_string.log_level = DEFAULT_LOG_LEVEL
diff --git a/tools/script_manager.lua b/tools/script_manager.lua
index 7991672e..a925d847 100644
--- a/tools/script_manager.lua
+++ b/tools/script_manager.lua
@@ -56,10 +56,10 @@ local dtsys = require "lib/dtutils.system"
 local log = require "lib/dtutils.log"
 local debug = require "darktable.debug"
 
-local gettext = dt.gettext
+local gettext = dt.gettext.gettext
 
 local function _(msgid)
-    return gettext.dgettext("script_manager", msgid)
+    return gettext(msgid)
 end
 
 -- api check