Skip to content

Possible translation solution #285

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.

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

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions contrib/AutoGrouper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ local dt = require "darktable"
local MOD = 'autogrouper'
local gettext = dt.gettext
-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("AutoGrouper",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")
local function _(msgid)
return gettext.dgettext("AutoGrouper", msgid)
return gettext.dgettext("scripts", msgid)
end

local Ag = {}
Expand Down
4 changes: 2 additions & 2 deletions contrib/CollectHelper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ local previous = nil
local all_active = false

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("CollectHelper",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("CollectHelper", msgid)
return gettext.dgettext("scripts", msgid)
end

-- FUNCTION --
Expand Down
4 changes: 2 additions & 2 deletions contrib/HDRMerge.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ if dt.configuration.running_os == 'windows' then os_path_seperator = '\\' end

-- Tell gettext where to find the .mo file translating messages for a particular domain
local gettext = dt.gettext
gettext.bindtextdomain('HDRMerge',dt.configuration.config_dir..'/lua/locale/')
gettext.bindtextdomain('scripts',dt.configuration.config_dir..'/lua/locale/')
local function _(msgid)
return gettext.dgettext('HDRMerge', msgid)
return gettext.dgettext('scripts', msgid)
end

local temp
Expand Down
4 changes: 2 additions & 2 deletions contrib/OpenInExplorer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ local gettext = dt.gettext
du.check_min_api_version("5.0.0", "OpenInExplorer")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("OpenInExplorer",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("OpenInExplorer", msgid)
return gettext.dgettext("scripts", msgid)
end

local act_os = dt.configuration.running_os
Expand Down
6 changes: 3 additions & 3 deletions contrib/RL_out_sharp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ local PS = dt.configuration.running_os == "windows" and "\\" or "/"

-- translation
local gettext = dt.gettext
gettext.bindtextdomain(MODULE_NAME, dt.configuration.config_dir..PS.."lua"..PS.."locale"..PS)
gettext.bindtextdomain("scripts", dt.configuration.config_dir..PS.."lua"..PS.."locale"..PS)
local function _(msgid)
return gettext.dgettext(MODULE_NAME, msgid)
end
return gettext.dgettext("scripts", msgid)
end

-- initialize module preferences
if not dt.preferences.read(MODULE_NAME, "initialized", "bool") then
Expand Down
36 changes: 23 additions & 13 deletions contrib/autostyle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ local darktable = require "darktable"
local du = require "lib/dtutils"
local filelib = require "lib/dtutils.file"

local gettext = darktable.gettext


-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("scripts",darktable.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("scripts", msgid)
end

-- Forward declare the functions
local autostyle_apply_one_image,autostyle_apply_one_image_event,autostyle_apply,exiftool_attribute,capture

Expand All @@ -58,19 +68,19 @@ function autostyle_apply_one_image (image)

-- check they all exist (correct syntax)
if (not tag) then
darktable.print("EXIF TAG not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
darktable.print(_("EXIF TAG not found in ") .. darktable.preferences.read("autostyle","exif_tag","string"))
return 0
end
if (not value) then
darktable.print("value to match not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
darktable.print(_("value to match not found in ") .. darktable.preferences.read("autostyle","exif_tag","string"))
return 0
end
if (not style_name) then
darktable.print("style name not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
darktable.print(_("style name not found in ") .. darktable.preferences.read("autostyle","exif_tag","string"))
return 0
end
if not filelib.check_if_bin_exists("exiftool") then
darktable.print("Can't find exiftool")
darktable.print(_("Can't find exiftool"))
return 0
end

Expand All @@ -84,7 +94,7 @@ function autostyle_apply_one_image (image)
end
end
if (not style) then
darktable.print("style not found for autostyle: " .. style_name)
darktable.print(_("style not found for autostyle: ") .. style_name)
return 0
end

Expand All @@ -93,15 +103,15 @@ function autostyle_apply_one_image (image)
--darktable.print_error("dr_attr:" .. auto_dr_attr)
-- If the lookup fails, stop here
if (not ok) then
darktable.print("Couldn't get attribute " .. auto_dr_attr .. " from exiftool's output")
darktable.print(_("Couldn't get attribute ") .. auto_dr_attr .. _(" from exiftool's output"))
return 0
end
if auto_dr_attr==value then
darktable.print_log("Image " .. image.filename .. ": autostyle automatically applied " .. darktable.preferences.read("autostyle","exif_tag","string") )
darktable.print_log(_("Image ") .. image.filename .. _(": autostyle automatically applied ") .. darktable.preferences.read("autostyle","exif_tag","string") )
darktable.styles.apply(style,image)
return 1
else
darktable.print_log("Image " .. image.filename .. ": autostyle not applied, exif tag " .. darktable.preferences.read("autostyle","exif_tag","string") .. " not matched: " .. auto_dr_attr)
darktable.print_log(_("Image ") .. image.filename .. _(": autostyle not applied, exif tag ") .. darktable.preferences.read("autostyle","exif_tag","string") .. _(" not matched: ") .. auto_dr_attr)
return 0
end
end
Expand All @@ -115,7 +125,7 @@ function autostyle_apply( shortcut)
images_submitted = images_submitted +1
images_processed = images_processed + autostyle_apply_one_image(image)
end
darktable.print("Applied auto style to " .. images_processed .. " out of " .. images_submitted .. " image(s)")
darktable.print(_("Applied auto style to ") .. images_processed .. _(" out of ") .. images_submitted .. _(" image(s)"))
end

-- Retrieve the attribute through exiftool
Expand All @@ -124,9 +134,9 @@ function exiftool_attribute(path,attr)
local exifresult=get_stdout(cmd)
local attribute=string.match(exifresult,": (.*)")
if (attribute == nil) then
darktable.print_error( "Could not find the attribute " .. attr .. " using the command: <" .. cmd .. ">")
darktable.print_error(_("Could not find the attribute ") .. attr .. _(" using the command: <") .. cmd .. _(">"))
-- Raise an error to the caller
error( "Could not find the attribute " .. attr .. " using the command: <" .. cmd .. ">");
error(_("Could not find the attribute ") .. attr .. _(" using the command: <") .. cmd .. _(">"));
end
-- darktable.print_error("Returning attribute: " .. attribute)
return attribute
Expand All @@ -152,9 +162,9 @@ end

-- Registering events
darktable.register_event("shortcut",autostyle_apply,
"Apply your chosen style from exiftool tags")
_("Apply your chosen style from exiftool tags"))

darktable.preferences.register("autostyle","exif_tag","string","Autostyle: EXIF_tag=value=>style","apply a style automatically if an EXIF_tag matches value. Find the tag with exiftool","")
darktable.preferences.register("autostyle","exif_tag","string","Autostyle: EXIF_tag=value=>style",_("apply a style automatically if an EXIF_tag matches value. Find the tag with exiftool"),"")

darktable.register_event("post-import-image",autostyle_apply_one_image_event)

Expand Down
4 changes: 2 additions & 2 deletions contrib/clear_GPS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ du.check_min_api_version("3.0.0", "clear_GPS")


-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("clear_GPS",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("clear_GPS", msgid)
return gettext.dgettext("scripts", msgid)
end

local function clear_GPS(images)
Expand Down
4 changes: 2 additions & 2 deletions contrib/copy_attach_detach_tags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ local gettext = dt.gettext
du.check_min_api_version("3.0.0", "copy_attach_detach_tags")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("copy_attach_detach_tags",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("copy_attach_detach_tags", msgid)
return gettext.dgettext("scripts", msgid)
end

local cadt = {}
Expand Down
4 changes: 2 additions & 2 deletions contrib/enfuseAdvanced.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ du.check_min_api_version('5.0.0', 'enfuseAdvanced')

-- Tell gettext where to find the .mo file translating messages for a particular domain
local gettext = dt.gettext
gettext.bindtextdomain('enfuseAdvanced',dt.configuration.config_dir..'/lua/locale/')
gettext.bindtextdomain('scripts',dt.configuration.config_dir..'/lua/locale/')
local function _(msgid)
return gettext.dgettext('enfuseAdvanced', msgid)
return gettext.dgettext('scripts', msgid)
end

-- INITS --
Expand Down
4 changes: 2 additions & 2 deletions contrib/exportLUT.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ local ds = require("lib/dtutils.system")

local gettext = dt.gettext

gettext.bindtextdomain("exportLUT",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("exportLUT", msgid)
return gettext.dgettext("scripts", msgid)
end

du.check_min_api_version("5.0.0", "exportLUT")
Expand Down
4 changes: 2 additions & 2 deletions contrib/ext_editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ ee.widgets = {}

-- translation
local gettext = dt.gettext
gettext.bindtextdomain(MODULE_NAME, dt.configuration.config_dir..PS.."lua"..PS.."locale"..PS)
gettext.bindtextdomain("scripts", dt.configuration.config_dir..PS.."lua"..PS.."locale"..PS)
local function _(msgid)
return gettext.dgettext(MODULE_NAME, msgid)
return gettext.dgettext("scripts", msgid)
end

-- maximum number of external programs, can be increased to necessity
Expand Down
4 changes: 2 additions & 2 deletions contrib/face_recognition.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ fc.event_registered = false
du.check_min_api_version("5.0.0", "face_recognition")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("face_recognition", dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts", dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("face_recognition", msgid)
return gettext.dgettext("scripts", msgid)
end

local function build_image_table(images)
Expand Down
4 changes: 2 additions & 2 deletions contrib/fujifilm_ratings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ local gettext = dt.gettext

du.check_min_api_version("4.0.0", "fujifilm_ratings")

gettext.bindtextdomain("fujifilm_ratings", dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts", dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("fujifilm_ratings", msgid)
return gettext.dgettext("scripts", msgid)
end

local function detect_rating(event, image)
Expand Down
4 changes: 2 additions & 2 deletions contrib/geoJSON_export.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ local gettext = dt.gettext
du.check_min_api_version("3.0.0", "geoJSON_export")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("geoJSON_export",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("geoJSON_export", msgid)
return gettext.dgettext("scripts", msgid)
end

-- Sort a table
Expand Down
4 changes: 2 additions & 2 deletions contrib/geoToolbox.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ local gettext = dt.gettext
du.check_min_api_version("3.0.0", "geoToolbox")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("geoToolbox",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("geoToolbox", msgid)
return gettext.dgettext("scripts", msgid)
end


Expand Down
4 changes: 2 additions & 2 deletions contrib/gimp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ local gimp_widget = nil
du.check_min_api_version("5.0.0", "gimp")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("gimp",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("gimp", msgid)
return gettext.dgettext("scripts", msgid)
end

local function group_if_not_member(img, new_img)
Expand Down
4 changes: 2 additions & 2 deletions contrib/gpx_export.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ local gettext = dt.gettext
dl.check_min_api_version("3.0.0", "gpx-export")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("gpx_export",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("gpx_export", msgid)
return gettext.dgettext("scripts", msgid)
end

local gpx = {}
Expand Down
6 changes: 3 additions & 3 deletions contrib/hugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ local PQ = dt.configuration.running_os == "windows" and '"' or "'"
du.check_min_api_version("5.0.0", "hugin")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("hugin",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("hugin", msgid)
return gettext.dgettext("scripts", msgid)
end

local function user_preference_changed(widget)
Expand Down Expand Up @@ -227,4 +227,4 @@ dt.register_storage(namespace, _("hugin panorama"), show_status, create_panorama


--
-- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua
-- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua
4 changes: 2 additions & 2 deletions contrib/image_stack.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ local PS = dt.configuration.running_os == "windows" and "\\" or "/"
du.check_min_api_version("5.0.0", "image_stack")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("image_stack",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("image_stack", msgid)
return gettext.dgettext("scripts", msgid)
end

-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
4 changes: 2 additions & 2 deletions contrib/image_time.lua
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ du.check_min_api_version("3.0.0", "image_time")


-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("image_time",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("image_time", msgid)
return gettext.dgettext("scripts", msgid)
end

local PS = dt.configuration.runnin_os == "windows" and "\\" or "/"
Expand Down
4 changes: 2 additions & 2 deletions contrib/kml_export.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ local PS = dt.configuration.running_os == "windows" and "\\" or "/"
du.check_min_api_version("5.0.0", kml_export)

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("kml_export",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("kml_export", msgid)
return gettext.dgettext("scripts", msgid)
end

local function show_status(storage, image, format, filename, number, total, high_quality, extra_data)
Expand Down
4 changes: 2 additions & 2 deletions contrib/passport_guide.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ local gettext = dt.gettext
du.check_min_api_version("2.0.0", "passport_guide")

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("passport_guide",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("passport_guide", msgid)
return gettext.dgettext("scripts", msgid)
end

dt.guides.register_guide("passport",
Expand Down
4 changes: 2 additions & 2 deletions contrib/pdf_slideshow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ require "official/yield"
local gettext = dt.gettext

-- Tell gettext where to find the .mo file translating messages for a particular domain
gettext.bindtextdomain("pdf_slideshow",dt.configuration.config_dir.."/lua/locale/")
gettext.bindtextdomain("scripts",dt.configuration.config_dir.."/lua/locale/")

local function _(msgid)
return gettext.dgettext("pdf_slideshow", msgid)
return gettext.dgettext("scripts", msgid)
end

if not df.check_if_bin_exists("pdflatex") then
Expand Down
Loading