diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-11-04 22:06:07 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-11-04 22:06:07 +0100 |
| commit | 0f69e739a8d009c2b54e49b3fdb2dc0d6ca123b8 (patch) | |
| tree | b02a4022815d78fa96f74de2db11b34b4926b55c | |
| parent | c78ca2592dd35703d4f61f4c0b78481135e029eb (diff) | |
| download | abrechenbarkeit-0f69e739a8d009c2b54e49b3fdb2dc0d6ca123b8.tar abrechenbarkeit-0f69e739a8d009c2b54e49b3fdb2dc0d6ca123b8.tar.bz2 abrechenbarkeit-0f69e739a8d009c2b54e49b3fdb2dc0d6ca123b8.tar.zst | |
partially fix format
| -rwxr-xr-x | abrechenbarkeit.lua | 10 | ||||
| -rw-r--r-- | locale/de.ini | 1 | ||||
| -rw-r--r-- | locale/en.ini | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/abrechenbarkeit.lua b/abrechenbarkeit.lua index d29cf20..190bea7 100755 --- a/abrechenbarkeit.lua +++ b/abrechenbarkeit.lua @@ -91,10 +91,12 @@ local stylesheet = io.open("style.css"):read("a") local script = io.open("script.js"):read("a") local function format(template, params) - return string.gsub(template, "{([%w\\.!]+)}", function(n) - local raw = n:sub(1,1) ~= "!" - if raw then n = n:sub(2) end - local s = format(params[n] or translations[n] or "NIL TEMPLATE", params) + params = params or {} + if template == nil then return "NIL TEMPLATE" end + return string.gsub(template, "{([%w_\\.!]+)}", function(n) + local raw = n:sub(1, 1) ~= "!" + if not raw then n = n:sub(2) end + local s = format(params[n] or translations[n] or "NIL PARAM", params) return raw and s or escape(s) end) end diff --git a/locale/de.ini b/locale/de.ini index c549161..babbbd9 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -1,3 +1,4 @@ +[abrechenbarkeit] appname=Abrechenbarkeit about=Über field.amount=Menge diff --git a/locale/en.ini b/locale/en.ini index 1deac2a..5eecfaf 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -1,3 +1,4 @@ +[abrechenbarkeit] appname=Abrechenbarkeit about=About field.amount=Amount |