Correct <subject> with multiple languages to follow RFC 6121 (report from Evgeny Khramtsov)

This commit is contained in:
Steve Kille 2017-01-27 08:23:22 +00:00 committed by Sam Whited
parent 927c11edc8
commit fa5fac8fc1
1 changed files with 15 additions and 15 deletions

View File

@ -36,7 +36,15 @@
&ksmithisode;
&skille;
&stpeter;
<revision>
<version>0.6.xx</version>
<date>2017-01-nn</date>
<initials>sek</initials>
<remark><p>
Correct multi-language subject setting;
Remove MIX Proxy terminology and replace with Participant Server Behaviour;
</p></remark>
</revision>
<revision>
<version>0.6.5</version>
<date>2017-01-10</date>
@ -1355,19 +1363,15 @@ the participant is not be subscribed to all nodes associated with the channel (i
</section3>
<section3 topic="Setting the Channel Subject" anchor="set-subject">
<p>
Setting the subject for a channel follows a similar procedure to sending a message. An XMPP client will send a message setting the subject directly to the MIX channel.
Setting the subject for a channel follows a similar procedure to sending a message. An XMPP client will send a message setting the subject directly to the MIX channel. Note that where multiple language variants are used, the subject is repeated and each subject MUST include a language reference.
</p>
<example caption="User Sets Channel Subject"><![CDATA[
<message from='hag66@shakespeare.example/pda'
to='coven@mix.shakespeare.example'
id='92vax143g'
type='groupchat'>
<subject>
<item>
<text xml:lang="en">How to use Toads</text>
<text xml:lang="de">Wie benutzt man Kröten</text>
</item>
</subject>
<subject xml:lang="en">How to use Toads</subject>
<subject xml:lang="de">Wie benutzt man Kröten</subject>
</message>
]]></example>
<p>
@ -1378,12 +1382,8 @@ the participant is not be subscribed to all nodes associated with the channel (i
to='hecate@shakespeare.example'
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='groupchat'>
<subject>
<item>
<text xml:lang="en">How to use Toads</text>
<text xml:lang="de">Wie benutzt man Kröten</text>
</item>
</subject>
<subject xml:lang="en">How to use Toads</subject>
<subject xml:lang="de">Wie benutzt man Kröten</subject>
</message>
]]></example>
<p>
@ -2293,7 +2293,7 @@ A client creates a channel by sending a simple request to the MIX service. A c
</section1>
<section1 topic='Acknowledgements' anchor='ack'>
<p>Thanks to the following who have made contributions: Dave Cridland, Philipp Hancke, Waqas Hussain, Timothée Jaussoin, Georg Lukas, Ralph Meijer, Edwin Mons, Emmanuel Gil Peyrot, Florian Schmaus, Lance Stout, Sam Whited, Matthew Wild and one anonymous reviewer.</p>
<p>Thanks to the following who have made contributions: Dave Cridland, Philipp Hancke, Waqas Hussain, Timothée Jaussoin, Evgeny Khramtsov, Georg Lukas, Ralph Meijer, Edwin Mons, Emmanuel Gil Peyrot, Florian Schmaus, Lance Stout, Sam Whited, Matthew Wild and one anonymous reviewer.</p>
</section1>
</xep>