Skip to content

Commit da7674c

Browse files
wpfergusonwpferguson
committed
lib/dtutils/string - updated tooltip to use same translatable strings
 as gui/gtkentry.c for consistency and eas of translation
1 parent e359567 commit da7674c

File tree

1 file changed

+91
-81
lines changed

1 file changed

+91
-81
lines changed

‎lib/dtutils/string.lua‎

Lines changed: 91 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,9 @@ local PLACEHOLDERS = {"ROLL.NAME",
589589
"RATING.ICONS", -- Not Implemented
590590
"LABELS",
591591
"LABELS.ICONS", -- Not Implemented
592-
"MAKER",
593-
"MODEL",
594-
"LENS",
592+
"EXIF.MAKER",
593+
"EXIF.MODEL",
594+
"EXIF.LENS",
595595
"TITLE",
596596
"DESCRIPTION",
597597
"CREATOR",
@@ -834,84 +834,94 @@ dtutils_string.libdoc.functions["get_substitution_tooltip"] = {
834834
}
835835

836836
function dtutils_string.get_substitution_tooltip()
837-
return string.format("$(ROLL.NAME) - %s\n", _("film roll of the input image")) ..
838-
string.format("$(FILE.FOLDER) - %s\n", _("folder containing the input image")) ..
839-
string.format("$(FILE.NAME) - %s\n", _("basename of the input image")) ..
840-
string.format("$(FILE.EXTENSION) - %s\n", _("extension of the input image")) ..
841-
string.format("$(ID) - %s\n", _("the image id")) ..
842-
string.format("$(VERSION) - %s\n", _("the duplicate version number")) ..
843-
string.format("$(VERSION.IF.MULTI) - %s\n", _("same as $(VERSION) but null string if only one version exists")) ..
844-
string.format("$(VERSION.NAME) - %s\n", _("version name from metadata")) ..
845-
string.format("$(DARKTABLE.VERSION) - %s\n", _("the version of the running darktable instance")) ..
846-
--string.format("$(DARKTABLE.NAME) - %s\n", _("")) .. -- Not Implemented
847-
string.format("$(SEQUENCE[n,m]) - %s\n", _("a sequence number within an export job with n digits and starting with m\nparameters are optional, default is [4,1]")) ..
848-
string.format("$(WIDTH.SENSOR) - %s\n", _("width of RAW data in pixels before RAW crop")) ..
849-
string.format("$(HEIGHT.SENSOR) - %s\n", _("height of RAW data in pixels before RAW crop")) ..
850-
string.format("$(WIDTH.RAW) - %s\n", _("width of RAW data in pixels after RAW crop")) ..
851-
string.format("$(HEIGHT.RAW) - %s\n", _("height of RAW data in pixels after RAW crop")) ..
852-
string.format("$(WIDTH.CROP) - %s\n", _("image width in pixels at the end of the pixelpipe, but before export resize")) ..
853-
string.format("$(HEIGHT.CROP) - %s\n", _("image height in pixels at the end of the pixelpipe, but before export resize")) ..
854-
string.format("$(WIDTH.EXPORT) - %s\n", _("image width in pixels at the end of the pixelpipe and after export resize")) ..
855-
string.format("$(HEIGHT.EXPORT) - %s\n", _("image height in pixels at the end of the pixelpipe and after export resize")) ..
856-
--string.format("$(WIDTH.MAX) - %s\n", _("")) .. -- Not Implemented
857-
--string.format("$(HEIGHT.MAX) - %s\n", _("")) .. -- Not Implemented
858-
string.format("$(YEAR) - %s\n", _("current year")) ..
859-
string.format("$(YEAR.SHORT) - %s\n", _("current two digit year")) ..
860-
string.format("$(MONTH) - %s\n", _("current numeric (1-12) month")) ..
861-
string.format("$(MONTH.LONG) - %s\n", _("full current month name")) ..
862-
string.format("$(MONTH.SHORT) - %s\n", _("abbreviated current month name")) ..
863-
string.format("$(DAY) - %s\n", _("current day")) ..
864-
string.format("$(HOUR) - %s\n", _("current hour")) ..
865-
string.format("$(MINUTE) - %s\n", _("current minute")) ..
866-
string.format("$(SECOND) - %s\n", _("current second")) ..
867-
string.format("$(MSEC) - %s\n", _("current millisecond")) ..
868-
string.format("$(EXIF.YEAR) - EXIF %s\n", _("year")) ..
869-
string.format("$(EXIF.YEAR.SHORT) - EXIF %s\n", _("year, two-digit version")) ..
870-
string.format("$(EXIF.MONTH) - EXIF %s\n", _("month, numeric")) ..
871-
string.format("$(EXIF.MONTH.LONG) - EXIF %s\n", _("month, full name")) ..
872-
string.format("$(EXIF.MONTH.SHORT) - EXIF %s\n", _("month, abbreviated name")) ..
873-
string.format("$(EXIF.DAY) - EXIF %s\n", _("day")) ..
874-
string.format("$(EXIF.HOUR) - EXIF %s\n", _("hour")) ..
875-
string.format("$(EXIF.MINUTE) - EXIF %s\n", _("minute")) ..
876-
string.format("$(EXIF.SECOND) - EXIF %s\n", _("second")) ..
877-
string.format("$(EXIF.MSEC) - EXIF %s\n", _("millisecond")) ..
878-
--string.format("$(EXIF.DATE.REGIONAL) - %s\n", _("")) .. -- Not Implemented
879-
--string.format("$(EXIF.TIME.REGIONAL) - %s\n", _("")) .. -- Not Implemented
880-
string.format("$(EXIF.ISO) - EXIF ISO %s\n", _("value")) ..
881-
string.format("$(EXIF.EXPOSURE) - EXIF %s\n", _("exposure")) ..
882-
string.format("$(EXIF.EXPOSURE.BIAS) - EXIF %s\n", _("exposure bias")) ..
883-
string.format("$(EXIF.APERTURE) - EXIF %s\n", _("aperture")) ..
884-
string.format("$(EXIF.CROP.FACTOR) - EXIF %s\n", _("crop factor")) ..
885-
string.format("$(EXIF.FOCAL.LENGTH) - EXIF %s\n", _("focal length")) ..
886-
string.format("$(EXIF.FOCAL.LENGTH.EQUIV) - EXIF 35mm %s\n", _("equivalent focal length")) .. -- Not Implemented
887-
string.format("$(EXIF.FOCUS.DISTANCE) - EXIF %s\n", _("focus distance")) ..
888-
--string.format("$(IMAGE.EXIF) - %s\n", _("")) .. -- Not Implemented
889-
string.format("$(LONGITUDE) - %s\n", _("longitude")) ..
890-
string.format("$(LATITUDE) - %s\n", _("latitude")) ..
891-
string.format("$(ELEVATION) - %s\n", _("elevation")) ..
892-
--string.format("$(GPS.LOCATION) - %s\n", _("")) .. -- Not Implemented
893-
string.format("$(STARS) - %s\n", _("star rating")) ..
894-
--string.format("$(RATING.ICONS) - %s\n", _("")) .. -- Not Implemented
895-
string.format("$(LABELS) - %s\n", _("colorlabels")) ..
896-
--string.format("$(LABELS.ICONS) - %s\n", _("")) .. -- Not Implemented
897-
string.format("$(MAKER) - %s\n", _("camera maker")) ..
898-
string.format("$(MODEL) - %s\n", _("camera model")) ..
899-
string.format("$(LENS) - %s\n", _("lens")) ..
900-
string.format("$(TITLE) - %s\n", _("title from metadata")) ..
901-
string.format("$(DESCRIPTION) - %s\n", _("description from metadata")) ..
902-
string.format("$(CREATOR) - %s\n", _("creator from metadata")) ..
903-
string.format("$(PUBLISHER) - %s\n", _("publisher from metadata")) ..
904-
string.format("$(RIGHTS) - %s\n", _("rights from metadata")) ..
905-
--string.format("$(TAGS) - %s\n", _("")) .. -- Not Implemented
906-
string.format("$(CATEGORY[n,category]) - %s\n", _("tag name of level n [0,9] of selected category (or tag)")) ..
907-
--string.format("$(SIDECAR.TXT) - %s\n", _("")) .. -- Not Implemented
908-
string.format("$(FOLDER.PICTURES) - %s\n", _("pictures folder")) ..
909-
string.format("$(FOLDER.HOME) - %s\n", _("home folder")) ..
910-
string.format("$(FOLDER.DESKTOP) - %s\n", _("desktop folder")) ..
911-
--string.format("$(OPENCL.ACTIVATED) - %s\n", _("")) .. -- Not Implemented
912-
string.format("$(USERNAME) - %s\n", _("user name defined by OS"))
913-
--string.format("$(NL) - %s\n", _("")) .. -- Not Implemented
914-
--string.format("$(JOBCODE) - %s", _("")) -- Not Implemented
837+
return _("$(ROLL.NAME) - roll of the input image") .. "\n" ..
838+
_("$(FILE.FOLDER) - folder containing the input image") .. "\n" ..
839+
_("$(FILE.NAME) - basename of the input image") .. "\n" ..
840+
_("$(FILE.EXTENSION) - extension of the input image") .. "\n" ..
841+
_("$(ID) - image ID") .. "\n" ..
842+
_("$(VERSION) - duplicate version") .. "\n" ..
843+
_("$(VERSION.IF_MULTI) - same as $(VERSION) but null string if only one version exists") .. "\n" ..
844+
_("$(VERSION.NAME) - version name from metadata") .. "\n" ..
845+
_("$(DARKTABLE.VERSION) - current darktable version") .. "\n" ..
846+
-- _("$(DARKTABLE.NAME) - darktable name") .. "\n" .. -- not implemented
847+
_("$(SEQUENCE[n,m]) - sequence number, n: number of digits, m: start number") .. "\n" ..
848+
_("$(WIDTH.SENSOR) - image sensor width") .. "\n" ..
849+
_("$(HEIGHT.SENSOR) - image sensor height") .. "\n" ..
850+
_("$(WIDTH.RAW) - RAW image width") .. "\n" ..
851+
_("$(HEIGHT.RAW) - RAW image height") .. "\n" ..
852+
_("$(WIDTH.CROP) - image width after crop") .. "\n" ..
853+
_("$(HEIGHT.CROP) - image height after crop") .. "\n" ..
854+
_("$(WIDTH.EXPORT) - exported image width") .. "\n" ..
855+
_("$(HEIGHT.EXPORT) - exported image height") .. "\n" ..
856+
-- _("$(WIDTH.MAX) - maximum image export width") .. "\n" .. -- not implemented
857+
-- _("$(HEIGHT.MAX) - maximum image export height") .. "\n" .. -- not implemented
858+
_("$(YEAR) - year") .. "\n" ..
859+
_("$(YEAR.SHORT) - year without century") .. "\n" ..
860+
_("$(MONTH) - month") .. "\n" ..
861+
_("$(MONTH.LONG) - full month name according to the current locale") .. "\n" ..
862+
_("$(MONTH.SHORT) - abbreviated month name according to the current locale") .. "\n" ..
863+
_("$(DAY) - day") .. "\n" ..
864+
_("$(HOUR) - hour") .. "\n" ..
865+
-- _("$(HOUR.AMPM) - hour, 12-hour clock") .. "\n" .. -- not implemented
866+
_("$(MINUTE) - minute") .. "\n" ..
867+
_("$(SECOND) - second") .. "\n" ..
868+
_("$(MSEC) - millisecond") .. "\n" ..
869+
_("$(EXIF.YEAR) - EXIF year") .. "\n" ..
870+
_("$(EXIF.YEAR.SHORT) - EXIF year without century") .. "\n" ..
871+
_("$(EXIF.MONTH) - EXIF month") .. "\n" ..
872+
_("$(EXIF.MONTH.LONG) - full EXIF month name according to the current locale") .. "\n" ..
873+
_("$(EXIF.MONTH.SHORT) - abbreviated EXIF month name according to the current locale") .. "\n" ..
874+
_("$(EXIF.DAY) - EXIF day") .. "\n" ..
875+
_("$(EXIF.HOUR) - EXIF hour") .. "\n" ..
876+
-- _("$(EXIF.HOUR.AMPM) - EXIF hour, 12-hour clock") .. "\n" .. -- not implemented
877+
_("$(EXIF.MINUTE) - EXIF minute") .. "\n" ..
878+
_("$(EXIF.SECOND) - EXIF second") .. "\n" ..
879+
_("$(EXIF.MSEC) - EXIF millisecond") .. "\n" ..
880+
-- _("$(EXIF.DATE.REGIONAL) - localized EXIF date") .. "\n" .. -- not implemented
881+
-- _("$(EXIF.TIME.REGIONAL) - localized EXIF time") .. "\n" .. -- not implemented
882+
_("$(EXIF.ISO) - ISO value") .. "\n" ..
883+
_("$(EXIF.EXPOSURE) - EXIF exposure") .. "\n" ..
884+
_("$(EXIF.EXPOSURE.BIAS) - EXIF exposure bias") .. "\n" ..
885+
-- _("$(EXIF.EXPOSURE.PROGRAM) - EXIF exposure program") .. "\n" .. -- not implemented
886+
_("$(EXIF.APERTURE) - EXIF aperture") .. "\n" ..
887+
_("$(EXIF.CROP_FACTOR) - EXIF crop factor") .. "\n" ..
888+
_("$(EXIF.FOCAL.LENGTH) - EXIF focal length") .. "\n" ..
889+
_("$(EXIF.FOCAL.LENGTH.EQUIV) - EXIF 35 mm equivalent focal length") .. "\n" ..
890+
_("$(EXIF.FOCUS.DISTANCE) - EXIF focal distance") .. "\n" ..
891+
_("$(EXIF.MAKER) - camera maker") ..
892+
_("$(EXIF.MODEL) - camera model") ..
893+
-- _("$(EXIF.WHITEBALANCE) - EXIF selected white balance") .. -- not implemented
894+
-- _("$(EXIF.METERING) - EXIF exposure metering mode") .. -- not implemented
895+
_("$(EXIF.LENS) - lens") ..
896+
-- _("$(EXIF.FLASH.ICON) - icon indicating whether flash was used") .. -- not implemented
897+
-- _("$(EXIF.FLASH) - was flash used (yes/no/--)") .. -- not implemented
898+
-- _("$(GPS.LONGITUDE) - longitude") .. "\n" ..-- not implemented
899+
-- _("$(GPS.LATITUDE) - latitude") .. "\n" ..-- not implemented
900+
-- _("$(GPS.ELEVATION) - elevation") .. "\n" ..-- not implemented
901+
-- _("$(GPS.LOCATION.ICON) - icon indicating whether GPS location is known") .. "\n" ..-- not implemented
902+
_("$(LONGITUDE) - longitude") .. "\n" ..
903+
_("$(LATITUDE) - latitude") .. "\n" ..
904+
_("$(ELEVATION) - elevation") .. "\n" ..
905+
_("$(STARS) - star rating as number (-1 for rejected)") .. "\n" ..
906+
-- _("$(RATING.ICONS) - star/reject rating in icon form") .. "\n" ..-- not implemented
907+
_("$(LABELS) - color labels as text") .. "\n" ..
908+
-- _("$(LABELS.ICONS) - color labels as icons") .. "\n" ..-- not implemented
909+
_("$(TITLE) - title from metadata") .. "\n" ..
910+
_("$(DESCRIPTION) - description from metadata") .. "\n" ..
911+
_("$(CREATOR) - creator from metadata") .. "\n" ..
912+
_("$(PUBLISHER) - publisher from metadata") .. "\n" ..
913+
_("$(RIGHTS) - rights from metadata") .. "\n" ..
914+
--_("$(TAGS) - tags as set in metadata settings") .. "\n" ..
915+
_("$(CATEGORY[n,category]) - subtag of level n in hierarchical tags") .. "\n" ..
916+
_("$(SIDECAR_TXT) - contents of .txt sidecar file, if present") .. "\n" ..
917+
_("$(FOLDER.PICTURES) - pictures folder") .. "\n" ..
918+
_("$(FOLDER.HOME) - home folder") .. "\n" ..
919+
_("$(FOLDER.DESKTOP) - desktop folder") .. "\n" ..
920+
-- _("$(OPENCL.ACTIVATED) - whether OpenCL is activated") .. "\n" ..
921+
_("$(USERNAME) - login name") .. "\n" ..
922+
-- _("$(NL) - newline") .. "\n" ..
923+
-- _("$(JOBCODE) - job code for import") .. "\n" ..
924+
""
915925
end
916926

917927
-- handle different versions of names

0 commit comments

Comments
 (0)