aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Rémond <mickael.remond@process-one.net>2007-05-29 14:53:09 +0000
committerMickaël Rémond <mickael.remond@process-one.net>2007-05-29 14:53:09 +0000
commit5c15f185c294268f66cf3f52a94426d04356075e (patch)
tree3d61886b7e8c31935ba22bcae7bb0c014457528a
parent* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant) (diff)
* src/mod_vcard_odbc.erl: Make service description translatable in discovery (EJAB-236)
* src/mod_vcard_ldap.erl: Likewise SVN Revision: 776
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_vcard_ldap.erl4
-rw-r--r--src/mod_vcard_odbc.erl2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 67db61b94..413de5adf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-05-29 Mickael Remond <mickael.remond@process-one.net>
+ * src/mod_vcard_odbc.erl: Make service description translatable in
+ discovery (EJAB-236)
+ * src/mod_vcard_ldap.erl: Likewise
+
* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks
to Geoff Cant)
* src/Makefile.in: Build XmppAddr.beam in a single pass
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index ddcfc5373..d02b64f76 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -442,7 +442,7 @@ route(State, From, To, Packet) ->
From,
jlib:iq_to_xml(ResIQ))
end;
- #iq{type = Type, xmlns = ?NS_DISCO_INFO} ->
+ #iq{type = Type, xmlns = ?NS_DISCO_INFO, lang = Lang} ->
case Type of
set ->
Err = jlib:make_error_reply(
@@ -458,7 +458,7 @@ route(State, From, To, Packet) ->
[{"category", "directory"},
{"type", "user"},
{"name",
- "vCard User Search"}],
+ translate:translate(Lang, "vCard User Search")}],
[]},
{xmlelement, "feature",
[{"var", ?NS_SEARCH}], []},
diff --git a/src/mod_vcard_odbc.erl b/src/mod_vcard_odbc.erl
index 3f03d6532..e15ea38c1 100644
--- a/src/mod_vcard_odbc.erl
+++ b/src/mod_vcard_odbc.erl
@@ -357,7 +357,7 @@ do_route(ServerHost, From, To, Packet) ->
[{"category", "directory"},
{"type", "user"},
{"name",
- "vCard User Search"}],
+ translate:translate(Lang, "vCard User Search")}],
[]},
{xmlelement, "feature",
[{"var", ?NS_SEARCH}], []},