git-svn-id: http://redmine.rubyforge.org/svn/trunk@927 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/0.6.1
@@ -46,8 +46,7 @@ class User < ActiveRecord::Base | |||
validates_length_of :firstname, :lastname, :maximum => 30 | |||
validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true | |||
validates_length_of :mail, :maximum => 60, :allow_nil => true | |||
# Password length between 4 and 12 | |||
validates_length_of :password, :in => 4..12, :allow_nil => true | |||
validates_length_of :password, :minimum => 4, :allow_nil => true | |||
validates_confirmation_of :password, :allow_nil => true | |||
validates_associated :custom_values, :on => :update | |||
@@ -6,7 +6,7 @@ | |||
<div class="box tabular"> | |||
<p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'new_password', nil, :size => 25 %><br /> | |||
<em><%= l(:text_length_between, 4, 12) %></em></p> | |||
<em><%= l(:text_caracters_minimum, 4) %></em></p> | |||
<p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p> |
@@ -9,7 +9,8 @@ | |||
<%= text_field 'user', 'login', :size => 25 %></p> | |||
<p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'password', nil, :size => 25 %></p> | |||
<%= password_field_tag 'password', nil, :size => 25 %><br /> | |||
<em><%= l(:text_caracters_minimum, 4) %></em></p> | |||
<p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'password_confirmation', nil, :size => 25 %></p> |
@@ -9,7 +9,7 @@ | |||
<p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'new_password', nil, :size => 25 %><br /> | |||
<em><%= l(:text_length_between, 4, 12) %></em></p> | |||
<em><%= l(:text_caracters_minimum, 4) %></em></p> | |||
<p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label> | |||
<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p> |
@@ -24,7 +24,7 @@ | |||
<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>"> | |||
<p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label> | |||
<%= password_field_tag 'password', nil, :size => 25 %><br /> | |||
<em><%= l(:text_length_between, 4, 12) %></em></p> | |||
<em><%= l(:text_caracters_minimum, 4) %></em></p> | |||
<p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label> | |||
<%= password_field_tag 'password_confirmation', nil, :size => 25 %></p> | |||
</div> |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -507,6 +507,7 @@ text_tip_task_end_day: task ending this day | |||
text_tip_task_begin_end_day: task beginning and ending this day | |||
text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.' | |||
text_caracters_maximum: %d characters maximum. | |||
text_caracters_minimum: Must be at least %d characters long. | |||
text_length_between: Length between %d and %d characters. | |||
text_tracker_no_workflow: No workflow defined for this tracker | |||
text_unallowed_characters: Unallowed characters |
@@ -548,3 +548,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -507,6 +507,7 @@ text_tip_task_end_day: tâche finissant ce jour | |||
text_tip_task_begin_end_day: tâche commençant et finissant ce jour | |||
text_project_identifier_info: 'Lettres minuscules (a-z), chiffres et tirets autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.' | |||
text_caracters_maximum: %d caractères maximum. | |||
text_caracters_minimum: %d caractères minimum. | |||
text_length_between: Longueur comprise entre %d et %d caractères. | |||
text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker | |||
text_unallowed_characters: Caractères non autorisés |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatyczna aktywacja kont | |||
label_registration_manual_activation: manualna aktywacja kont | |||
notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora." | |||
field_time_zone: Strefa czasowa | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -545,3 +545,4 @@ label_registration_automatic_activation: автоматическая актив | |||
label_registration_manual_activation: активировать аккаунты вручную | |||
notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора." | |||
field_time_zone: Часовой пояс | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |
@@ -548,3 +548,4 @@ label_registration_automatic_activation: automatic account activation | |||
label_registration_manual_activation: manual account activation | |||
notice_account_pending: "Your account was created and is now pending administrator approval." | |||
field_time_zone: Time zone | |||
text_caracters_minimum: Must be at least %d characters long. |