Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Bugfix: mod_announce.erl:get_title/2 now accepts node argument in binary() or list() format.

Browse Source 
SVN Revision: 1887
This commit is contained in:
Pablo Polvorin 2009-02-18 18:14:06 +00:00
parent 7c10f3422a
commit 5334a2d965
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22,6 +22,9 @@
* src/ejabberd_sm.erl: Bugfix in get_user_info/3. * src/ejabberd_sm.erl: Bugfix in get_user_info/3.
* src/mod_announce.erl: get_title/2 accepts node argument in binary()
or list() format.
2009-02-13 Christophe Romain <christophe.romain@process-one.net> 2009-02-13 Christophe Romain <christophe.romain@process-one.net>
* src/ejabberd_auth.erl: prevent from calling * src/ejabberd_auth.erl: prevent from calling

25
src/mod_announce.erl
View File

@ -636,28 +636,29 @@ handle_adhoc_form(From, To,
%% command nodes. %% command nodes.
{error, 'internal-server-error'} {error, 'internal-server-error'}
end. end.
get_title(Lang, Node) when is_list(Node) ->
get_title(Lang, "announce") -> get_title(Lang, list_to_binary(Node));
get_title(Lang, <<"announce">>) ->
translate:translate(Lang, "Announcements"); translate:translate(Lang, "Announcements");
get_title(Lang, ?NS_ADMIN_s ++ "#announce-all") -> get_title(Lang, <<?NS_ADMIN_s, "#announce-all">>) ->
translate:translate(Lang, "Send announcement to all users"); translate:translate(Lang, "Send announcement to all users");
get_title(Lang, ?NS_ADMIN_s ++ "#announce-all-allhosts") -> get_title(Lang, <<?NS_ADMIN_s , "#announce-all-allhosts">>) ->
translate:translate(Lang, "Send announcement to all users on all hosts"); translate:translate(Lang, "Send announcement to all users on all hosts");
get_title(Lang, ?NS_ADMIN_s ++ "#announce") -> get_title(Lang, <<?NS_ADMIN_s , "#announce">>) ->
translate:translate(Lang, "Send announcement to all online users"); translate:translate(Lang, "Send announcement to all online users");
get_title(Lang, ?NS_ADMIN_s ++ "#announce-allhosts") -> get_title(Lang, <<?NS_ADMIN_s , "#announce-allhosts">>) ->
translate:translate(Lang, "Send announcement to all online users on all hosts"); translate:translate(Lang, "Send announcement to all online users on all hosts");
get_title(Lang, ?NS_ADMIN_s ++ "#set-motd") -> get_title(Lang, <<?NS_ADMIN_s , "#set-motd">>) ->
translate:translate(Lang, "Set message of the day and send to online users"); translate:translate(Lang, "Set message of the day and send to online users");
get_title(Lang, ?NS_ADMIN_s ++ "#set-motd-allhosts") -> get_title(Lang, <<?NS_ADMIN_s , "#set-motd-allhosts">>) ->
translate:translate(Lang, "Set message of the day on all hosts and send to online users"); translate:translate(Lang, "Set message of the day on all hosts and send to online users");
get_title(Lang, ?NS_ADMIN_s ++ "#edit-motd") -> get_title(Lang, <<?NS_ADMIN_s , "#edit-motd">>) ->
translate:translate(Lang, "Update message of the day (don't send)"); translate:translate(Lang, "Update message of the day (don't send)");
get_title(Lang, ?NS_ADMIN_s ++ "#edit-motd-allhosts") -> get_title(Lang, <<?NS_ADMIN_s , "#edit-motd-allhosts">>) ->
translate:translate(Lang, "Update message of the day on all hosts (don't send)"); translate:translate(Lang, "Update message of the day on all hosts (don't send)");
get_title(Lang, ?NS_ADMIN_s ++ "#delete-motd") -> get_title(Lang, <<?NS_ADMIN_s , "#delete-motd">>) ->
translate:translate(Lang, "Delete message of the day"); translate:translate(Lang, "Delete message of the day");
get_title(Lang, ?NS_ADMIN_s ++ "#delete-motd-allhosts") -> get_title(Lang, <<?NS_ADMIN_s , "#delete-motd-allhosts">>) ->
translate:translate(Lang, "Delete message of the day on all hosts"). translate:translate(Lang, "Delete message of the day on all hosts").
%%------------------------------------------------------------------------- %%-------------------------------------------------------------------------