From: Jaroslav Kysela Date: Tue, 23 Jun 2015 21:35:25 +0000 (+0200) Subject: prop: fix PO_LOCALE handling X-Git-Tag: v4.2.1~2237 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdd3c708226983557451fa77decd56d3c2a85807;p=thirdparty%2Ftvheadend.git prop: fix PO_LOCALE handling --- diff --git a/src/prop.c b/src/prop.c index 127ffaee3..4b3d43247 100644 --- a/src/prop.c +++ b/src/prop.c @@ -310,8 +310,13 @@ prop_read_value htsmsg_add_s64(m, name, *(int64_t *)val); break; case PT_STR: - if ((s = *(const char **)val)) - htsmsg_add_str(m, name, lang ? tvh_gettext_lang(lang, s) : s); + if (optmask & PO_LOCALE) { + if ((s = *(const char **)val)) + htsmsg_add_str(m, name, lang ? tvh_gettext_lang(lang, s) : s); + } else { + if ((s = *(const char **)val)) + htsmsg_add_str(m, name, s); + } break; case PT_DBL: htsmsg_add_dbl(m, name, *(double*)val);