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