jro_apps/redmine Commit - r397:791077c240f7

0

app/models/project.rb +3 -1

                validates_uniqueness_of :name, :identifier
                validates_associated :custom_values, :on => :update
                validates_associated :repository, :wiki
+               validates_length_of :name, :maximum => 30
                validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-               validates_length_of :identifier, :maximum => 12
+               validates_length_of :description, :maximum => 255
+               validates_length_of :identifier, :in => 3..12
                validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
                def identifier=(identifier)

0

app/models/user.rb +4 -1

                validates_presence_of :login, :firstname, :lastname, :mail
                validates_uniqueness_of :login, :mail
                # Login must contain lettres, numbers, underscores only
-               validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
                validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
+               validates_length_of :login, :maximum => 30
+               validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
+               validates_length_of :firstname, :lastname, :maximum => 30
                validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+               validates_length_of :mail, :maximum => 60
                # Password length between 4 and 12
                validates_length_of :password, :in => 4..12, :allow_nil => true
                validates_confirmation_of :password, :allow_nil => true

0

app/views/account/password_recovery.rhtml +2 -1

                <% form_tag({:token => @token.value}, :class => "tabular") do %>
                <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
+               <%= password_field_tag 'new_password', nil, :size => 25 %><br />
+               <em><%= l(:text_length_between, 4, 12) %></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>

0

app/views/my/account.rhtml +2 -1

                <%= password_field_tag 'password', nil, :size => 25 %></p>
                <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
+               <%= password_field_tag 'new_password', nil, :size => 25 %><br />
+               <em><%= l(:text_length_between, 4, 12) %></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>

0

app/views/projects/_form.rhtml +3 -3

              <div class="box">
              <!--[form:project]-->
-             <p><%= f.text_field :name, :required => true %></p>
+             <p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
              <% if admin_loggedin? and !@root_projects.empty? %>
                  <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p>
              <% end %>
-             <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %></p>
-             <p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
+             <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %><br /><em><%= l(:text_caracters_maximum, 255) %></em></p>
+             <p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
              <p><%= f.text_field :homepage, :size => 40 %></p>
              <p><%= f.check_box :is_public %></p>

0

app/views/users/_form.rhtml +2 -1

              <p><%= f.select :auth_source_id, [[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] } %></p>
              <% end %>
              <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_length_between, 4, 12) %></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>

0

lang/de.yml +3 -1

              text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt
              text_tip_task_end_day: Aufgabe, die an diesem Tag beendet
              text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und beendet
-             text_project_identifier_info: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: Manager
              default_role_developper: Developer

0

lang/en.yml +3 -1

              text_tip_task_begin_day: task beginning this day
              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: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: Manager
              default_role_developper: Developer

0

lang/es.yml +3 -1

              text_tip_task_begin_day: tarea que comienza este día
              text_tip_task_end_day: tarea que termina este día
              text_tip_task_begin_end_day: tarea que comienza y termina este día
-             text_project_identifier_info: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: Manager
              default_role_developper: Desarrollador

0

lang/fr.yml +3 -1

              text_tip_task_begin_day: tâche commençant ce jour
              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: '12 caractères maximum. Lettres (a-z), chiffres (0-9) et tirets autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
+             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_length_between: Longueur comprise entre %d et %d caractères.
              default_role_manager: Manager
              default_role_developper: Développeur

0

lang/it.yml +3 -1

              text_tip_task_begin_day: task beginning this day
              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: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: Manager
              default_role_developper: Sviluppatore

0

lang/ja.yml +3 -1

              text_tip_task_begin_day: この日に開始するタスク
              text_tip_task_end_day: この日に終了するタスク
              text_tip_task_begin_end_day: この日のうちに開始して終了するタスク
-             text_project_identifier_info: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: 管理者
              default_role_developper: 開発者

0

lang/zh.yml +3 -1

              text_tip_task_begin_day: 开始于此
              text_tip_task_end_day: 在此结束
              text_tip_task_begin_end_day: 开始并结束于此
-             text_project_identifier_info: '12 characters maximum. Letters (a-z), numbers (0-9) and dashes allowed.<br />Once saved, the identifier can not be changed.'
+             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_length_between: Length between %d and %d characters.
              default_role_manager: 管理员
              default_role_developper: 开发人员

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages