Skip to content

M
magicseteditor
Commit b8c210bd authored by twanvl's avatar twanvl
Browse files
Options

always call the combine function when expanding keywords

parent 8746c5ff
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 16 deletions
src/data/keyword.cpp
View file @ b8c210bd
......@@ -686,23 +686,18 @@ bool KeywordDatabase::tryExpand(const Keyword& kw,
result += remove_tag(tagged.substr(0, start), _("<kw-"));
// Combine keyword & reminder with result
if (expand) {
String reminder;
try {
reminder = kw.reminder.invoke(ctx)->toString();
} catch (const Error& e) {
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword), true, false);
}
ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder));
result += _("<kw-"); result += expand_type; result += _(">");
result += combine_script->eval(ctx)->toString();
result += _("</kw-"); result += expand_type; result += _(">");
} else {
result += _("<kw-"); result += expand_type; result += _(">");
result += total;
result += _("</kw-"); result += expand_type; result += _(">");
String reminder;
try {
reminder = kw.reminder.invoke(ctx)->toString();
} catch (const Error& e) {
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword), true, false);
}
ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder));
ctx.setVariable(_("expand"), to_script(expand));
result += _("<kw-"); result += expand_type; result += _(">");
result += combine_script->eval(ctx)->toString();
result += _("</kw-"); result += expand_type; result += _(">");
// Add to usage statistics
if (stat && stat_key) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment