diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2020-11-09 12:20:23 +0100 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2020-11-09 12:20:35 +0100 |
| commit | 81e872c11066fec3cbc92506d437a9452cffb793 (patch) | |
| tree | 7f7c3ebc395b531fb011f8f07baae1a1d473e72d /src/mod_configure.erl | |
| parent | Document sql_odbc_driver option (copied from docs site) (diff) | |
Don't do double utf-8 conversion on translated strings in str:format
This caused garbled text in some places in webadmin when using language
that used characters > 128.
Thanks to chengshq for noticing this and providing preliminary patch.
Diffstat (limited to 'src/mod_configure.erl')
| -rw-r--r-- | src/mod_configure.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mod_configure.erl b/src/mod_configure.erl index 71c411979..adc97f114 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -663,7 +663,7 @@ get_outgoing_s2s(Host, Lang) -> Host == FH orelse str:suffix(DotHost, FH)], lists:map( fun (T) -> - Name = str:format(tr(Lang, ?T("To ~ts")),[T]), + Name = str:translate_and_format(Lang, ?T("To ~ts"),[T]), #disco_item{jid = jid:make(Host), node = <<"outgoing s2s/", T/binary>>, name = Name} @@ -675,7 +675,7 @@ get_outgoing_s2s(Host, Lang, To) -> lists:map( fun ({F, _T}) -> Node = <<"outgoing s2s/", To/binary, "/", F/binary>>, - Name = str:format(tr(Lang, ?T("From ~ts")), [F]), + Name = str:translate_and_format(Lang, ?T("From ~ts"), [F]), #disco_item{jid = jid:make(Host), node = Node, name = Name} end, lists:keysort( |