25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Rewrite vcard example configuration to not require extended format

This commit is contained in:
Badlop 2024-03-29 16:36:47 +01:00
parent 345af5a535
commit d8cdd82bf8
5 changed files with 82 additions and 75 deletions

View File

@ -367,21 +367,22 @@ mod_doc() ->
"of vCard. Since the representation has no attributes, " "of vCard. Since the representation has no attributes, "
"the mapping is straightforward."), "the mapping is straightforward."),
example => example =>
[{?T("For example, the following XML representation of vCard:"), ["# This XML representation of vCard:",
["<vCard xmlns='vcard-temp'>", "# <vCard xmlns='vcard-temp'>",
" <FN>Conferences</FN>", "# <FN>Conferences</FN>",
" <ADR>", "# <ADR>",
" <WORK/>", "# <WORK/>",
" <STREET>Elm Street</STREET>", "# <STREET>Elm Street</STREET>",
" </ADR>", "# </ADR>",
"</vCard>"]}, "# </vCard>",
{?T("will be translated to:"), "# ",
["vcard:", "# is translated to:",
"vcard:",
" fn: Conferences", " fn: Conferences",
" adr:", " adr:",
" -", " -",
" work: true", " work: true",
" street: Elm Street"]}]}}], " street: Elm Street"]}}],
example => example =>
["listen:", ["listen:",
" -", " -",

View File

@ -1654,21 +1654,22 @@ mod_doc() ->
"of vCard. Since the representation has no attributes, " "of vCard. Since the representation has no attributes, "
"the mapping is straightforward."), "the mapping is straightforward."),
example => example =>
[{?T("For example, the following XML representation of vCard:"), ["# This XML representation of vCard:",
["<vCard xmlns='vcard-temp'>", "# <vCard xmlns='vcard-temp'>",
" <FN>Conferences</FN>", "# <FN>Conferences</FN>",
" <ADR>", "# <ADR>",
" <WORK/>", "# <WORK/>",
" <STREET>Elm Street</STREET>", "# <STREET>Elm Street</STREET>",
" </ADR>", "# </ADR>",
"</vCard>"]}, "# </vCard>",
{?T("will be translated to:"), "# ",
["vcard:", "# is translated to:",
"vcard:",
" fn: Conferences", " fn: Conferences",
" adr:", " adr:",
" -", " -",
" work: true", " work: true",
" street: Elm Street"]}]}}, " street: Elm Street"]}},
{cleanup_affiliations_on_start, {cleanup_affiliations_on_start,
#{value => "true | false", #{value => "true | false",
note => "added in 22.05", note => "added in 22.05",

View File

@ -239,21 +239,22 @@ mod_doc() ->
"of vCard. Since the representation has no attributes, " "of vCard. Since the representation has no attributes, "
"the mapping is straightforward."), "the mapping is straightforward."),
example => example =>
[{?T("For example, the following XML representation of vCard:"), ["# This XML representation of vCard:",
["<vCard xmlns='vcard-temp'>", "# <vCard xmlns='vcard-temp'>",
" <FN>Conferences</FN>", "# <FN>Conferences</FN>",
" <ADR>", "# <ADR>",
" <WORK/>", "# <WORK/>",
" <STREET>Elm Street</STREET>", "# <STREET>Elm Street</STREET>",
" </ADR>", "# </ADR>",
"</vCard>"]}, "# </vCard>",
{?T("will be translated to:"), "# ",
["vcard:", "# is translated to:",
"vcard:",
" fn: Conferences", " fn: Conferences",
" adr:", " adr:",
" -", " -",
" work: true", " work: true",
" street: Elm Street"]}]}}], " street: Elm Street"]}}],
example => example =>
["acl:", ["acl:",
" admin:", " admin:",

View File

@ -4504,21 +4504,22 @@ mod_doc() ->
"representation of vCard. Since the representation has " "representation of vCard. Since the representation has "
"no attributes, the mapping is straightforward."), "no attributes, the mapping is straightforward."),
example => example =>
[{?T("The following XML representation of vCard:"), ["# This XML representation of vCard:",
["<vCard xmlns='vcard-temp'>", "# <vCard xmlns='vcard-temp'>",
" <FN>PubSub Service</FN>", "# <FN>Conferences</FN>",
" <ADR>", "# <ADR>",
" <WORK/>", "# <WORK/>",
" <STREET>Elm Street</STREET>", "# <STREET>Elm Street</STREET>",
" </ADR>", "# </ADR>",
"</vCard>"]}, "# </vCard>",
{?T("will be translated to:"), "# ",
["vcard:", "# is translated to:",
" fn: PubSub Service", "vcard:",
" fn: Conferences",
" adr:", " adr:",
" -", " -",
" work: true", " work: true",
" street: Elm Street"]}]}} " street: Elm Street"]}}
], ],
example => example =>
[{?T("Example of configuration that uses flat nodes as default, " [{?T("Example of configuration that uses flat nodes as default, "

View File

@ -667,18 +667,21 @@ mod_doc() ->
"of vCard. Since the representation has no attributes, " "of vCard. Since the representation has no attributes, "
"the mapping is straightforward."), "the mapping is straightforward."),
example => example =>
[{?T("For example, the following XML representation of vCard:"), ["# This XML representation of vCard:",
["<vCard xmlns='vcard-temp'>", "# ",
" <FN>Conferences</FN>", "# <vCard xmlns='vcard-temp'>",
" <ADR>", "# <FN>Conferences</FN>",
" <WORK/>", "# <ADR>",
" <STREET>Elm Street</STREET>", "# <WORK/>",
" </ADR>", "# <STREET>Elm Street</STREET>",
"</vCard>"]}, "# </ADR>",
{?T("will be translated to:"), "# </vCard>",
["vcard:", "# ",
"# is translated to:",
"# ",
"vcard:",
" fn: Conferences", " fn: Conferences",
" adr:", " adr:",
" -", " -",
" work: true", " work: true",
" street: Elm Street"]}]}}]}. " street: Elm Street"]}}]}.