From f841acb21f9ef3a65164cfce3601fb900920a751 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 24 Jul 2008 17:49:37 +0000
Subject: [PATCH] * src/mod_register.erl: When a registration is blocked due to
 IP limitation, return description in error stanza (EJAB-692)

SVN Revision: 1487
---
 ChangeLog            | 7 ++++++-
 src/mod_register.erl | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2909ae88d..8b4b8b9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2008-07-23  Christophe Romain  <christophe.romain@process-one.net>
+2008-07-24  Badlop  <badlop@process-one.net>
+
+	* src/mod_register.erl: When a registration is blocked due to IP
+	limitation, return description in error stanza (EJAB-692)
+	
+2008-07-24  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own
 	node (EJAB-705)
diff --git a/src/mod_register.erl b/src/mod_register.erl
index a936ea5e1..89afb8bc4 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -167,7 +167,7 @@ process_iq(From, To,
 			    IQ#iq{type = result, sub_el = [SubEl]};
 			_ ->
 			    case try_register(User, Server, Password,
-					      Source) of
+					      Source, Lang) of
 				ok ->
 				    IQ#iq{type = result, sub_el = [SubEl]};
 				{error, Error} ->
@@ -195,7 +195,7 @@ process_iq(From, To,
     end.
 
 
-try_register(User, Server, Password, Source) ->
+try_register(User, Server, Password, Source, Lang) ->
     case jlib:is_nodename(User) of
 	false ->
 	    {error, ?ERR_BAD_REQUEST};
@@ -229,7 +229,9 @@ try_register(User, Server, Password, Source) ->
 				    end
 			    end;
 			false ->
-			    {error, ?ERR_RESOURCE_CONSTRAINT}
+			    ErrText = "Users are not allowed to register "
+				"accounts so fast",
+			    {error, ?ERRT_RESOURCE_CONSTRAINT(Lang, ErrText)}
 		    end
 	    end
     end.