Skip to content

Commit f207213

Browse files
committed
Fix issue #571, use of for _,image in ipairs(sel_images) do conflicts with function _(msgid)
1 parent 9c0f8d6 commit f207213

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

contrib/geoToolbox.lua

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local function get_first_coordinate()
167167
first_elevation = ''
168168
first_image_date = 0
169169

170-
for _,image in ipairs(sel_images) do
170+
for jj,image in ipairs(sel_images) do
171171
if not image then
172172
first_have_data = false
173173
else
@@ -206,7 +206,7 @@ local function get_second_coordinate()
206206
second_elevation = ''
207207
second_image_date = 0
208208

209-
for _,image in ipairs(sel_images) do
209+
for jj,image in ipairs(sel_images) do
210210
if not image then
211211
second_have_data = false
212212
else
@@ -242,7 +242,7 @@ local calc_in_between_slider = dt.new_widget("slider")
242242
--ToDo: this needs more love
243243
local function calc_in_between()
244244
local sel_images = dt.gui.action_images
245-
for _,image in ipairs(sel_images) do
245+
for jj,image in ipairs(sel_images) do
246246
if image then
247247
image_date = make_time_stamp(image.exif_datetime_taken)
248248
if (first_have_data and second_have_data) then
@@ -289,7 +289,7 @@ local function copy_gps()
289289
copy_gps_longitude = ''
290290
copy_gps_elevation = ''
291291

292-
for _,image in ipairs(sel_images) do
292+
for jj,image in ipairs(sel_images) do
293293
if not image then
294294
copy_gps_have_data = false
295295
else
@@ -316,7 +316,7 @@ end
316316
local function paste_gps(image)
317317
local sel_images = dt.gui.action_images
318318

319-
for _,image in ipairs(sel_images) do
319+
for jj,image in ipairs(sel_images) do
320320
if (label_copy_gps_lat.value) then
321321
image.latitude = copy_gps_latitude
322322
end
@@ -343,7 +343,7 @@ local function open_location_in_gnome_maps()
343343
local i = 0;
344344

345345
-- Use the first image with geo information
346-
for _,image in ipairs(sel_images) do
346+
for jj,image in ipairs(sel_images) do
347347
if ((image.longitude and image.latitude) and
348348
(image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data
349349
) then
@@ -386,7 +386,7 @@ local function reverse_geocode()
386386
local i = 0;
387387

388388
-- Use the first image with geo information
389-
for _,image in ipairs(sel_images) do
389+
for jj,image in ipairs(sel_images) do
390390
if ((image.longitude and image.latitude) and
391391
(image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data
392392
) then
@@ -461,7 +461,7 @@ local function calc_distance()
461461

462462
local sel_images = dt.gui.selection()
463463

464-
for _,image in ipairs(sel_images) do
464+
for jj,image in ipairs(sel_images) do
465465
if ((image.longitude and image.latitude) and
466466
(image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data
467467
) then
@@ -545,7 +545,7 @@ local function altitude_profile()
545545
local elevationAdd = 0;
546546

547547
local sel_images = dt.gui.action_images
548-
for _,image in ipairs(sel_images) do
548+
for jj,image in ipairs(sel_images) do
549549
if ((not isnan(image.longitude) and not isnan(image.latitude) and not isnan(image.elevation) and image.elevation) and
550550
(image.longitude ~= 0 and image.latitude ~= 90) -- Sometimes the north-pole but most likely just wrong data
551551
) then

0 commit comments

Comments
 (0)