From a656f0f3047c5ac1caab3d4de4d4da04850a54a6 Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 22 Jan 2016 15:15:33 +0100 Subject: [PATCH 1/7] Update kml_export.lua add gettext --- contrib/kml_export.lua | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index ff5ab53..7058d2b 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -34,6 +34,9 @@ USAGE local dt = require "darktable" dt.configuration.check_version(...,{3,0,0}) + +-- Tell gettext where to find the .mo file translating messages for a particular domain +dt.gettext.bindtextdomain("kml_export",".config/darktable/lua/") local function spairs(_table, order) -- Code copied from http://stackoverflow.com/questions/15706270/sort-a-table-in-lua -- collect the keys @@ -59,7 +62,7 @@ local function spairs(_table, order) -- Code copied from http://stackoverflow.co end local function show_status(storage, image, format, filename, number, total, high_quality, extra_data) - dt.print("Export Image "..tostring(number).."/"..tostring(total)) + dt.print(string.format(dt.gettext.dgettext("gettextExample", "Export Image %i/%i"), number, total)) end local function checkIfBinExists(bin) @@ -258,15 +261,34 @@ local function create_kml_file(storage, image_table, extra_data) end -- Preferences -dt.preferences.register("kml_export", "OpenKmlFile", "bool", "KML export: Open KML/KMZ file after export", "Opens the KML file after the export with the standard programm for KML files", false ) +dt.preferences.register("kml_export", + "OpenKmlFile", + "bool", + dt.gettext.dgettext("gettextExample", "KML export: Open KML/KMZ file after export"), + dt.gettext.dgettext("gettextExample", "Opens the KML file after the export with the standard programm for KML files"), + false ) local handle = io.popen("xdg-user-dir DESKTOP") local result = handle:read() handle:close() -dt.preferences.register("kml_export", "ExportDirectory", "directory", "KML export: Export directory", "A directory that will be used to export the KML/KMZ files", result ) +dt.preferences.register("kml_export", + "ExportDirectory", + "directory", + dt.gettext.dgettext("gettextExample", "KML export: Export directory"), + dt.gettext.dgettext("gettextExample", "A directory that will be used to export the KML/KMZ files"), + result ) -dt.preferences.register("kml_export", "CreatePath", "bool", "KML export: Connect images with path", "connect all images with a path", false ) -dt.preferences.register("kml_export", "CreateKMZ", "bool", "KML export: Create KMZ file", "Compress all imeges to one KMZ file", true ) +dt.preferences.register("kml_export", + "CreatePath", + "bool", + dt.gettext.dgettext("gettextExample", "KML export: Connect images with path", "connect all images with a path"), + false ) +dt.preferences.register("kml_export", + "CreateKMZ", + "bool", + dt.gettext.dgettext("gettextExample", "KML export: Create KMZ file"), + dt.gettext.dgettext("gettextExample", "Compress all imeges to one KMZ file"), + true ) -- Register dt.register_storage("kml_export", "KML/KMZ Export", nil, create_kml_file) From cb46e090dd48ed3e04ff03da281b8622dcffe991 Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 22 Jan 2016 15:34:51 +0100 Subject: [PATCH 2/7] Update kml_export.lua small bugfix CreatePath --- contrib/kml_export.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index 7058d2b..94d9364 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -281,7 +281,8 @@ dt.preferences.register("kml_export", dt.preferences.register("kml_export", "CreatePath", "bool", - dt.gettext.dgettext("gettextExample", "KML export: Connect images with path", "connect all images with a path"), + dt.gettext.dgettext("gettextExample", "KML export: Connect images with path"), + dt.gettext.dgettext("connect all images with a path"), false ) dt.preferences.register("kml_export", "CreateKMZ", From 2379832cc263811850ff3dd8e36ae8b46959b677 Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 22 Jan 2016 15:41:07 +0100 Subject: [PATCH 3/7] Create kml_export.po --- contrib/de_DE/LC_MESSAGES/kml_export.po | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 contrib/de_DE/LC_MESSAGES/kml_export.po diff --git a/contrib/de_DE/LC_MESSAGES/kml_export.po b/contrib/de_DE/LC_MESSAGES/kml_export.po new file mode 100644 index 0000000..15d7a6b --- /dev/null +++ b/contrib/de_DE/LC_MESSAGES/kml_export.po @@ -0,0 +1,43 @@ +msgid "" +msgstr "" +"Project-Id-Version: Lua gettextTest\n" +"POT-Creation-Date: 2016-01-22 15:33+0100\n" +"PO-Revision-Date: 2016-01-22 15:32+0100\n" +"Last-Translator: Tobias Jakobs \n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.4\n" +"X-Poedit-Basepath: .\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-KeywordsList: gettext;dgettext:2;dcgettext:2;ngettext:1,2;dngettext:2,3\n" +"X-Poedit-SearchPath-0: .\n" + +msgid "Export Image %i/%i" +msgstr "Exportiere Bild %i/%i" + +msgid "KML export: Open KML/KMZ file after export" +msgstr "KML export: KML/KMZ-Datei nach dem exportieren öffnen" + +msgid "Opens the KML file after the export with the standard programm for KML files" +msgstr "Öffnet die KML-Datei mit dem Standardprogram für KML-Dateien" + +msgid "KML export: Export directory" +msgstr "KML export: Export-Verzeichnis" + +msgid "A directory that will be used to export the KML/KMZ files" +msgstr "Verzeichnis in das die KML/KMZ-Dateien exportiert werden" + +msgid "KML export: Connect images with path" +msgstr "KML export: Bilder mit einer Linie verbinden" + +msgid "connect all images with a path" +msgstr "Verbinde alle Bilder mit einer Linie" + +msgid "KML export: Create KMZ file" +msgstr "KML export: KMZ-Datei erstellen" + +msgid "Compress all imeges to one KMZ file" +msgstr "Alle Bilder in einer KMZ-Datei komprimieren" From 7cd4023f5c36937387156b8ab32535bec977073e Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 22 Jan 2016 23:30:58 +0100 Subject: [PATCH 4/7] Update kml_export.lua gettext bugfix --- contrib/kml_export.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index 94d9364..9886e70 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -264,8 +264,8 @@ end dt.preferences.register("kml_export", "OpenKmlFile", "bool", - dt.gettext.dgettext("gettextExample", "KML export: Open KML/KMZ file after export"), - dt.gettext.dgettext("gettextExample", "Opens the KML file after the export with the standard programm for KML files"), + dt.gettext.dgettext("kml_export", "KML export: Open KML/KMZ file after export"), + dt.gettext.dgettext("kml_export", "Opens the KML file after the export with the standard programm for KML files"), false ) local handle = io.popen("xdg-user-dir DESKTOP") @@ -274,22 +274,22 @@ handle:close() dt.preferences.register("kml_export", "ExportDirectory", "directory", - dt.gettext.dgettext("gettextExample", "KML export: Export directory"), - dt.gettext.dgettext("gettextExample", "A directory that will be used to export the KML/KMZ files"), + dt.gettext.dgettext("kml_export", "KML export: Export directory"), + dt.gettext.dgettext("kml_export", "A directory that will be used to export the KML/KMZ files"), result ) dt.preferences.register("kml_export", "CreatePath", "bool", - dt.gettext.dgettext("gettextExample", "KML export: Connect images with path"), - dt.gettext.dgettext("connect all images with a path"), + dt.gettext.dgettext("kml_export", "KML export: Connect images with path"), + dt.gettext.dgettext("kml_export", "connect all images with a path"), false ) dt.preferences.register("kml_export", "CreateKMZ", "bool", - dt.gettext.dgettext("gettextExample", "KML export: Create KMZ file"), - dt.gettext.dgettext("gettextExample", "Compress all imeges to one KMZ file"), + dt.gettext.dgettext("kml_export", "KML export: Create KMZ file"), + dt.gettext.dgettext("kml_export", "Compress all imeges to one KMZ file"), true ) -- Register -dt.register_storage("kml_export", "KML/KMZ Export", nil, create_kml_file) +dt.register_storage("kml_export", dt.gettext.dgettext("kml_export", "KML/KMZ Export"), nil, create_kml_file) From 225da821e4db3c7541ebc2fc6704eeb27396405e Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 22 Jan 2016 23:34:29 +0100 Subject: [PATCH 5/7] Update kml_export.po Added msgid "KML/KMZ Export" msgstr "KML/KMZ Expor --- contrib/de_DE/LC_MESSAGES/kml_export.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/de_DE/LC_MESSAGES/kml_export.po b/contrib/de_DE/LC_MESSAGES/kml_export.po index 15d7a6b..9a1bf23 100644 --- a/contrib/de_DE/LC_MESSAGES/kml_export.po +++ b/contrib/de_DE/LC_MESSAGES/kml_export.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Lua gettextTest\n" "POT-Creation-Date: 2016-01-22 15:33+0100\n" -"PO-Revision-Date: 2016-01-22 15:32+0100\n" +"PO-Revision-Date: 2016-01-22 23:28+0100\n" "Last-Translator: Tobias Jakobs \n" "Language-Team: \n" "Language: de\n" @@ -11,10 +11,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.4\n" "X-Poedit-Basepath: .\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2;t" plural=(n != 1);\n" "X-Poedit-KeywordsList: gettext;dgettext:2;dcgettext:2;ngettext:1,2;dngettext:2,3\n" "X-Poedit-SearchPath-0: .\n" +msgid "KML/KMZ Export" +msgstr "KML/KMZ Expor + msgid "Export Image %i/%i" msgstr "Exportiere Bild %i/%i" @@ -31,7 +34,7 @@ msgid "A directory that will be used to export the KML/KMZ files" msgstr "Verzeichnis in das die KML/KMZ-Dateien exportiert werden" msgid "KML export: Connect images with path" -msgstr "KML export: Bilder mit einer Linie verbinden" +msgstr "KML export: Bilder mit einer Linie verbinden" msgid "connect all images with a path" msgstr "Verbinde alle Bilder mit einer Linie" From 180bc06c0606178ae332e734fc0fe7f5d2580761 Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 29 Jan 2016 22:35:57 +0100 Subject: [PATCH 6/7] Update kml_export.lua --- contrib/kml_export.lua | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index 9886e70..37fac61 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -33,10 +33,11 @@ USAGE ]] local dt = require "darktable" +local gettext = dt.gettext dt.configuration.check_version(...,{3,0,0}) -- Tell gettext where to find the .mo file translating messages for a particular domain -dt.gettext.bindtextdomain("kml_export",".config/darktable/lua/") +gettext.bindtextdomain("kml_export",".config/darktable/lua/") local function spairs(_table, order) -- Code copied from http://stackoverflow.com/questions/15706270/sort-a-table-in-lua -- collect the keys @@ -62,7 +63,7 @@ local function spairs(_table, order) -- Code copied from http://stackoverflow.co end local function show_status(storage, image, format, filename, number, total, high_quality, extra_data) - dt.print(string.format(dt.gettext.dgettext("gettextExample", "Export Image %i/%i"), number, total)) + dt.print(string.format(gettext.dgettext("gettextExample", "Export Image %i/%i"), number, total)) end local function checkIfBinExists(bin) @@ -264,8 +265,8 @@ end dt.preferences.register("kml_export", "OpenKmlFile", "bool", - dt.gettext.dgettext("kml_export", "KML export: Open KML/KMZ file after export"), - dt.gettext.dgettext("kml_export", "Opens the KML file after the export with the standard programm for KML files"), + gettext.dgettext("kml_export", "KML export: Open KML/KMZ file after export"), + gettext.dgettext("kml_export", "Opens the KML file after the export with the standard programm for KML files"), false ) local handle = io.popen("xdg-user-dir DESKTOP") @@ -274,22 +275,22 @@ handle:close() dt.preferences.register("kml_export", "ExportDirectory", "directory", - dt.gettext.dgettext("kml_export", "KML export: Export directory"), - dt.gettext.dgettext("kml_export", "A directory that will be used to export the KML/KMZ files"), + gettext.dgettext("kml_export", "KML export: Export directory"), + gettext.dgettext("kml_export", "A directory that will be used to export the KML/KMZ files"), result ) dt.preferences.register("kml_export", "CreatePath", "bool", - dt.gettext.dgettext("kml_export", "KML export: Connect images with path"), - dt.gettext.dgettext("kml_export", "connect all images with a path"), + gettext.dgettext("kml_export", "KML export: Connect images with path"), + gettext.dgettext("kml_export", "connect all images with a path"), false ) dt.preferences.register("kml_export", "CreateKMZ", "bool", - dt.gettext.dgettext("kml_export", "KML export: Create KMZ file"), - dt.gettext.dgettext("kml_export", "Compress all imeges to one KMZ file"), + gettext.dgettext("kml_export", "KML export: Create KMZ file"), + gettext.dgettext("kml_export", "Compress all imeges to one KMZ file"), true ) -- Register -dt.register_storage("kml_export", dt.gettext.dgettext("kml_export", "KML/KMZ Export"), nil, create_kml_file) +dt.register_storage("kml_export", gettext.dgettext("kml_export", "KML/KMZ Export"), nil, create_kml_file) From 6b4faac2cb30143be50f8ed815315a8ad1fdfde8 Mon Sep 17 00:00:00 2001 From: supertobi Date: Fri, 29 Jan 2016 23:09:32 +0100 Subject: [PATCH 7/7] Update kml_export.lua function _(msgid) --- contrib/kml_export.lua | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua index 37fac61..baca991 100644 --- a/contrib/kml_export.lua +++ b/contrib/kml_export.lua @@ -37,7 +37,11 @@ local gettext = dt.gettext dt.configuration.check_version(...,{3,0,0}) -- Tell gettext where to find the .mo file translating messages for a particular domain -gettext.bindtextdomain("kml_export",".config/darktable/lua/") +gettext.bindtextdomain("kml_export",dt.configuration.config_dir.."/lua/") + +local function _(msgid) + return gettext.dgettext("kml_export", msgid) +end local function spairs(_table, order) -- Code copied from http://stackoverflow.com/questions/15706270/sort-a-table-in-lua -- collect the keys @@ -63,7 +67,7 @@ local function spairs(_table, order) -- Code copied from http://stackoverflow.co end local function show_status(storage, image, format, filename, number, total, high_quality, extra_data) - dt.print(string.format(gettext.dgettext("gettextExample", "Export Image %i/%i"), number, total)) + dt.print(string.format(_("Export Image %i/%i"), number, total)) end local function checkIfBinExists(bin) @@ -265,8 +269,8 @@ end dt.preferences.register("kml_export", "OpenKmlFile", "bool", - gettext.dgettext("kml_export", "KML export: Open KML/KMZ file after export"), - gettext.dgettext("kml_export", "Opens the KML file after the export with the standard programm for KML files"), + _("KML export: Open KML/KMZ file after export"), + _("Opens the KML file after the export with the standard programm for KML files"), false ) local handle = io.popen("xdg-user-dir DESKTOP") @@ -275,22 +279,22 @@ handle:close() dt.preferences.register("kml_export", "ExportDirectory", "directory", - gettext.dgettext("kml_export", "KML export: Export directory"), - gettext.dgettext("kml_export", "A directory that will be used to export the KML/KMZ files"), + _("KML export: Export directory"), + _("A directory that will be used to export the KML/KMZ files"), result ) dt.preferences.register("kml_export", "CreatePath", "bool", - gettext.dgettext("kml_export", "KML export: Connect images with path"), - gettext.dgettext("kml_export", "connect all images with a path"), + _("KML export: Connect images with path"), + _("connect all images with a path"), false ) dt.preferences.register("kml_export", "CreateKMZ", "bool", - gettext.dgettext("kml_export", "KML export: Create KMZ file"), - gettext.dgettext("kml_export", "Compress all imeges to one KMZ file"), + _("KML export: Create KMZ file"), + _("Compress all imeges to one KMZ file"), true ) -- Register -dt.register_storage("kml_export", gettext.dgettext("kml_export", "KML/KMZ Export"), nil, create_kml_file) +dt.register_storage("kml_export", _("KML/KMZ Export"), nil, create_kml_file)