tools/script_manager - fixed metadata decoding to get rid of spurious
commas
This commit is contained in:
@@ -60,7 +60,7 @@ local gettext = dt.gettext
|
|||||||
|
|
||||||
|
|
||||||
-- Tell gettext where to find the .mo file translating messages for a particular domain
|
-- Tell gettext where to find the .mo file translating messages for a particular domain
|
||||||
gettext.bindtextdomain("script_manager",dt.configuration.config_dir.."/lua/locale/")
|
dt.gettext.bindtextdomain("script_manager",dt.configuration.config_dir.."/lua/locale/")
|
||||||
|
|
||||||
local function _(msgid)
|
local function _(msgid)
|
||||||
return gettext.dgettext("script_manager", msgid)
|
return gettext.dgettext("script_manager", msgid)
|
||||||
@@ -380,6 +380,10 @@ local function string_dei18n(str)
|
|||||||
return string.match(str, "%_%((.+)%)")
|
return string.match(str, "%_%((.+)%)")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function string_chop(str)
|
||||||
|
return str:sub(1, -2)
|
||||||
|
end
|
||||||
|
|
||||||
------------------
|
------------------
|
||||||
-- script handling
|
-- script handling
|
||||||
------------------
|
------------------
|
||||||
@@ -431,6 +435,9 @@ local function get_script_metadata(script)
|
|||||||
else
|
else
|
||||||
parts[2] = string_dequote(parts[2])
|
parts[2] = string_dequote(parts[2])
|
||||||
end
|
end
|
||||||
|
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])
|
metadata = metadata .. string.format("%s%-10s\t%s", first and "" or "\n", parts[1], parts[2])
|
||||||
first = nil
|
first = nil
|
||||||
end
|
end
|
||||||
@@ -438,6 +445,7 @@ local function get_script_metadata(script)
|
|||||||
end
|
end
|
||||||
|
|
||||||
restore_log_level(old_log_level)
|
restore_log_level(old_log_level)
|
||||||
|
dt.print_log(metadata)
|
||||||
return metadata
|
return metadata
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user