From 8e4767c42a476c9423dbbfed53f00c3b58e4c2a9 Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Mon, 21 Oct 2024 14:32:53 -0400 Subject: [PATCH 1/6] tools/script_manager - fixed translation of page %d of %d --- tools/script_manager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/script_manager.lua b/tools/script_manager.lua index a925d84..bbefb1e 100644 --- a/tools/script_manager.lua +++ b/tools/script_manager.lua @@ -1006,7 +1006,7 @@ local function paginate(direction) last = first + sm.page_status.num_buttons - 1 end - sm.widgets.page_status.label = _(string.format("page %d of %d", cur_page, max_pages)) + sm.widgets.page_status.label = string.format(_("page %d of %d"), cur_page, max_pages) populate_buttons(folder, first, last) From 13f210bec9566b805ffa7136be0b087b3cba6d99 Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Mon, 21 Oct 2024 22:52:11 -0400 Subject: [PATCH 2/6] official/apply_camera_style - made name tranlatable and made it into name string instead of the filename tools/script_manager - change get_script_metadata to retreive a script metadata block and store it as a metadata block making the indiviual fields accessible. change the script buttons to use the translated name if available and just the purpose for the tooltip. --- official/apply_camera_style.lua | 2 +- tools/script_manager.lua | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/official/apply_camera_style.lua b/official/apply_camera_style.lua index a72c821..8c8aeae 100644 --- a/official/apply_camera_style.lua +++ b/official/apply_camera_style.lua @@ -89,7 +89,7 @@ script_data.restart = nil -- how to restart the (lib) script after it' script_data.show = nil -- only required for libs since the destroy_method only hides them script_data.metadata = { - name = "apply_camera_style", -- name of script + name = _("apply camera style"), -- name of script purpose = _("apply darktable camera style to matching images"), -- purpose of script author = "Bill Ferguson ", -- your name and optionally e-mail address help = "https://docs.darktable.org/lua/development/lua.scripts.manual/scripts/official/apply_camera_style/" -- URL to help/documentation diff --git a/tools/script_manager.lua b/tools/script_manager.lua index bbefb1e..59c23c4 100644 --- a/tools/script_manager.lua +++ b/tools/script_manager.lua @@ -405,8 +405,8 @@ local function get_script_metadata(script) log.msg(log.debug, "processing metatdata for " .. script) - local description = nil - local metadata = nil + local metadata_block = nil + local metadata = {} f = io.open(LUA_DIR .. PS .. script .. ".lua") if f then @@ -414,20 +414,19 @@ local function get_script_metadata(script) local content = f:read("*all") f:close() -- grab the script_data.metadata table - description = string.match(content, "script_data%.metadata = %{\r?\n(.-)\r?\n%}") + metadata_block = string.match(content, "script_data%.metadata = %{\r?\n(.-)\r?\n%}") else log.msg(log.error, "cant read from " .. script) end - if description then - metadata = "" - -- format it into a string block for display - local lines = du.split(description, "\n") + if metadata_block then + -- break up the lines into key value pairs + local lines = du.split(metadata_block, "\n") log.msg(log.debug, "got " .. #lines .. " lines") - local first = 1 for i = 1, #lines do log.msg(log.debug, "splitting line " .. lines[i]) local parts = du.split(lines[i], " = ") + parts[1] = string_trim(parts[1]) log.msg(log.debug, "got value " .. parts[1] .. " and data " .. parts[2]) if string.match(parts[2], "%_%(") then parts[2] = _(string_dequote(string_dei18n(parts[2]))) @@ -437,14 +436,15 @@ local function get_script_metadata(script) if string.match(parts[2], ",$") then parts[2] = string_chop(parts[2]) end - metadata = metadata .. string.format("%s%-10s\t%s", first and "" or "\n", parts[1], parts[2]) - first = nil + log.msg(log.debug, "parts 1 is " .. parts[1] .. " and parts 2 is " .. parts[2]) + metadata[parts[1]] = parts[2] + log.msg(log.debug, "metadata " .. parts[1] .. " is " .. metadata[parts[1]]) end - log.msg(log.debug, "script data is \n" .. metadata) + log.msg(log.debug, "script data found for " .. metadata["name"]) end restore_log_level(old_log_level) - return metadata + return metadata_block and metadata or nil end local function get_script_doc(script) @@ -910,11 +910,11 @@ local function populate_buttons(folder, first, last) end button.image = POWER_ICON - label.label = script.name + label.label = script.metadata and script.metadata.name or script.name label.name = "pb_label" button.ellipsize = "end" button.sensitive = true - label.tooltip = script.metadata and script.metadata or script.doc + label.tooltip = script.metadata and script.metadata.purpose or script.doc button.clicked_callback = function (this) local cb_script = script From d12363467933c99faec332253627b113a0c37dc8 Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Tue, 22 Oct 2024 00:13:30 -0400 Subject: [PATCH 3/6] Changed script names in metadata from filenames to names by removing underscores, spelling out abbreviations, etc. --- contrib/AutoGrouper.lua | 2 +- contrib/CollectHelper.lua | 2 +- contrib/HDRMerge.lua | 2 +- contrib/LabelsToTags.lua | 2 +- contrib/OpenInExplorer.lua | 2 +- contrib/RL_out_sharp.lua | 2 +- contrib/auto_snapshot.lua | 2 +- contrib/autostyle.lua | 2 +- contrib/change_group_leader.lua | 2 +- contrib/clear_GPS.lua | 2 +- contrib/color_profile_manager.lua | 2 +- contrib/copy_attach_detach_tags.lua | 2 +- contrib/cr2hdr.lua | 2 +- contrib/cycle_group_leader.lua | 2 +- contrib/dbmaint.lua | 2 +- contrib/enfuseAdvanced.lua | 2 +- contrib/exportLUT.lua | 2 +- contrib/ext_editor.lua | 2 +- contrib/face_recognition.lua | 2 +- contrib/fujifilm_dynamic_range.lua | 2 +- contrib/fujifilm_ratings.lua | 2 +- contrib/geoJSON_export.lua | 2 +- contrib/geoToolbox.lua | 2 +- contrib/gimp.lua | 2 +- contrib/gpx_export.lua | 2 +- contrib/harmonic_armature_guide.lua | 2 +- contrib/hif_group_leader.lua | 2 +- contrib/hugin.lua | 2 +- contrib/image_stack.lua | 2 +- contrib/image_time.lua | 2 +- contrib/jpg_group_leader.lua | 2 +- contrib/kml_export.lua | 2 +- contrib/passport_guide.lua | 2 +- contrib/passport_guide_germany.lua | 2 +- contrib/pdf_slideshow.lua | 2 +- contrib/photils.lua | 2 +- contrib/quicktag.lua | 2 +- contrib/rate_group.lua | 2 +- contrib/rename-tags.lua | 2 +- contrib/rename_images.lua | 2 +- contrib/select_non_existing.lua | 2 +- contrib/select_untagged.lua | 2 +- contrib/slideshowMusic.lua | 2 +- contrib/transfer_hierarchy.lua | 2 +- contrib/video_ffmpeg.lua | 2 +- examples/api_version.lua | 2 +- examples/darkroom_demo.lua | 2 +- examples/gettextExample.lua | 2 +- examples/gui_action.lua | 2 +- examples/hello_world.lua | 2 +- examples/lighttable_demo.lua | 2 +- examples/moduleExample.lua | 2 +- examples/multi_os.lua | 2 +- examples/panels_demo.lua | 2 +- examples/preferenceExamples.lua | 2 +- examples/printExamples.lua | 2 +- examples/running_os.lua | 2 +- examples/x-touch.lua | 2 +- official/check_for_updates.lua | 2 +- official/copy_paste_metadata.lua | 2 +- official/delete_long_tags.lua | 2 +- official/delete_unused_tags.lua | 2 +- official/enfuse.lua | 2 +- official/generate_image_txt.lua | 2 +- official/image_path_in_ui.lua | 2 +- official/import_filter_manager.lua | 2 +- official/import_filters.lua | 2 +- official/save_selection.lua | 2 +- official/selection_to_pdf.lua | 2 +- tools/executable_manager.lua | 2 +- tools/get_lib_manpages.lua | 2 +- tools/get_libdoc.lua | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/contrib/AutoGrouper.lua b/contrib/AutoGrouper.lua index f8d8061..6760937 100644 --- a/contrib/AutoGrouper.lua +++ b/contrib/AutoGrouper.lua @@ -54,7 +54,7 @@ end local script_data = {} script_data.metadata = { - name = "AutoGrouper", + name = _("auto group"), purpose = _("automatically group images by time interval"), author = "Kevin Ertel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/AutoGrouper/" diff --git a/contrib/CollectHelper.lua b/contrib/CollectHelper.lua index f06b14e..978aa30 100644 --- a/contrib/CollectHelper.lua +++ b/contrib/CollectHelper.lua @@ -62,7 +62,7 @@ end local script_data = {} script_data.metadata = { - name = "CollectHelper", + name = _("collection helper"), purpose = _("add collection helper buttons"), author = "Kevin Ertel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/CollectHelper/" diff --git a/contrib/HDRMerge.lua b/contrib/HDRMerge.lua index 76067d5..9d7a951 100644 --- a/contrib/HDRMerge.lua +++ b/contrib/HDRMerge.lua @@ -63,7 +63,7 @@ end local script_data = {} script_data.metadata = { - name = "HDRmerge", + name = _("HDR merge"), purpose = _("merge bracketed images into an HDR DNG image"), author = "Kevin Ertel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/HDRmerge" diff --git a/contrib/LabelsToTags.lua b/contrib/LabelsToTags.lua index 0c00c12..32031a3 100644 --- a/contrib/LabelsToTags.lua +++ b/contrib/LabelsToTags.lua @@ -63,7 +63,7 @@ end local script_data = {} script_data.metadata = { - name = "LabelsToTags", + name = _("labels to tags"), purpose = _("allows the mass-application of tags using color labels and ratings as a guide"), author = "August Schwerdfeger (august@schwerdfeger.name)", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/LabelsToTags" diff --git a/contrib/OpenInExplorer.lua b/contrib/OpenInExplorer.lua index 4ba5969..14f788d 100644 --- a/contrib/OpenInExplorer.lua +++ b/contrib/OpenInExplorer.lua @@ -65,7 +65,7 @@ end local script_data = {} script_data.metadata = { - name = "OpenInExplorer", + name = _("open in explorer"), purpose = _("open a selected file in the system file manager"), author = "Kevin Ertel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/OpenInExplorer" diff --git a/contrib/RL_out_sharp.lua b/contrib/RL_out_sharp.lua index 9083277..b65581c 100644 --- a/contrib/RL_out_sharp.lua +++ b/contrib/RL_out_sharp.lua @@ -77,7 +77,7 @@ local function _(msgid) local script_data = {} script_data.metadata = { - name = "RL_out_sharp", + name = _("RL output sharpening"), purpose = _("Richardson-Lucy output sharpening using GMic"), author = "Marco Carrarini ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/RL_out_sharp" diff --git a/contrib/auto_snapshot.lua b/contrib/auto_snapshot.lua index e3ede5b..48f99f5 100644 --- a/contrib/auto_snapshot.lua +++ b/contrib/auto_snapshot.lua @@ -76,7 +76,7 @@ script_data.restart = nil -- how to restart the (lib) script after it' script_data.show = nil -- only required for libs since the destroy_method only hides them script_data.metadata = { - name = "auto_snapshot", -- name of script + name = _("auto snapshot"), -- name of script purpose = _("automatically take a snapshot when an image is loaded in darkroom"), -- purpose of script author = "Bill Ferguson ", -- your name and optionally e-mail address help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/auto_snapshot/" -- URL to help/documentation diff --git a/contrib/autostyle.lua b/contrib/autostyle.lua index 46b14ca..093c29a 100644 --- a/contrib/autostyle.lua +++ b/contrib/autostyle.lua @@ -54,7 +54,7 @@ end local script_data = {} script_data.metadata = { - name = "autostyle", + name = _("auto style"), purpose = _("automatically apply a style based on image EXIF tag"), author = "Marc Cousin ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/autostyle/" diff --git a/contrib/change_group_leader.lua b/contrib/change_group_leader.lua index e7f424b..0e6f66e 100644 --- a/contrib/change_group_leader.lua +++ b/contrib/change_group_leader.lua @@ -51,7 +51,7 @@ end local script_data = {} script_data.metadata = { - name = "change_group_leader", + name = _("change group leader"), purpose = _("automatically change the leader of raw+jpg paired image groups"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/change_group_leader" diff --git a/contrib/clear_GPS.lua b/contrib/clear_GPS.lua index 8c59166..2663ab4 100644 --- a/contrib/clear_GPS.lua +++ b/contrib/clear_GPS.lua @@ -50,7 +50,7 @@ end local script_data = {} script_data.metadata = { - name = "clear_GPS", + name = _("clear GPS info"), purpose = _("remove GPS data from selected image(s)"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/clear_gps/" diff --git a/contrib/color_profile_manager.lua b/contrib/color_profile_manager.lua index 6114992..683ae99 100644 --- a/contrib/color_profile_manager.lua +++ b/contrib/color_profile_manager.lua @@ -363,7 +363,7 @@ end local script_data = {} script_data.metadata = { - name = "color_profile_manager", + name = _("color profile manager"), purpose = _("manage external darktable color profiles"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/color_profile_manager" diff --git a/contrib/copy_attach_detach_tags.lua b/contrib/copy_attach_detach_tags.lua index 2b66bc7..3f1f6d3 100644 --- a/contrib/copy_attach_detach_tags.lua +++ b/contrib/copy_attach_detach_tags.lua @@ -53,7 +53,7 @@ end local script_data = {} script_data.metadata = { - name = "copy_attach_detach_tags", + name = _("copy attach detach tags"), purpose = _("shortcuts to copy, paste, replace, or remove tags from images"), author = "Christian Kanzian", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/copy_attach_detach_tags" diff --git a/contrib/cr2hdr.lua b/contrib/cr2hdr.lua index 209287c..36f325f 100644 --- a/contrib/cr2hdr.lua +++ b/contrib/cr2hdr.lua @@ -48,7 +48,7 @@ end local script_data = {} script_data.metadata = { - name = "cr2hdr", + name = _("cr2hdr"), purpose = _("process Magic Lantern dual ISO images"), author = "Till Theato ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/cr2hdr" diff --git a/contrib/cycle_group_leader.lua b/contrib/cycle_group_leader.lua index 665f0c0..e168e93 100644 --- a/contrib/cycle_group_leader.lua +++ b/contrib/cycle_group_leader.lua @@ -71,7 +71,7 @@ end local script_data = {} script_data.metadata = { - name = "cycle_group_leader", + name = _("cycle group leader"), purpose = _("change image group leader"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/cycle_group_leader" diff --git a/contrib/dbmaint.lua b/contrib/dbmaint.lua index 044a9ac..16ca9b9 100644 --- a/contrib/dbmaint.lua +++ b/contrib/dbmaint.lua @@ -80,7 +80,7 @@ script_data.restart = nil -- how to restart the (lib) script after it' script_data.show = nil -- only required for libs since the destroy_method only hides them script_data.metadata = { - name = "dbmaint", + name = _("db maintenance"), purpose = _("perform database maintenance"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/dbmaint/" diff --git a/contrib/enfuseAdvanced.lua b/contrib/enfuseAdvanced.lua index b35cb49..5027c56 100644 --- a/contrib/enfuseAdvanced.lua +++ b/contrib/enfuseAdvanced.lua @@ -79,7 +79,7 @@ end local script_data = {} script_data.metadata = { - name = "enfuseAdvanced", + name = _("enfuse advanced"), purpose = _("focus stack or exposure blend images"), author = "Kevin Ertel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/enfuseAdvanced" diff --git a/contrib/exportLUT.lua b/contrib/exportLUT.lua index 8085456..9ec2954 100644 --- a/contrib/exportLUT.lua +++ b/contrib/exportLUT.lua @@ -44,7 +44,7 @@ end local script_data = {} script_data.metadata = { - name = "exportLUT", + name = _("export LUT"), purpose = _("export a style as a LUT"), author = "Noah Clarke", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/exportLUT" diff --git a/contrib/ext_editor.lua b/contrib/ext_editor.lua index 0cee945..be371e9 100644 --- a/contrib/ext_editor.lua +++ b/contrib/ext_editor.lua @@ -87,7 +87,7 @@ end local script_data = {} script_data.metadata = { - name = "ext_editor", + name = _("external editors"), purpose = _("edit images with external editors"), author = "Marco Carrarini, marco.carrarini@gmail.com", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/ext_editor" diff --git a/contrib/face_recognition.lua b/contrib/face_recognition.lua index 74827f1..0c60a5c 100644 --- a/contrib/face_recognition.lua +++ b/contrib/face_recognition.lua @@ -63,7 +63,7 @@ end local script_data = {} script_data.metadata = { - name = "face_recognition", + name = _("face recognition"), purpose = _("use facial recognition to tag images"), author = "Sebastian Witt", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/face_recognition" diff --git a/contrib/fujifilm_dynamic_range.lua b/contrib/fujifilm_dynamic_range.lua index 7bb6ab5..37f7951 100644 --- a/contrib/fujifilm_dynamic_range.lua +++ b/contrib/fujifilm_dynamic_range.lua @@ -74,7 +74,7 @@ end local script_data = {} script_data.metadata = { - name = "fujifilm_dynamic_range", + name = _("fujifilm dynamic range"), purpose = _("compensate for Fujifilm raw files made using \"dynamic range\""), author = "Dan Torop ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/fujifilm_dynamic_range" diff --git a/contrib/fujifilm_ratings.lua b/contrib/fujifilm_ratings.lua index c9a034d..b29996d 100644 --- a/contrib/fujifilm_ratings.lua +++ b/contrib/fujifilm_ratings.lua @@ -40,7 +40,7 @@ end local script_data = {} script_data.metadata = { - name = "fujifilm_ratings", + name = _("fujifilm ratings"), purpose = _("import Fujifilm in-camera ratings"), author = "Ben Mendis ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/fujifilm_ratings" diff --git a/contrib/geoJSON_export.lua b/contrib/geoJSON_export.lua index 93ecd9f..93e7728 100644 --- a/contrib/geoJSON_export.lua +++ b/contrib/geoJSON_export.lua @@ -49,7 +49,7 @@ end local script_data = {} script_data.metadata = { - name = "geoJSON_export", + name = _("geoJSON export"), purpose = _("export a geoJSON file from geo data"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/geoJSON_export" diff --git a/contrib/geoToolbox.lua b/contrib/geoToolbox.lua index f2ab695..0fa0730 100644 --- a/contrib/geoToolbox.lua +++ b/contrib/geoToolbox.lua @@ -42,7 +42,7 @@ end local script_data = {} script_data.metadata = { - name = "geoToolbox", + name = _("geo toolbox"), purpose = _("geodata tools"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/geoToolbox" diff --git a/contrib/gimp.lua b/contrib/gimp.lua index 8e28551..92c6d0c 100644 --- a/contrib/gimp.lua +++ b/contrib/gimp.lua @@ -83,7 +83,7 @@ end local script_data = {} script_data.metadata = { - name = "gimp", + name = _("edit with GIMP"), purpose = _("export and edit with GIMP"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/gimp" diff --git a/contrib/gpx_export.lua b/contrib/gpx_export.lua index 1525aff..b310f3a 100644 --- a/contrib/gpx_export.lua +++ b/contrib/gpx_export.lua @@ -38,7 +38,7 @@ end local script_data = {} script_data.metadata = { - name = "gpx_export", + name = _("gpx export"), purpose = _("export gpx information to a file"), author = "Jannis_V", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/gpx_export" diff --git a/contrib/harmonic_armature_guide.lua b/contrib/harmonic_armature_guide.lua index a85195c..ffe03a2 100644 --- a/contrib/harmonic_armature_guide.lua +++ b/contrib/harmonic_armature_guide.lua @@ -43,7 +43,7 @@ end local script_data = {} script_data.metadata = { - name = "harmonic_armature_guide", + name = _("harmonic armature guide"), purpose = _("harmonic artmature guide"), author = "Hubert Kowalski", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/harmonic_armature_guide" diff --git a/contrib/hif_group_leader.lua b/contrib/hif_group_leader.lua index 9543bec..f39d3ff 100644 --- a/contrib/hif_group_leader.lua +++ b/contrib/hif_group_leader.lua @@ -75,7 +75,7 @@ end local script_data = {} script_data.metadata = { - name = "hif_group_leader", + name = _("HIF group leader"), purpose = _("make hif image group leader"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/hif_group_leader" diff --git a/contrib/hugin.lua b/contrib/hugin.lua index 4986842..85fe5f8 100644 --- a/contrib/hugin.lua +++ b/contrib/hugin.lua @@ -65,7 +65,7 @@ end local script_data = {} script_data.metadata = { - name = "hugin", + name = _("hugin"), purpose = _("stitch images into a panorama"), author = "Wolfgang Goetz", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/hugin" diff --git a/contrib/image_stack.lua b/contrib/image_stack.lua index 817dc7a..661b28d 100644 --- a/contrib/image_stack.lua +++ b/contrib/image_stack.lua @@ -82,7 +82,7 @@ end local script_data = {} script_data.metadata = { - name = "image_stack", + name = _("image stack"), purpose = _("process a stack of images"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/image_stack" diff --git a/contrib/image_time.lua b/contrib/image_time.lua index 4daf9c6..28570c1 100644 --- a/contrib/image_time.lua +++ b/contrib/image_time.lua @@ -125,7 +125,7 @@ end local script_data = {} script_data.metadata = { - name = "image_time", + name = _("image time"), purpose = _("synchronize image time for images shot with different cameras or adjust or set image time"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/image_time" diff --git a/contrib/jpg_group_leader.lua b/contrib/jpg_group_leader.lua index 7ca1359..8391a67 100644 --- a/contrib/jpg_group_leader.lua +++ b/contrib/jpg_group_leader.lua @@ -75,7 +75,7 @@ end local script_data = {} script_data.metadata = { - name = "jpg_group_leader", + name = _("JPG group leader"), purpose = _("make jpg image group leader"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/jpg_group_leader" diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index 561e8ba..561724f 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -54,7 +54,7 @@ end local script_data = {} script_data.metadata = { - name = "kml_export", + name = _("kml export"), purpose = _("export KML/KMZ data to a file"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/kml_export" diff --git a/contrib/passport_guide.lua b/contrib/passport_guide.lua index 91e0705..34e9fc7 100644 --- a/contrib/passport_guide.lua +++ b/contrib/passport_guide.lua @@ -48,7 +48,7 @@ end local script_data = {} script_data.metadata = { - name = "passport_guide", + name = _("passport guide"), purpose = _("guides for cropping passport photos"), author = "Kåre Hampf", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/passport_guide" diff --git a/contrib/passport_guide_germany.lua b/contrib/passport_guide_germany.lua index 745f86d..a1b9f61 100644 --- a/contrib/passport_guide_germany.lua +++ b/contrib/passport_guide_germany.lua @@ -52,7 +52,7 @@ end local script_data = {} script_data.metadata = { - name = "passport_guide_germany", + name = _("passport guide Germany"), purpose = _("guides for cropping passport and ID card (\"Personalausweis\") photos based on the \"Passbild-Schablone\" from the German Federal Ministry of the Interior and Community"), author = "menschmachine", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/passport_guide_germany" diff --git a/contrib/pdf_slideshow.lua b/contrib/pdf_slideshow.lua index 36b0b1b..b93ae97 100644 --- a/contrib/pdf_slideshow.lua +++ b/contrib/pdf_slideshow.lua @@ -60,7 +60,7 @@ du.check_min_api_version("7.0.0", "pdf_slideshow") local script_data = {} script_data.metadata = { - name = "pdf_slideshow", + name = _("PDF slideshow"), purpose = _("generates a PDF slideshow (via Latex) containing all selected images one per slide"), author = "Pascal Obry", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/pdf_slideshow" diff --git a/contrib/photils.lua b/contrib/photils.lua index a5fe59b..7bb39c6 100644 --- a/contrib/photils.lua +++ b/contrib/photils.lua @@ -55,7 +55,7 @@ end local script_data = {} script_data.metadata = { - name = "photils", + name = _("photils"), purpose = _("suggest tags based on image classification"), author = "Tobias Scheck", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/photils" diff --git a/contrib/quicktag.lua b/contrib/quicktag.lua index 7dd604d..c218f09 100644 --- a/contrib/quicktag.lua +++ b/contrib/quicktag.lua @@ -60,7 +60,7 @@ end local script_data = {} script_data.metadata = { - name = "quicktag", + name = _("quick tag"), purpose = _("use buttons to quickly apply tags assigned to them"), author = "Christian Kanzian", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/quicktag" diff --git a/contrib/rate_group.lua b/contrib/rate_group.lua index 8c3a15d..0e9ddb2 100644 --- a/contrib/rate_group.lua +++ b/contrib/rate_group.lua @@ -55,7 +55,7 @@ end local script_data = {} script_data.metadata = { - name = "rate_group", + name = _("rate group"), purpose = _("rate all images in a group"), author = "Dom H (dom@hxy.io)", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/rate_group" diff --git a/contrib/rename-tags.lua b/contrib/rename-tags.lua index 69509a5..ae77056 100644 --- a/contrib/rename-tags.lua +++ b/contrib/rename-tags.lua @@ -47,7 +47,7 @@ end local script_data = {} script_data.metadata = { - name = "rename-tags", + name = _("rename tags"), purpose = _("rename an existing tag"), author = "Sebastian Witt (se.witt@gmx.net)", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/rename-tags" diff --git a/contrib/rename_images.lua b/contrib/rename_images.lua index d50c8e1..a0d37e9 100644 --- a/contrib/rename_images.lua +++ b/contrib/rename_images.lua @@ -65,7 +65,7 @@ rename.event_registered = false local script_data = {} script_data.metadata = { - name = "rename_images", + name = _("rename images"), purpose = _("rename an image file or files"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/rename_images" diff --git a/contrib/select_non_existing.lua b/contrib/select_non_existing.lua index d7bfa64..b47c7cf 100644 --- a/contrib/select_non_existing.lua +++ b/contrib/select_non_existing.lua @@ -74,7 +74,7 @@ dt.gui.libs.select.register_selection( local script_data = {} script_data.metadata = { - name = "select_non_existing", + name = _("select non existing"), purpose = _("enable selection of non-existing images"), author = "Dirk Dittmar", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/select_non_existing" diff --git a/contrib/select_untagged.lua b/contrib/select_untagged.lua index c86cf83..0ca4b5d 100644 --- a/contrib/select_untagged.lua +++ b/contrib/select_untagged.lua @@ -33,7 +33,7 @@ end local script_data = {} script_data.metadata = { - name = "select_untagged", + name = _("select untagged"), purpose = _("enable selection of untagged images"), author = "Jannis_V", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/select_untagged" diff --git a/contrib/slideshowMusic.lua b/contrib/slideshowMusic.lua index d83dd24..bed3da6 100644 --- a/contrib/slideshowMusic.lua +++ b/contrib/slideshowMusic.lua @@ -40,7 +40,7 @@ end local script_data = {} script_data.metadata = { - name = "slideshowMusic", + name = _("slideshow music"), purpose = _("play music during a slideshow"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/slideshowMusic" diff --git a/contrib/transfer_hierarchy.lua b/contrib/transfer_hierarchy.lua index 16c2359..dd9c270 100755 --- a/contrib/transfer_hierarchy.lua +++ b/contrib/transfer_hierarchy.lua @@ -90,7 +90,7 @@ end local script_data = {} script_data.metadata = { - name = "transfer_hierarchy", + name = _("transfer hierarchy"), purpose = _("allows the moving or copying of images from one directory tree to another, while preserving the existing hierarchy"), author = "August Schwerdfeger (august@schwerdfeger.name)", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contrib/transfer_hierarchy" diff --git a/contrib/video_ffmpeg.lua b/contrib/video_ffmpeg.lua index 70af1ef..f0713fa 100644 --- a/contrib/video_ffmpeg.lua +++ b/contrib/video_ffmpeg.lua @@ -50,7 +50,7 @@ end local script_data = {} script_data.metadata = { - name = "video_ffmpeg", + name = _("video ffmpeg"), purpose = _("timelapse video plugin based on ffmpeg"), author = "Dominik Markiewicz", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/contib/video_ffmpeg" diff --git a/examples/api_version.lua b/examples/api_version.lua index aaf341c..bf8a1c1 100644 --- a/examples/api_version.lua +++ b/examples/api_version.lua @@ -47,7 +47,7 @@ dt.print("API " .. _("version") .. ": " .. result) local script_data = {} script_data.metadata = { - name = "api_version", + name = _("APIversion"), purpose = _("display api_version example"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/api_version" diff --git a/examples/darkroom_demo.lua b/examples/darkroom_demo.lua index 72bf132..b76b552 100644 --- a/examples/darkroom_demo.lua +++ b/examples/darkroom_demo.lua @@ -117,7 +117,7 @@ dt.gui.current_view(current_view) local script_data = {} script_data.metadata = { - name = "darkroom_demo", + name = _("darkroom demo"), purpose = _("example demonstrating how to control image display in darkroom mode"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/darkroom_demo" diff --git a/examples/gettextExample.lua b/examples/gettextExample.lua index acffdca..42e1a47 100644 --- a/examples/gettextExample.lua +++ b/examples/gettextExample.lua @@ -86,7 +86,7 @@ dt.print_error(_("hello world!")) local script_data = {} script_data.metadata = { - name = "gettextExample", + name = _("gettext example"), purpose = _("example of how translations works"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/gettextExample" diff --git a/examples/gui_action.lua b/examples/gui_action.lua index b956e5a..9fee361 100644 --- a/examples/gui_action.lua +++ b/examples/gui_action.lua @@ -15,7 +15,7 @@ end local script_data = {} script_data.metadata = { - name = "gui_action", + name = _("gui action"), purpose = _("example of how to use darktable.gui.action() calls"), author = "Diederik ter Rahe", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/gui_action" diff --git a/examples/hello_world.lua b/examples/hello_world.lua index d29c99c..6e04efc 100644 --- a/examples/hello_world.lua +++ b/examples/hello_world.lua @@ -53,7 +53,7 @@ dt.print(_("hello, world")) local script_data = {} script_data.metadata = { - name = "hello_world", + name = _("hello world"), purpose = _("example of how to print a message to the screen"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/hello_world" diff --git a/examples/lighttable_demo.lua b/examples/lighttable_demo.lua index d897ff8..e28454c 100644 --- a/examples/lighttable_demo.lua +++ b/examples/lighttable_demo.lua @@ -218,7 +218,7 @@ current_sort_order = dt.gui.libs.filter.sort_order(current_sort_order) local script_data = {} script_data.metadata = { - name = "lighttable_demo", + name = _("lighttable demo"), purpose = _("example demonstrating how to control lighttable display modes"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/lighttable_demo" diff --git a/examples/moduleExample.lua b/examples/moduleExample.lua index 6996d2a..bc43267 100644 --- a/examples/moduleExample.lua +++ b/examples/moduleExample.lua @@ -47,7 +47,7 @@ end local script_data = {} script_data.metadata = { - name = "moduleExample", + name = ("module example"), purpose = _("example of how to create a lighttable module"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/moduleExample" diff --git a/examples/multi_os.lua b/examples/multi_os.lua index 83bfee9..21dc0cb 100644 --- a/examples/multi_os.lua +++ b/examples/multi_os.lua @@ -260,7 +260,7 @@ dt.register_event( local script_data = {} script_data.metadata = { - name = "multi_os", + name = _("multi OS"), purpose = _("example module thet runs on different operating systems"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/multi_os" diff --git a/examples/panels_demo.lua b/examples/panels_demo.lua index 6fa8260..ac9e3de 100644 --- a/examples/panels_demo.lua +++ b/examples/panels_demo.lua @@ -146,7 +146,7 @@ end local script_data = {} script_data.metadata = { - name = "panels_demo", + name = _("panels demo"), purpose = _("example demonstrating how to contol panel visibility"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/panels_demo" diff --git a/examples/preferenceExamples.lua b/examples/preferenceExamples.lua index c53ce16..8442574 100644 --- a/examples/preferenceExamples.lua +++ b/examples/preferenceExamples.lua @@ -35,7 +35,7 @@ end local script_data = {} script_data.metadata = { - name = "preferenceExamples", + name = _("preference examples"), purpose = _("example to show the different preference types that are possible"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/preferenceExamples" diff --git a/examples/printExamples.lua b/examples/printExamples.lua index 4bedaff..721138c 100644 --- a/examples/printExamples.lua +++ b/examples/printExamples.lua @@ -58,7 +58,7 @@ dt.print_log("print log") local script_data = {} script_data.metadata = { - name = "printExamples", + name = _("print examples"), purpose = _("example showing the different types of printing messages"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/printExamples" diff --git a/examples/running_os.lua b/examples/running_os.lua index 3c45cee..6974128 100644 --- a/examples/running_os.lua +++ b/examples/running_os.lua @@ -52,7 +52,7 @@ dt.print(string.format(_("you are running: %s"), dt.configuration.running_os)) local script_data = {} script_data.metadata = { - name = "running_os", + name = _("running OS"), purpose = _("example of how to determine the operating system being used"), author = "Tobias Jakobs", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/running_os" diff --git a/examples/x-touch.lua b/examples/x-touch.lua index 969fd10..bbe9bbd 100644 --- a/examples/x-touch.lua +++ b/examples/x-touch.lua @@ -66,7 +66,7 @@ end local script_data = {} script_data.metadata = { - name = "x-touch", + name = _("x-touch"), purpose = _("example of how to control an x-touch midi device"), author = "Diederik ter Rahe", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/examples/x-touch" diff --git a/official/check_for_updates.lua b/official/check_for_updates.lua index 45ec19b..aeb45ed 100644 --- a/official/check_for_updates.lua +++ b/official/check_for_updates.lua @@ -45,7 +45,7 @@ end local script_data = {} script_data.metadata = { - name = "check_for_updates", + name = _("check for updates"), purpose = _("check for newer darktable releases"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/check_for_updates" diff --git a/official/copy_paste_metadata.lua b/official/copy_paste_metadata.lua index 37eb94f..00040c9 100644 --- a/official/copy_paste_metadata.lua +++ b/official/copy_paste_metadata.lua @@ -40,7 +40,7 @@ end local script_data = {} script_data.metadata = { - name = "copy_paste_metadata", + name = _("copy paste metadata"), purpose = _("adds keyboard shortcuts and buttons to copy/paste metadata between images"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/copy_paste_metadata" diff --git a/official/delete_long_tags.lua b/official/delete_long_tags.lua index 89b192f..c770402 100644 --- a/official/delete_long_tags.lua +++ b/official/delete_long_tags.lua @@ -44,7 +44,7 @@ end local script_data = {} script_data.metadata = { - name = "delete_long_tags", + name = _("delete long tags"), purpose = _("delete all tags longer than a set length"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/delete_long_tags" diff --git a/official/delete_unused_tags.lua b/official/delete_unused_tags.lua index 62ebc95..3815aea 100644 --- a/official/delete_unused_tags.lua +++ b/official/delete_unused_tags.lua @@ -48,7 +48,7 @@ end local script_data = {} script_data.metadata = { - name = "delete_unused_tags", + name = _("delete unused tags"), purpose = _("delete unused tags"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/delete_unused_tags" diff --git a/official/enfuse.lua b/official/enfuse.lua index 317ab73..28d6da8 100644 --- a/official/enfuse.lua +++ b/official/enfuse.lua @@ -52,7 +52,7 @@ end local script_data = {} script_data.metadata = { - name = "enfuse", + name = _("enfuse"), purpose = _("exposure blend images"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/enfuse" diff --git a/official/generate_image_txt.lua b/official/generate_image_txt.lua index 42f6498..c786aab 100644 --- a/official/generate_image_txt.lua +++ b/official/generate_image_txt.lua @@ -51,7 +51,7 @@ du.check_min_api_version("7.0.0", "generate_image_txt") local script_data = {} script_data.metadata = { - name = "generate_image_txt", + name = _("generate image text"), purpose = _("overlay metadata on the selected image(s)"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/generate_image_txt" diff --git a/official/image_path_in_ui.lua b/official/image_path_in_ui.lua index b4440db..74671cd 100644 --- a/official/image_path_in_ui.lua +++ b/official/image_path_in_ui.lua @@ -44,7 +44,7 @@ end local script_data = {} script_data.metadata = { - name = "image_path_in_ui", + name = _("image path in UI"), purpose = _("print the image path in the UI"), author = "Jérémy Rosen", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/image_path_in_ui" diff --git a/official/import_filter_manager.lua b/official/import_filter_manager.lua index 1119150..adf8362 100644 --- a/official/import_filter_manager.lua +++ b/official/import_filter_manager.lua @@ -41,7 +41,7 @@ end local script_data = {} script_data.metadata = { - name = "import_filter_manager", + name = _("import filter manager"), purpose = _("manage import filters"), author = "Tobias Ellinghaus", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/import_filter_manager" diff --git a/official/import_filters.lua b/official/import_filters.lua index 4463306..87d8b0e 100644 --- a/official/import_filters.lua +++ b/official/import_filters.lua @@ -39,7 +39,7 @@ end local script_data = {} script_data.metadata = { - name = "import_filters", + name = _("import filters"), purpose = _("import filtering"), author = "Tobias Ellinghaus & Christian Mandel", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/import_filters" diff --git a/official/save_selection.lua b/official/save_selection.lua index 77e82eb..64d33b4 100644 --- a/official/save_selection.lua +++ b/official/save_selection.lua @@ -49,7 +49,7 @@ end local script_data = {} script_data.metadata = { - name = "save_selection", + name = _("save selection"), purpose = _("shortcuts providing multiple selection buffers"), author = "Jérémy Rosen", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/save_selection" diff --git a/official/selection_to_pdf.lua b/official/selection_to_pdf.lua index e4f22f5..64b9c8b 100644 --- a/official/selection_to_pdf.lua +++ b/official/selection_to_pdf.lua @@ -49,7 +49,7 @@ end local script_data = {} script_data.metadata = { - name = "selection_to_pdf", + name = _("selection to PDF"), purpose = _("generate a pdf file of selected images"), author = "Jérémy Rosen & Pascal Obry", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/official/selection_to_pdf" diff --git a/tools/executable_manager.lua b/tools/executable_manager.lua index 97421e4..4d03be2 100644 --- a/tools/executable_manager.lua +++ b/tools/executable_manager.lua @@ -46,7 +46,7 @@ end local script_data = {} script_data.metadata = { - name = "executable_manager", + name = _("executable manager"), purpose = _("manage the list of external executables used by the lua scripts"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/tools/executable_manager" diff --git a/tools/get_lib_manpages.lua b/tools/get_lib_manpages.lua index 65c6804..0e64110 100644 --- a/tools/get_lib_manpages.lua +++ b/tools/get_lib_manpages.lua @@ -88,7 +88,7 @@ end local script_data = {} script_data.metadata = { - name = "get_lib_manpages", + name = _("get library man pages"), purpose = _("output the internal library documentation as man pages"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/tools/get_lib_manpages" diff --git a/tools/get_libdoc.lua b/tools/get_libdoc.lua index 78bbf76..2c4458d 100644 --- a/tools/get_libdoc.lua +++ b/tools/get_libdoc.lua @@ -62,7 +62,7 @@ end local script_data = {} script_data.metadata = { - name = "get_libdoc", + name = _("get library docs"), purpose = _("retrieve and print the documentation to the console"), author = "Bill Ferguson ", help = "https://docs.darktable.org/lua/stable/lua.scripts.manual/scripts/tools/get_libdoc" From 8e129d3825c23ddf17cc8c57802d37891474470d Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Tue, 22 Oct 2024 16:38:03 -0400 Subject: [PATCH 4/6] tools/script_manager - added translated folder names. cleaned up metadata handling (trimmed whitespace and comments) fixed bug with folder names partially matching other folder names --- tools/script_manager.lua | 44 +++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/tools/script_manager.lua b/tools/script_manager.lua index 59c23c4..573f182 100644 --- a/tools/script_manager.lua +++ b/tools/script_manager.lua @@ -132,6 +132,7 @@ sm.event_registered = false sm.widgets = {} sm.folders = {} +sm.translated_folders = {} -- set log level for functions @@ -364,8 +365,9 @@ end local function string_trim(str) local old_log_level = set_log_level(sm.log_level) - local result = string.gsub(str, "^%s+", "") - result = string.gsub(result, "%s+$", "") + local result = string.gsub(str, "^%s+", "") -- trim leading spaces + result = string.gsub(result, "%s+$", "") -- trim trailing spaces + result = string.gsub(result, ",?%s+%-%-.+$", "") -- trim trailing comma and comments restore_log_level(old_log_level) return result @@ -387,11 +389,42 @@ end -- script handling ------------------ +local function is_folder_known(folder_table, name) + local match = false + + for _, folder_name in ipairs(folder_table) do + if name == folder_name then + match = true + end + end + + return match +end + +local function find_translated_name(folder) + local translated_name = nil + + if folder == "contrib" then + translated_name = _("contributed") + elseif folder == "examples" then + translated_name = _("examples") + elseif folder == "official" then + translated_name = _("official") + elseif folder == "tools" then + translated_name = _("tools") + else + translated_name = _(folder) -- in case we get lucky and the string got translated elsewhere + end + + return translated_name +end + local function add_script_folder(folder) local old_log_level = set_log_level(sm.log_level) - if #sm.folders == 0 or not string.match(du.join(sm.folders, " "), ds.sanitize_lua(folder)) then + if #sm.folders == 0 or not is_folder_known(sm.folders, folder) then table.insert(sm.folders, folder) + table.insert(sm.translated_folders, find_translated_name(folder)) sm.scripts[folder] = {} log.msg(log.debug, "created folder " .. folder) end @@ -427,6 +460,7 @@ local function get_script_metadata(script) log.msg(log.debug, "splitting line " .. lines[i]) local parts = du.split(lines[i], " = ") parts[1] = string_trim(parts[1]) + parts[2] = string_trim(parts[2]) log.msg(log.debug, "got value " .. parts[1] .. " and data " .. parts[2]) if string.match(parts[2], "%_%(") then parts[2] = _(string_dequote(string_dei18n(parts[2]))) @@ -1378,10 +1412,10 @@ sm.widgets.folder_selector = dt.new_widget("combobox"){ changed_callback = function(self) if sm.run then pref_write("folder_selector", "integer", self.selected) - change_folder(self.value) + change_folder(sm.folders[self.selected]) end end, - table.unpack(sm.folders), + table.unpack(sm.translated_folders), } -- a script "button" consists of: From a0af01884df3d83d5ee1b65394e584934634505c Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Wed, 23 Oct 2024 10:57:29 -0400 Subject: [PATCH 5/6] official/enfuse - fixed name and widget values to be translatable --- official/enfuse.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/official/enfuse.lua b/official/enfuse.lua index 28d6da8..7bda2cf 100644 --- a/official/enfuse.lua +++ b/official/enfuse.lua @@ -72,7 +72,7 @@ local function install_module() if not enf.module_installed then dt.register_lib( "enfuse", -- plugin name - "enfuse", -- name + _("enfuse"), -- name true, -- expandable false, -- resetable {[dt.gui.views.lighttable] = {"DT_UI_CONTAINER_PANEL_RIGHT_CENTER", 100}}, -- containers @@ -135,7 +135,7 @@ if enfuse_installed then if version < "4.2" then exposure_mu = dt.new_widget("slider") { - label = "exposure mu", + label = _("exposure mu"), tooltip = _("center also known as mean of gaussian weighting function (0 <= mean <= 1); default: 0.5"), hard_min = 0, hard_max = 1, @@ -144,7 +144,7 @@ if enfuse_installed then else exposure_mu = dt.new_widget("slider") { - label = "exposure optimum", + label = _("exposure optimum"), tooltip = _("optimum exposure value, usually the maximum of the weighting function (0 <= optimum <=1); default 0.5"), hard_min = 0, hard_max = 1, @@ -154,7 +154,7 @@ if enfuse_installed then local depth = dt.new_widget("combobox") { - label = "depth", + label = _("depth"), tooltip = _("the number of bits per channel of the output image"), value = dt.preferences.read("enfuse", "depth", "integer"), changed_callback = function(w) dt.preferences.write("enfuse", "depth", "integer", w.selected) end, @@ -163,7 +163,7 @@ if enfuse_installed then local blend_colorspace = dt.new_widget("combobox") { - label = "blend colorspace", + label = _("blend colorspace"), tooltip = _("force blending in selected colorspace"), changed_callback = function(w) dt.preferences.write("enfuse", "blend_colorspace", "string", w.selected) end, "", "identity", "ciecam" From 21ec2883fe51e7bf8723ee6919b6e6bb04f300ea Mon Sep 17 00:00:00 2001 From: Bill Ferguson Date: Wed, 23 Oct 2024 11:42:41 -0400 Subject: [PATCH 6/6] Added translation to module name --- examples/moduleExample.lua | 2 +- official/image_path_in_ui.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/moduleExample.lua b/examples/moduleExample.lua index bc43267..89c56bc 100644 --- a/examples/moduleExample.lua +++ b/examples/moduleExample.lua @@ -75,7 +75,7 @@ local function install_module() -- https://www.darktable.org/lua-api/index.html#darktable_register_lib dt.register_lib( "exampleModule", -- Module name - "exampleModule", -- name + _("example module"), -- name true, -- expandable false, -- resetable {[dt.gui.views.lighttable] = {"DT_UI_CONTAINER_PANEL_RIGHT_CENTER", 100}}, -- containers diff --git a/official/image_path_in_ui.lua b/official/image_path_in_ui.lua index 74671cd..2f23184 100644 --- a/official/image_path_in_ui.lua +++ b/official/image_path_in_ui.lua @@ -63,7 +63,7 @@ local main_label = dt.new_widget("label"){selectable = true, ellipsize = "middle local function install_module() if not ipiu.module_installed then - dt.register_lib("image_path_no_ui","selected images path",true,false,{ + dt.register_lib("image_path_no_ui",_("selected images path"),true,false,{ [dt.gui.views.lighttable] = {"DT_UI_CONTAINER_PANEL_LEFT_CENTER",300} }, main_label )