From 50077e614cbed92cf54a90b2546497fec153733f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 27 Jan 2025 11:46:54 +0300 Subject: =?UTF-8?q?fixes=20#4854=20(NewStory:=20=D0=BD=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA=20=D0=BE?= =?UTF-8?q?=D0=BA=D0=BD=D0=B0=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NewStory/src/templates.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'plugins/NewStory/src/templates.cpp') diff --git a/plugins/NewStory/src/templates.cpp b/plugins/NewStory/src/templates.cpp index fc7d59f3f0..280ddd081f 100644 --- a/plugins/NewStory/src/templates.cpp +++ b/plugins/NewStory/src/templates.cpp @@ -427,18 +427,15 @@ CMStringW TplFormatString(int tpl, MCONTACT hContact, ItemData *item) return CMStringW(); auto &T = templates[tpl]; - if (T.value == nullptr) - T.value = mir_wstrdup(T.defvalue); + wchar_t *pValue = TranslateW((T.value) ? T.value : T.defvalue); TemplateVars vars; - for (auto &it : T.vf) if (it) it(&vars, hContact, item); CMStringW buf; - - for (wchar_t *p = T.value; *p; p++) { + for (wchar_t *p = pValue; *p; p++) { if (*p == '%') { wchar_t *var = vars.GetVar((p[1] & 0xff)); if (var) -- cgit v1.2.3