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

Merge some old English fixes from trunk SVN.

Browse Source 
SVN Revision: 2505
This commit is contained in:
Badlop 2009-08-19 17:59:49 +00:00
parent 007cafa7cd
commit 05755b9b09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_muc/mod_muc_room.erl
View File

@ -1584,7 +1584,7 @@ add_new_user(From, Nick, Packet, StateData) ->
NewState#state{robots = Robots} NewState#state{robots = Robots}
end; end;
nopass -> nopass ->
ErrText = "The password is required to enter this room", ErrText = "A password is required to enter this room",
Err = exmpp_stanza:reply_with_error( Err = exmpp_stanza:reply_with_error(
Packet, ?ERR(Packet, 'not-authorized', Lang, ErrText)), Packet, ?ERR(Packet, 'not-authorized', Lang, ErrText)),
ejabberd_router:route( % TODO: s/Nick/""/ ejabberd_router:route( % TODO: s/Nick/""/

8
src/web/ejabberd_web_admin.erl
View File

@ -1964,8 +1964,8 @@ get_node(global, Node, ["db"], Query, Lang) ->
[?XE('tr', [?XE('tr',
[?XCT('td', "Name"), [?XCT('td', "Name"),
?XCT('td', "Storage Type"), ?XCT('td', "Storage Type"),
?XCT('td', "Size"), ?XCT('td', "Elements"), %% Elements/items/records inserted in the table
?XCT('td', "Memory") ?XCT('td', "Memory") %% Words or Bytes allocated to the table on this node
])]), ])]),
?XE('tbody', ?XE('tbody',
Rows ++ Rows ++
@ -2043,7 +2043,7 @@ get_node(global, Node, ["backup"], Query, Lang) ->
]), ]),
?XE("tr", ?XE("tr",
[?XE("td", [?CT("Export data of users in a host to PIEFXIS files (XEP-0277):"), [?XE("td", [?CT("Export data of users in a host to PIEFXIS files (XEP-0277):"),
?CT(" "), ?C(" "),
?INPUT("text", "export_piefxis_host_dirhost", ?MYNAME)]), ?INPUT("text", "export_piefxis_host_dirhost", ?MYNAME)]),
?XE("td", [?INPUT("text", "export_piefxis_host_dirpath", HomeDir)]), ?XE("td", [?INPUT("text", "export_piefxis_host_dirpath", HomeDir)]),
?XE("td", [?INPUTT("submit", "export_piefxis_host_dir", ?XE("td", [?INPUTT("submit", "export_piefxis_host_dir",
@ -2383,7 +2383,7 @@ node_ports_to_xhtml(Ports, Lang) ->
[?XE('tr', [?XE('tr',
[?XCT('td', "Port"), [?XCT('td', "Port"),
?XCT('td', "IP"), ?XCT('td', "IP"),
?XCT('td', "Prot"), ?XCT('td', "Protocol"),
?XCT('td', "Module"), ?XCT('td', "Module"),
?XCT('td', "Options") ?XCT('td', "Options")
])]), ])]),