From ea2596ae137f4f0d01b233d97d5cf4faab1cda41 Mon Sep 17 00:00:00 2001 From: Yuri van der Burg Date: Tue, 18 Mar 2025 20:38:21 +0100 Subject: [PATCH 1/7] Fixed typo in hugin script - should resolve issue # 570 --- contrib/hugin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hugin.lua b/contrib/hugin.lua index 85fe5f85..46fbd90c 100644 --- a/contrib/hugin.lua +++ b/contrib/hugin.lua @@ -83,7 +83,7 @@ end local function show_status(storage, image, format, filename, number, total, high_quality, extra_data) - dt.print(string.format(_("exporting to hugin: %d / $d"), number, total)) + dt.print(string.format(_("exporting to hugin: %d / %d"), number, total)) end local function create_panorama(storage, image_table, extra_data) --finalize From f20721373ae715fd9bd7e226523f445b3b47d2ff Mon Sep 17 00:00:00 2001 From: fjb2020 <92430217+fjb2020@users.noreply.github.com> Date: Wed, 19 Mar 2025 15:57:10 +0000 Subject: [PATCH 2/7] Fix issue #571, use of for _,image in ipairs(sel_images) do conflicts with function _(msgid) --- contrib/geoToolbox.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/geoToolbox.lua b/contrib/geoToolbox.lua index 0fa07301..01a14eea 100644 --- a/contrib/geoToolbox.lua +++ b/contrib/geoToolbox.lua @@ -167,7 +167,7 @@ local function get_first_coordinate() first_elevation = '' first_image_date = 0 - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if not image then first_have_data = false else @@ -206,7 +206,7 @@ local function get_second_coordinate() second_elevation = '' second_image_date = 0 - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if not image then second_have_data = false else @@ -242,7 +242,7 @@ local calc_in_between_slider = dt.new_widget("slider") --ToDo: this needs more love local function calc_in_between() local sel_images = dt.gui.action_images - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if image then image_date = make_time_stamp(image.exif_datetime_taken) if (first_have_data and second_have_data) then @@ -289,7 +289,7 @@ local function copy_gps() copy_gps_longitude = '' copy_gps_elevation = '' - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if not image then copy_gps_have_data = false else @@ -316,7 +316,7 @@ end local function paste_gps(image) local sel_images = dt.gui.action_images - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if (label_copy_gps_lat.value) then image.latitude = copy_gps_latitude end @@ -343,7 +343,7 @@ local function open_location_in_gnome_maps() local i = 0; -- Use the first image with geo information - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if ((image.longitude and image.latitude) and (image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data ) then @@ -386,7 +386,7 @@ local function reverse_geocode() local i = 0; -- Use the first image with geo information - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if ((image.longitude and image.latitude) and (image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data ) then @@ -461,7 +461,7 @@ local function calc_distance() local sel_images = dt.gui.selection() - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if ((image.longitude and image.latitude) and (image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data ) then @@ -545,7 +545,7 @@ local function altitude_profile() local elevationAdd = 0; local sel_images = dt.gui.action_images - for _,image in ipairs(sel_images) do + for jj,image in ipairs(sel_images) do if ((not isnan(image.longitude) and not isnan(image.latitude) and not isnan(image.elevation) and image.elevation) and (image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data ) then From 87d18549a6cc1a91d743a270c4074e7f61463bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Tue, 1 Apr 2025 16:11:56 +0200 Subject: [PATCH 3/7] Fix de_DE translation charset --- locale/de_DE/LC_MESSAGES/clear_GPS.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de_DE/LC_MESSAGES/clear_GPS.po b/locale/de_DE/LC_MESSAGES/clear_GPS.po index ad8960b0..420ec484 100644 --- a/locale/de_DE/LC_MESSAGES/clear_GPS.po +++ b/locale/de_DE/LC_MESSAGES/clear_GPS.po @@ -14,7 +14,7 @@ msgstr "" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" "Language: de_DE\n" From c6eee15d759754799ace381c60e67f29a15a1f5b Mon Sep 17 00:00:00 2001 From: Tasos Bakogiannis Date: Wed, 9 Apr 2025 23:48:48 +0200 Subject: [PATCH 4/7] Align sequence tooltip with code. --- lib/dtutils/string.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua index 7648f6f6..e92aff45 100644 --- a/lib/dtutils/string.lua +++ b/lib/dtutils/string.lua @@ -877,7 +877,7 @@ function dtutils_string.get_substitution_tooltip() _("$(VERSION.NAME) - version name from metadata"), _("$(DARKTABLE.VERSION) - current darktable version"), -- _("$(DARKTABLE.NAME) - darktable name"), -- not implemented - _("$(SEQUENCE[n,m]) - sequence number, n: number of digits, m: start number"), + _("$(SEQUENCE[m,n]) - sequence number, m: start number, n: number of digits"), _("$(WIDTH.SENSOR) - image sensor width"), _("$(HEIGHT.SENSOR) - image sensor height"), _("$(WIDTH.RAW) - RAW image width"), From 5309ff1726b23105298c491635f4429168937402 Mon Sep 17 00:00:00 2001 From: Tasos Bakogiannis Date: Thu, 10 Apr 2025 19:25:01 +0200 Subject: [PATCH 5/7] Revert "Align sequence tooltip with code." This reverts commit c6eee15d759754799ace381c60e67f29a15a1f5b. --- lib/dtutils/string.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua index e92aff45..7648f6f6 100644 --- a/lib/dtutils/string.lua +++ b/lib/dtutils/string.lua @@ -877,7 +877,7 @@ function dtutils_string.get_substitution_tooltip() _("$(VERSION.NAME) - version name from metadata"), _("$(DARKTABLE.VERSION) - current darktable version"), -- _("$(DARKTABLE.NAME) - darktable name"), -- not implemented - _("$(SEQUENCE[m,n]) - sequence number, m: start number, n: number of digits"), + _("$(SEQUENCE[n,m]) - sequence number, n: number of digits, m: start number"), _("$(WIDTH.SENSOR) - image sensor width"), _("$(HEIGHT.SENSOR) - image sensor height"), _("$(WIDTH.RAW) - RAW image width"), From 0cb9a8872e276487568411e47714b866396fd9d7 Mon Sep 17 00:00:00 2001 From: Tasos Bakogiannis Date: Thu, 10 Apr 2025 19:26:45 +0200 Subject: [PATCH 6/7] Update sequence variable order. --- lib/dtutils/string.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua index 7648f6f6..48221f19 100644 --- a/lib/dtutils/string.lua +++ b/lib/dtutils/string.lua @@ -994,7 +994,7 @@ local function treat(var_string) log.msg(log.info, "ret_val is " .. ret_val) elseif string.match(var_string, "SEQUENCE%[") then - local start, width = string.match(var_string, "(%d+),(%d)") + local width, start = string.match(var_string, "(%d+),(%d)") local seq_val = tonumber(substitutes[var]) local pat = "%0" .. width .. "d" substitutes[var_string] = string.format(pat, start + (seq_val - 1)) From 980fe3962c64592c3b5a8d3385b8c04065fa2262 Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Thu, 1 May 2025 20:37:24 -0400 Subject: [PATCH 7/7] image_time - added default values of 0 for fields not supplied in set time so that an exiftime can be created.\ --- contrib/image_time.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/image_time.lua b/contrib/image_time.lua index 28570c1a..c0971306 100644 --- a/contrib/image_time.lua +++ b/contrib/image_time.lua @@ -154,12 +154,12 @@ local function systime2exiftime(systime) end local function vars2exiftime(year, month, day, hour, min, sec) - local y = tonumber(year) and string.format("%4d", year) or " " - local mo = tonumber(month) and string.format("%02d", month) or " " - local d = tonumber(day) and string.format("%02d", day) or " " - local h = tonumber(hour) and string.format("%02d", hour) or " " - local m = tonumber(min) and string.format("%02d", min) or " " - local s = tonumber(sec) and string.format("%02d", sec) or " " + local y = tonumber(year) and string.format("%4d", year) or "0000" + local mo = tonumber(month) and string.format("%02d", month) or "00" + local d = tonumber(day) and string.format("%02d", day) or "00" + local h = tonumber(hour) and string.format("%02d", hour) or "00" + local m = tonumber(min) and string.format("%02d", min) or "00" + local s = tonumber(sec) and string.format("%02d", sec) or "00" return(y .. ":" .. mo .. ":" .. d .. " " .. h .. ":" .. m .. ":" .. s) end