Resolved issue 0000489: Mail address obligatory

git-svn-id: http://piwigo.org/svn/trunk@2032 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 5 insertions, 2 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 47d3c2137..1b026ae72 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -616,4 +616,5 @@ $lang['display_thumbnail_hoverbox'] = 'Hoverbox display';
 $lang['Thumbnails'] = 'Thumbnails';
 $lang['Guest cannot be deleted'] = 'Guest cannot be deleted';
 $lang['Default user cannot be deleted'] = 'Default user cannot be deleted';
+$lang['obligatory_user_mail_address'] = 'Mail address is obligatory for all users';
 ?>
diff --git a/language/en_UK.iso-8859-1/help/configuration.html b/language/en_UK.iso-8859-1/help/configuration.html
index 6dc4c67bc..4f658173d 100644
--- a/language/en_UK.iso-8859-1/help/configuration.html
+++ b/language/en_UK.iso-8859-1/help/configuration.html
@@ -24,6 +24,10 @@ page.</li>
   maintenance. Only administrator users will be able to reach the
   gallery.</li>
 
+  <li><strong>Allow user registration</strong>: Registration is free for all.</li>
+
+  <li><strong>Mail address is obligatory for all users</strong>: Mail address will checked on registration or profile update except if the action is done on administration part.</li>
+
   <li><strong>Rating</strong>: Picture rating feature is enabled.</li>
 
   <li><strong>Rating by guests</strong>: Even non registered users can
@@ -31,8 +35,6 @@ rate images.</li>
 
   <li><strong>Email admins when a new user registers</strong>: Administrators will be received mail for each registration.</li>
 
-  <li><strong>Allow user registration</strong>: Registration is free for all.</li>
-
   <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
 
 </ul>