jro_apps/redmine Commit - r11716:4bd874ab46c3

Adds a way for a registered user to get a new action email (#14228)....

Jean-Philippe Lang -

r11716:4bd874ab46c3

parent child

Context file:

r11716:4bd874ab46c3

Collapse all files

app/controllers/account_controller.rb +48 -9

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required
               # Login request and validation
               def login
                 if request.get?
                   if User.current.logged?
                     redirect_to home_url
                   end
                 else
                   authenticate_user
                 end
               rescue AuthSourceException => e
                 logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
                 render_error :message => e.message
               end
               # Log out current user and redirect to welcome page
               def logout
                 if User.current.anonymous?
                   redirect_to home_url
                 elsif request.post?
                   logout_user
                   redirect_to home_url
                 end
                 # display the logout form
               end
               # Lets user choose a new password
               def lost_password
                 (redirect_to(home_url); return) unless Setting.lost_password?
                 if params[:token]
                   @token = Token.find_token("recovery", params[:token].to_s)
                   if @token.nil? || @token.expired?
                     redirect_to home_url
                     return
                   end
                   @user = @token.user
                   unless @user && @user.active?
                     redirect_to home_url
                     return
                   end
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to signin_path
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail].to_s)
-                    # user not found or not active
+                    # user not found
-                    unless user && user.active?
+                    unless user
                       flash.now[:error] = l(:notice_account_unknown_email)
                       return
                     end
+                    unless user.active?
+                      handle_inactive_user(user, lost_password_path)
+                      return
+                    end
                     # user cannot change its password
                     unless user.change_password_allowed?
                       flash.now[:error] = l(:notice_can_t_change_password)
                       return
                     end
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
                       Mailer.lost_password(token).deliver
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to signin_path
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
                 if request.get?
                   session[:auth_source_registration] = nil
                   @user = User.new(:language => current_language.to_s)
                 else
                   user_params = params[:user] || {}
                   @user = User.new
                   @user.safe_attributes = user_params
                   @user.admin = false
                   @user.register
                   if session[:auth_source_registration]
                     @user.activate
                     @user.login = session[:auth_source_registration][:login]
                     @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
                     if @user.save
                       session[:auth_source_registration] = nil
                       self.logged_user = @user
                       flash[:notice] = l(:notice_account_activated)
                       redirect_to my_account_path
                     end
                   else
                     @user.login = params[:user][:login]
                     unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
                       @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
                     end
                     case Setting.self_registration
                     when '1'
                       register_by_email_activation(@user)
                     when '3'
                       register_automatically(@user)
                     else
                       register_manually_by_administrator(@user)
                     end
                   end
                 end
               end
               # Token based account activation
               def activate
                 (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?
                 token = Token.find_token('register', params[:token].to_s)
                 (redirect_to(home_url); return) unless token and !token.expired?
                 user = token.user
                 (redirect_to(home_url); return) unless user.registered?
                 user.activate
                 if user.save
                   token.destroy
                   flash[:notice] = l(:notice_account_activated)
                 end
                 redirect_to signin_path
               end
+              # Sends a new account activation email
+              def activation_email
+                if session[:registered_user_id] && Setting.self_registration == '1'
+                  user_id = session.delete(:registered_user_id).to_i
+                  user = User.find_by_id(user_id)
+                  if user && user.registered?
+                    register_by_email_activation(user)
+                    return
+                  end
+                end
+                redirect_to(home_url)
+              end
               private
               def authenticate_user
                 if Setting.openid? && using_open_id?
                   open_id_authenticate(params[:openid_url])
                 else
                   password_authentication
                 end
               end
               def password_authentication
-                user = User.try_to_login(params[:username], params[:password])
+                user = User.try_to_login(params[:username], params[:password], false)
                 if user.nil?
                   invalid_credentials
                 elsif user.new_record?
                   onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
                 else
                   # Valid user
-                  successful_authentication(user)
+                  if user.active?
+                    successful_authentication(user)
+                  else
+                    handle_inactive_user(user)
+                  end
                 end
               end
               def open_id_authenticate(openid_url)
                 back_url = signin_url(:autologin => params[:autologin])
                 authenticate_with_open_id(
                       openid_url, :required => [:nickname, :fullname, :email],
                       :return_to => back_url, :method => :post
                 ) do |result, identity_url, registration|
                   if result.successful?
                     user = User.find_or_initialize_by_identity_url(identity_url)
                     if user.new_record?
                       # Self-registration off
                       (redirect_to(home_url); return) unless Setting.self_registration?
                       # Create on the fly
                       user.login = registration['nickname'] unless registration['nickname'].nil?
                       user.mail = registration['email'] unless registration['email'].nil?
                       user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
                       user.random_password
                       user.register
                       case Setting.self_registration
                       when '1'
                         register_by_email_activation(user) do
                           onthefly_creation_failed(user)
                         end
                       when '3'
                         register_automatically(user) do
                           onthefly_creation_failed(user)
                         end
                       else
                         register_manually_by_administrator(user) do
                           onthefly_creation_failed(user)
                         end
                       end
                     else
                       # Existing record
                       if user.active?
                         successful_authentication(user)
                       else
-                        account_pending
+                        handle_inactive_user(user)
                       end
                     end
                   end
                 end
               end
               def successful_authentication(user)
                 logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
                 # Valid user
                 self.logged_user = user
                 # generate a key and set cookie if autologin
                 if params[:autologin] && Setting.autologin?
                   set_autologin_cookie(user)
                 end
                 call_hook(:controller_account_success_authentication_after, {:user => user })
                 redirect_back_or_default my_page_path
               end
               def set_autologin_cookie(user)
                 token = Token.create(:user => user, :action => 'autologin')
                 cookie_options = {
                   :value => token.value,
                   :expires => 1.year.from_now,
                   :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
                   :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
                   :httponly => true
                 }
                 cookies[autologin_cookie_name] = cookie_options
               end
               # Onthefly creation failed, display the registration form to fill/fix attributes
               def onthefly_creation_failed(user, auth_source_options = { })
                 @user = user
                 session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
                 render :action => 'register'
               end
               def invalid_credentials
                 logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
                 flash.now[:error] = l(:notice_account_invalid_creditentials)
               end
               # Register a user for email activation.
               #
               # Pass a block for behavior when a user fails to save
               def register_by_email_activation(user, &block)
                 token = Token.new(:user => user, :action => "register")
                 if user.save and token.save
                   Mailer.register(token).deliver
                   flash[:notice] = l(:notice_account_register_done)
                   redirect_to signin_path
                 else
                   yield if block_given?
                 end
               end
               # Automatically register a user
               #
               # Pass a block for behavior when a user fails to save
               def register_automatically(user, &block)
                 # Automatic activation
                 user.activate
                 user.last_login_on = Time.now
                 if user.save
                   self.logged_user = user
                   flash[:notice] = l(:notice_account_activated)
                   redirect_to my_account_path
                 else
                   yield if block_given?
                 end
               end
               # Manual activation by the administrator
               #
               # Pass a block for behavior when a user fails to save
               def register_manually_by_administrator(user, &block)
                 if user.save
                   # Sends an email to the administrators
                   Mailer.account_activation_request(user).deliver
-                  account_pending
+                  account_pending(user)
                 else
                   yield if block_given?
                 end
               end
-              def account_pending
+              def handle_inactive_user(user, redirect_path=signin_path)
-                flash[:notice] = l(:notice_account_pending)
+                if user.registered?
-                redirect_to signin_path
+                  account_pending(user, redirect_path)
+                else
+                  account_locked(user, redirect_path)
+                end
+              end
+              def account_pending(user, redirect_path=signin_path)
+                if Setting.self_registration == '1'
+                  flash[:error] = l(:notice_account_not_activated_yet, :url => activation_email_path)
+                  session[:registered_user_id] = user.id
+                else
+                  flash[:error] = l(:notice_account_pending)
+                end
+                redirect_to redirect_path
+              end
+              def account_locked(user, redirect_path=signin_path)
+                flash[:error] = l(:notice_account_locked)
+                redirect_to redirect_path
               end
             end

app/models/user.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/sha1"
             class User < Principal
               include Redmine::SafeAttributes
               # Different ways of displaying/sorting users
               USER_FORMATS = {
                 :firstname_lastname => {
                     :string => '#{firstname} #{lastname}',
                     :order => %w(firstname lastname id),
                     :setting_order => 1
                   },
                 :firstname_lastinitial => {
                     :string => '#{firstname} #{lastname.to_s.chars.first}.',
                     :order => %w(firstname lastname id),
                     :setting_order => 2
                   },
                 :firstname => {
                     :string => '#{firstname}',
                     :order => %w(firstname id),
                     :setting_order => 3
                   },
                 :lastname_firstname => {
                     :string => '#{lastname} #{firstname}',
                     :order => %w(lastname firstname id),
                     :setting_order => 4
                   },
                 :lastname_coma_firstname => {
                     :string => '#{lastname}, #{firstname}',
                     :order => %w(lastname firstname id),
                     :setting_order => 5
                   },
                 :lastname => {
                     :string => '#{lastname}',
                     :order => %w(lastname id),
                     :setting_order => 6
                   },
                 :username => {
                     :string => '#{login}',
                     :order => %w(login id),
                     :setting_order => 7
                   },
               }
               MAIL_NOTIFICATION_OPTIONS = [
                 ['all', :label_user_mail_option_all],
                 ['selected', :label_user_mail_option_selected],
                 ['only_my_events', :label_user_mail_option_only_my_events],
                 ['only_assigned', :label_user_mail_option_only_assigned],
                 ['only_owner', :label_user_mail_option_only_owner],
                 ['none', :label_user_mail_option_none]
               ]
               has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                                :after_remove => Proc.new {|user, group| group.user_removed(user)}
               has_many :changesets, :dependent => :nullify
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
               has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
               belongs_to :auth_source
               scope :logged, lambda { where("#{User.table_name}.status <> #{STATUS_ANONYMOUS}") }
               scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
               acts_as_customizable
               attr_accessor :password, :password_confirmation, :generate_password
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               LOGIN_LENGTH_LIMIT = 60
               MAIL_LENGTH_LIMIT = 60
               validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
               validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
               validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false
               # Login must contain letters, numbers, underscores only
               validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
               validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
               validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
               validate :validate_password_length
               before_create :set_mail_notification
               before_save   :generate_password_if_needed, :update_hashed_password
               before_destroy :remove_references_before_destroy
               after_save :update_notified_project_ids
               scope :in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
               scope :not_in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
               scope :sorted, lambda { order(*User.fields_for_order_statement)}
               def set_mail_notification
                 self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
                 true
               end
               def update_hashed_password
                 # update hashed_password if password was set
                 if self.password && self.auth_source_id.blank?
                   salt_password(password)
                 end
               end
               alias :base_reload :reload
               def reload(*args)
                 @name = nil
                 @projects_by_role = nil
                 @membership_by_project_id = nil
                 @notified_projects_ids = nil
                 @notified_projects_ids_changed = false
                 base_reload(*args)
               end
               def mail=(arg)
                 write_attribute(:mail, arg.to_s.strip)
               end
               def identity_url=(url)
                 if url.blank?
                   write_attribute(:identity_url, '')
                 else
                   begin
                     write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
                   rescue OpenIdAuthentication::InvalidOpenId
                     # Invalid url, don't save
                   end
                 end
                 self.read_attribute(:identity_url)
               end
               # Returns the user that matches provided login and password, or nil
-              def self.try_to_login(login, password)
+              def self.try_to_login(login, password, active_only=true)
                 login = login.to_s
                 password = password.to_s
                 # Make sure no one can sign in with an empty login or password
                 return nil if login.empty? || password.empty?
                 user = find_by_login(login)
                 if user
                   # user is already in local database
-                  return nil unless user.active?
                   return nil unless user.check_password?(password)
+                  return nil if !user.active? && active_only
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     user = new(attrs)
                     user.login = login
                     user.language = Setting.default_language
                     if user.save
                       user.reload
                       logger.info("User '#{user.login}' created from external auth source: #{user.auth_source.type} - #{user.auth_source.name}") if logger && user.auth_source
                     end
                   end
                 end
-                user.update_column(:last_login_on, Time.now) if user && !user.new_record?
+                user.update_column(:last_login_on, Time.now) if user && !user.new_record? && user.active?
                 user
               rescue => text
                 raise text
               end
               # Returns the user who matches the given autologin +key+ or nil
               def self.try_to_autologin(key)
                 user = Token.find_active_user('autologin', key, Setting.autologin.to_i)
                 if user
                   user.update_column(:last_login_on, Time.now)
                   user
                 end
               end
               def self.name_formatter(formatter = nil)
                 USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]
               end
               # Returns an array of fields names than can be used to make an order statement for users
               # according to how user names are displayed
               # Examples:
               #
               #   User.fields_for_order_statement              => ['users.login', 'users.id']
               #   User.fields_for_order_statement('authors')   => ['authors.login', 'authors.id']
               def self.fields_for_order_statement(table=nil)
                 table ||= table_name
                 name_formatter[:order].map {|field| "#{table}.#{field}"}
               end
               # Return user's full name for display
               def name(formatter = nil)
                 f = self.class.name_formatter(formatter)
                 if formatter
                   eval('"' + f[:string] + '"')
                 else
                   @name ||= eval('"' + f[:string] + '"')
                 end
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def activate
                 self.status = STATUS_ACTIVE
               end
               def register
                 self.status = STATUS_REGISTERED
               end
               def lock
                 self.status = STATUS_LOCKED
               end
               def activate!
                 update_attribute(:status, STATUS_ACTIVE)
               end
               def register!
                 update_attribute(:status, STATUS_REGISTERED)
               end
               def lock!
                 update_attribute(:status, STATUS_LOCKED)
               end
               # Returns true if +clear_password+ is the correct user's password, otherwise false
               def check_password?(clear_password)
                 if auth_source_id.present?
                   auth_source.authenticate(self.login, clear_password)
                 else
                   User.hash_password("#{salt}#{User.hash_password clear_password}") == hashed_password
                 end
               end
               # Generates a random salt and computes hashed_password for +clear_password+
               # The hashed password is stored in the following form: SHA1(salt + SHA1(password))
               def salt_password(clear_password)
                 self.salt = User.generate_salt
                 self.hashed_password = User.hash_password("#{salt}#{User.hash_password clear_password}")
               end
               # Does the backend storage allow this user to change their password?
               def change_password_allowed?
                 return true if auth_source.nil?
                 return auth_source.allow_password_changes?
               end
               def generate_password?
                 generate_password == '1' || generate_password == true
               end
               # Generate and set a random password on given length
               def random_password(length=40)
                 chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
                 chars -= %w(0 O 1 l)
                 password = ''
                 length.times {|i| password << chars[SecureRandom.random_number(chars.size)] }
                 self.password = password
                 self.password_confirmation = password
                 self
               end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end
               def time_zone
                 @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
               end
               def wants_comments_in_reverse_order?
                 self.pref[:comments_sorting] == 'desc'
               end
               # Return user's RSS key (a 40 chars long string), used to access feeds
               def rss_key
                 if rss_token.nil?
                   create_rss_token(:action => 'feeds')
                 end
                 rss_token.value
               end
               # Return user's API key (a 40 chars long string), used to access the API
               def api_key
                 if api_token.nil?
                   create_api_token(:action => 'api')
                 end
                 api_token.value
               end
               # Return an array of project ids for which the user has explicitly turned mail notifications on
               def notified_projects_ids
                 @notified_projects_ids ||= memberships.select {|m| m.mail_notification?}.collect(&:project_id)
               end
               def notified_project_ids=(ids)
                 @notified_projects_ids_changed = true
                 @notified_projects_ids = ids
               end
               # Updates per project notifications (after_save callback)
               def update_notified_project_ids
                 if @notified_projects_ids_changed
                   ids = (mail_notification == 'selected' ? Array.wrap(notified_projects_ids).reject(&:blank?) : [])
                   members.update_all(:mail_notification => false)
                   members.where(:project_id => ids).update_all(:mail_notification => true) if ids.any?
                 end
               end
               private :update_notified_project_ids
               def valid_notification_options
                 self.class.valid_notification_options(self)
               end
               # Only users that belong to more than 1 project can select projects for which they are notified
               def self.valid_notification_options(user=nil)
                 # Note that @user.membership.size would fail since AR ignores
                 # :include association option when doing a count
                 if user.nil? || user.memberships.length < 1
                   MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'}
                 else
                   MAIL_NOTIFICATION_OPTIONS
                 end
               end
               # Find a user account by matching the exact login and then a case-insensitive
               # version.  Exact matches will be given priority.
               def self.find_by_login(login)
                 if login.present?
                   login = login.to_s
                   # First look for an exact match
                   user = where(:login => login).all.detect {|u| u.login == login}
                   unless user
                     # Fail over to case-insensitive if none was found
                     user = where("LOWER(login) = ?", login.downcase).first
                   end
                   user
                 end
               end
               def self.find_by_rss_key(key)
                 Token.find_active_user('feeds', key)
               end
               def self.find_by_api_key(key)
                 Token.find_active_user('api', key)
               end
               # Makes find_by_mail case-insensitive
               def self.find_by_mail(mail)
                 where("LOWER(mail) = ?", mail.to_s.downcase).first
               end
               # Returns true if the default admin account can no longer be used
               def self.default_admin_account_changed?
                 !User.active.find_by_login("admin").try(:check_password?, "admin")
               end
               def to_s
                 name
               end
               CSS_CLASS_BY_STATUS = {
                 STATUS_ANONYMOUS  => 'anon',
                 STATUS_ACTIVE     => 'active',
                 STATUS_REGISTERED => 'registered',
                 STATUS_LOCKED     => 'locked'
               }
               def css_classes
                 "user #{CSS_CLASS_BY_STATUS[status]}"
               end
               # Returns the current day according to user's time zone
               def today
                 if time_zone.nil?
                   Date.today
                 else
                   Time.now.in_time_zone(time_zone).to_date
                 end
               end
               # Returns the day of +time+ according to user's time zone
               def time_to_date(time)
                 if time_zone.nil?
                   time.to_date
                 else
                   time.in_time_zone(time_zone).to_date
                 end
               end
               def logged?
                 true
               end
               def anonymous?
                 !logged?
               end
               # Returns user's membership for the given project
               # or nil if the user is not a member of project
               def membership(project)
                 project_id = project.is_a?(Project) ? project.id : project
                 @membership_by_project_id ||= Hash.new {|h, project_id|
                   h[project_id] = memberships.where(:project_id => project_id).first
                 }
                 @membership_by_project_id[project_id]
               end
               # Return user's roles for project
               def roles_for_project(project)
                 roles = []
                 # No role on archived projects
                 return roles if project.nil? || project.archived?
                 if logged?
                   # Find project membership
                   membership = membership(project)
                   if membership
                     roles = membership.roles
                   else
                     @role_non_member ||= Role.non_member
                     roles << @role_non_member
                   end
                 else
                   @role_anonymous ||= Role.anonymous
                   roles << @role_anonymous
                 end
                 roles
               end
               # Return true if the user is a member of project
               def member_of?(project)
                 projects.to_a.include?(project)
               end
               # Returns a hash of user's projects grouped by roles
               def projects_by_role
                 return @projects_by_role if @projects_by_role
                 @projects_by_role = Hash.new([])
                 memberships.each do |membership|
                   if membership.project
                     membership.roles.each do |role|
                       @projects_by_role[role] = [] unless @projects_by_role.key?(role)
                       @projects_by_role[role] << membership.project
                     end
                   end
                 end
                 @projects_by_role.each do |role, projects|
                   projects.uniq!
                 end
                 @projects_by_role
               end
               # Returns true if user is arg or belongs to arg
               def is_or_belongs_to?(arg)
                 if arg.is_a?(User)
                   self == arg
                 elsif arg.is_a?(Group)
                   arg.users.include?(self)
                 else
                   false
                 end
               end
               # Return true if the user is allowed to do the specified action on a specific context
               # Action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               # Context can be:
               # * a project : returns true if user is allowed to do the specified action on this project
               # * an array of projects : returns true if user is allowed on every project
               # * nil with options[:global] set : check if user has at least one role allowed for this action,
               #   or falls back to Non Member / Anonymous permissions depending if the user is logged
               def allowed_to?(action, context, options={}, &block)
                 if context && context.is_a?(Project)
                   return false unless context.allows_to?(action)
                   # Admin users are authorized for anything else
                   return true if admin?
                   roles = roles_for_project(context)
                   return false unless roles
                   roles.any? {|role|
                     (context.is_public? || role.member?) &&
                     role.allowed_to?(action) &&
                     (block_given? ? yield(role, self) : true)
                   }
                 elsif context && context.is_a?(Array)
                   if context.empty?
                     false
                   else
                     # Authorize if user is authorized on every element of the array
                     context.map {|project| allowed_to?(action, project, options, &block)}.reduce(:&)
                   end
                 elsif options[:global]
                   # Admin users are always authorized
                   return true if admin?
                   # authorize if user has at least one role that has this permission
                   roles = memberships.collect {|m| m.roles}.flatten.uniq
                   roles << (self.logged? ? Role.non_member : Role.anonymous)
                   roles.any? {|role|
                     role.allowed_to?(action) &&
                     (block_given? ? yield(role, self) : true)
                   }
                 else
                   false
                 end
               end
               # Is the user allowed to do the specified action on any project?
               # See allowed_to? for the actions and valid options.
               def allowed_to_globally?(action, options, &block)
                 allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
               end
               # Returns true if the user is allowed to delete his own account
               def own_account_deletable?
                 Setting.unsubscribe? &&
                   (!admin? || User.active.where("admin = ? AND id <> ?", true, id).exists?)
               end
               safe_attributes 'login',
                 'firstname',
                 'lastname',
                 'mail',
                 'mail_notification',
                 'notified_project_ids',
                 'language',
                 'custom_field_values',
                 'custom_fields',
                 'identity_url'
               safe_attributes 'status',
                 'auth_source_id',
                 'generate_password',
                 :if => lambda {|user, current_user| current_user.admin?}
               safe_attributes 'group_ids',
                 :if => lambda {|user, current_user| current_user.admin? && !user.new_record?}
               # Utility method to help check if a user should be notified about an
               # event.
               #
               # TODO: only supports Issue events currently
               def notify_about?(object)
                 if mail_notification == 'all'
                   true
                 elsif mail_notification.blank? || mail_notification == 'none'
                   false
                 else
                   case object
                   when Issue
                     case mail_notification
                     when 'selected', 'only_my_events'
                       # user receives notifications for created/assigned issues on unselected projects
                       object.author == self || is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)
                     when 'only_assigned'
                       is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)
                     when 'only_owner'
                       object.author == self
                     end
                   when News
                     # always send to project members except when mail_notification is set to 'none'
                     true
                   end
                 end
               end
               def self.current=(user)
                 Thread.current[:current_user] = user
               end
               def self.current
                 Thread.current[:current_user] ||= User.anonymous
               end
               # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only
               # one anonymous user per database.
               def self.anonymous
                 anonymous_user = AnonymousUser.first
                 if anonymous_user.nil?
                   anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
                   raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
                 end
                 anonymous_user
               end
               # Salts all existing unsalted passwords
               # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
               # This method is used in the SaltPasswords migration and is to be kept as is
               def self.salt_unsalted_passwords!
                 transaction do
                   User.where("salt IS NULL OR salt = ''").find_each do |user|
                     next if user.hashed_password.blank?
                     salt = User.generate_salt
                     hashed_password = User.hash_password("#{salt}#{user.hashed_password}")
                     User.where(:id => user.id).update_all(:salt => salt, :hashed_password => hashed_password)
                   end
                 end
               end
               protected
               def validate_password_length
                 return if password.blank? && generate_password?
                 # Password length validation based on setting
                 if !password.nil? && password.size < Setting.password_min_length.to_i
                   errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
                 end
               end
               private
               def generate_password_if_needed
                 if generate_password? && auth_source.nil?
                   length = [Setting.password_min_length.to_i + 2, 10].max
                   random_password(length)
                 end
               end
               # Removes references that are not handled by associations
               # Things that are not deleted are reassociated with the anonymous user
               def remove_references_before_destroy
                 return if self.id.nil?
                 substitute = User.anonymous
                 Attachment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Comment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Issue.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
                 Journal.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 JournalDetail.update_all ['old_value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s]
                 JournalDetail.update_all ['value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s]
                 Message.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 News.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 # Remove private queries and keep public ones
                 ::Query.delete_all ['user_id = ? AND is_public = ?', id, false]
                 ::Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 TimeEntry.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 Token.delete_all ['user_id = ?', id]
                 Watcher.delete_all ['user_id = ?', id]
                 WikiContent.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 WikiContent::Version.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
               end
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
               # Returns a 128bits random salt as a hex string (32 chars long)
               def self.generate_salt
                 Redmine::Utils.random_hex(16)
               end
             end
             class AnonymousUser < User
               validate :validate_anonymous_uniqueness, :on => :create
               def validate_anonymous_uniqueness
                 # There should be only one AnonymousUser in the database
                 errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?
               end
               def available_custom_fields
                 []
               end
               # Overrides a few properties
               def logged?; false end
               def admin; false end
               def name(*args); I18n.t(:label_user_anonymous) end
               def mail; nil end
               def time_zone; nil end
               def rss_key; nil end
               def pref
                 UserPreference.new(:user => self)
               end
               def member_of?(project)
                 false
               end
               # Anonymous user can not be destroyed
               def destroy
                 false
               end
             end

config/locales/en.yml +2 0

             en:
               # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
               direction: ltr
               date:
                 formats:
                   # Use the strftime parameters for formats.
                   # When no format has been given, it uses default.
                   # You can provide other formats here if you like!
                   default: "%m/%d/%Y"
                   short: "%b %d"
                   long: "%B %d, %Y"
                 day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
                 abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
                 # Don't forget the nil at the beginning; there's no such thing as a 0th month
                 month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
                 abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
                 # Used in date_select and datime_select.
                 order:
                   - :year
                   - :month
                   - :day
               time:
                 formats:
                   default: "%m/%d/%Y %I:%M %p"
                   time: "%I:%M %p"
                   short: "%d %b %H:%M"
                   long: "%B %d, %Y %H:%M"
                 am: "am"
                 pm: "pm"
               datetime:
                 distance_in_words:
                   half_a_minute: "half a minute"
                   less_than_x_seconds:
                     one:   "less than 1 second"
                     other: "less than %{count} seconds"
                   x_seconds:
                     one:   "1 second"
                     other: "%{count} seconds"
                   less_than_x_minutes:
                     one:   "less than a minute"
                     other: "less than %{count} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "%{count} minutes"
                   about_x_hours:
                     one:   "about 1 hour"
                     other: "about %{count} hours"
                   x_hours:
                     one:   "1 hour"
                     other: "%{count} hours"
                   x_days:
                     one:   "1 day"
                     other: "%{count} days"
                   about_x_months:
                     one:   "about 1 month"
                     other: "about %{count} months"
                   x_months:
                     one:   "1 month"
                     other: "%{count} months"
                   about_x_years:
                     one:   "about 1 year"
                     other: "about %{count} years"
                   over_x_years:
                     one:   "over 1 year"
                     other: "over %{count} years"
                   almost_x_years:
                     one:   "almost 1 year"
                     other: "almost %{count} years"
               number:
                 format:
                   separator: "."
                   delimiter: ""
                   precision: 3
                 human:
                   format:
                     delimiter: ""
                     precision: 3
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "Byte"
                         other: "Bytes"
                       kb: "KB"
                       mb: "MB"
                       gb: "GB"
                       tb: "TB"
             # Used in array.to_sentence.
               support:
                 array:
                   sentence_connector: "and"
                   skip_last_comma: false
               activerecord:
                 errors:
                   template:
                     header:
                       one:    "1 error prohibited this %{model} from being saved"
                       other:  "%{count} errors prohibited this %{model} from being saved"
                   messages:
                     inclusion: "is not included in the list"
                     exclusion: "is reserved"
                     invalid: "is invalid"
                     confirmation: "doesn't match confirmation"
                     accepted: "must be accepted"
                     empty: "can't be empty"
                     blank: "can't be blank"
                     too_long: "is too long (maximum is %{count} characters)"
                     too_short: "is too short (minimum is %{count} characters)"
                     wrong_length: "is the wrong length (should be %{count} characters)"
                     taken: "has already been taken"
                     not_a_number: "is not a number"
                     not_a_date: "is not a valid date"
                     greater_than: "must be greater than %{count}"
                     greater_than_or_equal_to: "must be greater than or equal to %{count}"
                     equal_to: "must be equal to %{count}"
                     less_than: "must be less than %{count}"
                     less_than_or_equal_to: "must be less than or equal to %{count}"
                     odd: "must be odd"
                     even: "must be even"
                     greater_than_start_date: "must be greater than start date"
                     not_same_project: "doesn't belong to the same project"
                     circular_dependency: "This relation would create a circular dependency"
                     cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
                     earlier_than_minimum_start_date: "cannot be earlier than %{date} because of preceding issues"
               actionview_instancetag_blank_option: Please select
               general_text_No: 'No'
               general_text_Yes: 'Yes'
               general_text_no: 'no'
               general_text_yes: 'yes'
               general_lang_name: 'English'
               general_csv_separator: ','
               general_csv_decimal_separator: '.'
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: UTF-8
               general_first_day_of_week: '7'
               notice_account_updated: Account was successfully updated.
               notice_account_invalid_creditentials: Invalid user or password
               notice_account_password_updated: Password was successfully updated.
               notice_account_wrong_password: Wrong password
               notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
               notice_account_unknown_email: Unknown user.
+              notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
+              notice_account_locked: Your account is locked.
               notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
               notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
               notice_account_activated: Your account has been activated. You can now log in.
               notice_successful_create: Successful creation.
               notice_successful_update: Successful update.
               notice_successful_delete: Successful deletion.
               notice_successful_connection: Successful connection.
               notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
               notice_locking_conflict: Data has been updated by another user.
               notice_not_authorized: You are not authorized to access this page.
               notice_not_authorized_archived_project: The project you're trying to access has been archived.
               notice_email_sent: "An email was sent to %{value}"
               notice_email_error: "An error occurred while sending mail (%{value})"
               notice_feeds_access_key_reseted: Your Atom access key was reset.
               notice_api_access_key_reseted: Your API access key was reset.
               notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}."
               notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
               notice_failed_to_save_members: "Failed to save member(s): %{errors}."
               notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
               notice_unable_delete_time_entry: Unable to delete time log entry.
               notice_issue_done_ratios_updated: Issue done ratios updated.
               notice_gantt_chart_truncated: "The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})"
               notice_issue_successful_create: "Issue %{id} created."
               notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it."
               notice_account_deleted: "Your account has been permanently deleted."
               notice_user_successful_create: "User %{id} created."
               error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: %{value}"
               error_scm_annotate: "The entry does not exist or cannot be annotated."
               error_scm_annotate_big_text_file: "The entry cannot be annotated, as it exceeds the maximum text file size."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
               error_can_not_delete_custom_field: Unable to delete custom field
               error_can_not_delete_tracker: "This tracker contains issues and cannot be deleted."
               error_can_not_remove_role: "This role is in use and cannot be deleted."
               error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version cannot be reopened'
               error_can_not_archive_project: This project cannot be archived
               error_issue_done_ratios_not_updated: "Issue done ratios not updated."
               error_workflow_copy_source: 'Please select a source tracker or role'
               error_workflow_copy_target: 'Please select target tracker(s) and role(s)'
               error_unable_delete_issue_status: 'Unable to delete issue status'
               error_unable_to_connect: "Unable to connect (%{value})"
               error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
               error_session_expired: "Your session has expired. Please login again."
               warning_attachments_not_saved: "%{count} file(s) could not be saved."
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'
               mail_subject_register: "Your %{value} account activation"
               mail_body_register: 'To activate your account, click on the following link:'
               mail_body_account_information_external: "You can use your %{value} account to log in."
               mail_body_account_information: Your account information
               mail_subject_account_activation_request: "%{value} account activation request"
               mail_body_account_activation_request: "A new user (%{value}) has registered. The account is pending your approval:"
               mail_subject_reminder: "%{count} issue(s) due in the next %{days} days"
               mail_body_reminder: "%{count} issue(s) that are assigned to you are due in the next %{days} days:"
               mail_subject_wiki_content_added: "'%{id}' wiki page has been added"
               mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
               mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
               mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
               field_name: Name
               field_description: Description
               field_summary: Summary
               field_is_required: Required
               field_firstname: First name
               field_lastname: Last name
               field_mail: Email
               field_filename: File
               field_filesize: Size
               field_downloads: Downloads
               field_author: Author
               field_created_on: Created
               field_updated_on: Updated
               field_closed_on: Closed
               field_field_format: Format
               field_is_for_all: For all projects
               field_possible_values: Possible values
               field_regexp: Regular expression
               field_min_length: Minimum length
               field_max_length: Maximum length
               field_value: Value
               field_category: Category
               field_title: Title
               field_project: Project
               field_issue: Issue
               field_status: Status
               field_notes: Notes
               field_is_closed: Issue closed
               field_is_default: Default value
               field_tracker: Tracker
               field_subject: Subject
               field_due_date: Due date
               field_assigned_to: Assignee
               field_priority: Priority
               field_fixed_version: Target version
               field_user: User
               field_principal: Principal
               field_role: Role
               field_homepage: Homepage
               field_is_public: Public
               field_parent: Subproject of
               field_is_in_roadmap: Issues displayed in roadmap
               field_login: Login
               field_mail_notification: Email notifications
               field_admin: Administrator
               field_last_login_on: Last connection
               field_language: Language
               field_effective_date: Date
               field_password: Password
               field_new_password: New password
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Host
               field_port: Port
               field_account: Account
               field_base_dn: Base DN
               field_attr_login: Login attribute
               field_attr_firstname: Firstname attribute
               field_attr_lastname: Lastname attribute
               field_attr_mail: Email attribute
               field_onthefly: On-the-fly user creation
               field_start_date: Start date
               field_done_ratio: "% Done"
               field_auth_source: Authentication mode
               field_hide_mail: Hide my email address
               field_comments: Comment
               field_url: URL
               field_start_page: Start page
               field_subproject: Subproject
               field_hours: Hours
               field_activity: Activity
               field_spent_on: Date
               field_identifier: Identifier
               field_is_filter: Used as a filter
               field_issue_to: Related issue
               field_delay: Delay
               field_assignable: Issues can be assigned to this role
               field_redirect_existing_links: Redirect existing links
               field_estimated_hours: Estimated time
               field_column_names: Columns
               field_time_entries: Log time
               field_time_zone: Time zone
               field_searchable: Searchable
               field_default_value: Default value
               field_comments_sorting: Display comments
               field_parent_title: Parent page
               field_editable: Editable
               field_watcher: Watcher
               field_identity_url: OpenID URL
               field_content: Content
               field_group_by: Group results by
               field_sharing: Sharing
               field_parent_issue: Parent task
               field_member_of_group: "Assignee's group"
               field_assigned_to_role: "Assignee's role"
               field_text: Text field
               field_visible: Visible
               field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text"
               field_issues_visibility: Issues visibility
               field_is_private: Private
               field_commit_logs_encoding: Commit messages encoding
               field_scm_path_encoding: Path encoding
               field_path_to_repository: Path to repository
               field_root_directory: Root directory
               field_cvsroot: CVSROOT
               field_cvs_module: Module
               field_repository_is_default: Main repository
               field_multiple: Multiple values
               field_auth_source_ldap_filter: LDAP filter
               field_core_fields: Standard fields
               field_timeout: "Timeout (in seconds)"
               field_board_parent: Parent forum
               field_private_notes: Private notes
               field_inherit_members: Inherit members
               field_generate_password: Generate password
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle
               setting_welcome_text: Welcome text
               setting_default_language: Default language
               setting_login_required: Authentication required
               setting_self_registration: Self-registration
               setting_attachment_max_size: Maximum attachment size
               setting_issues_export_limit: Issues export limit
               setting_mail_from: Emission email address
               setting_bcc_recipients: Blind carbon copy recipients (bcc)
               setting_plain_text_mail: Plain text mail (no HTML)
               setting_host_name: Host name and path
               setting_text_formatting: Text formatting
               setting_wiki_compression: Wiki history compression
               setting_feeds_limit: Maximum number of items in Atom feeds
               setting_default_projects_public: New projects are public by default
               setting_autofetch_changesets: Fetch commits automatically
               setting_sys_api_enabled: Enable WS for repository management
               setting_commit_ref_keywords: Referencing keywords
               setting_commit_fix_keywords: Fixing keywords
               setting_autologin: Autologin
               setting_date_format: Date format
               setting_time_format: Time format
               setting_cross_project_issue_relations: Allow cross-project issue relations
               setting_cross_project_subtasks: Allow cross-project subtasks
               setting_issue_list_default_columns: Default columns displayed on the issue list
               setting_repositories_encodings: Attachments and repositories encodings
               setting_emails_header: Email header
               setting_emails_footer: Email footer
               setting_protocol: Protocol
               setting_per_page_options: Objects per page options
               setting_user_format: Users display format
               setting_activity_days_default: Days displayed on project activity
               setting_display_subprojects_issues: Display subprojects issues on main projects by default
               setting_enabled_scm: Enabled SCM
               setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
               setting_mail_handler_api_enabled: Enable WS for incoming emails
               setting_mail_handler_api_key: API key
               setting_sequential_project_identifiers: Generate sequential project identifiers
               setting_gravatar_enabled: Use Gravatar user icons
               setting_gravatar_default: Default Gravatar image
               setting_diff_max_lines_displayed: Maximum number of diff lines displayed
               setting_file_max_size_displayed: Maximum size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
               setting_password_min_length: Minimum password length
               setting_new_project_user_role_id: Role given to a non-admin user who creates a project
               setting_default_projects_modules: Default enabled modules for new projects
               setting_issue_done_ratio: Calculate the issue done ratio with
               setting_issue_done_ratio_issue_field: Use the issue field
               setting_issue_done_ratio_issue_status: Use the issue status
               setting_start_of_week: Start calendars on
               setting_rest_api_enabled: Enable REST web service
               setting_cache_formatted_text: Cache formatted text
               setting_default_notification_option: Default notification option
               setting_commit_logtime_enabled: Enable time logging
               setting_commit_logtime_activity_id: Activity for logged time
               setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
               setting_issue_group_assignment: Allow issue assignment to groups
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
               setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
               setting_unsubscribe: Allow users to delete their own account
               setting_session_lifetime: Session maximum lifetime
               setting_session_timeout: Session inactivity timeout
               setting_thumbnails_enabled: Display attachment thumbnails
               setting_thumbnails_size: Thumbnails size (in pixels)
               setting_non_working_week_days: Non-working days
               setting_jsonp_enabled: Enable JSONP support
               setting_default_projects_tracker_ids: Default trackers for new projects
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects
               permission_edit_project: Edit project
               permission_close_project: Close / reopen the project
               permission_select_project_modules: Select project modules
               permission_manage_members: Manage members
               permission_manage_project_activities: Manage project activities
               permission_manage_versions: Manage versions
               permission_manage_categories: Manage issue categories
               permission_view_issues: View Issues
               permission_add_issues: Add issues
               permission_edit_issues: Edit issues
               permission_manage_issue_relations: Manage issue relations
               permission_set_issues_private: Set issues public or private
               permission_set_own_issues_private: Set own issues public or private
               permission_add_issue_notes: Add notes
               permission_edit_issue_notes: Edit notes
               permission_edit_own_issue_notes: Edit own notes
               permission_view_private_notes: View private notes
               permission_set_notes_private: Set notes as private
               permission_move_issues: Move issues
               permission_delete_issues: Delete issues
               permission_manage_public_queries: Manage public queries
               permission_save_queries: Save queries
               permission_view_gantt: View gantt chart
               permission_view_calendar: View calendar
               permission_view_issue_watchers: View watchers list
               permission_add_issue_watchers: Add watchers
               permission_delete_issue_watchers: Delete watchers
               permission_log_time: Log spent time
               permission_view_time_entries: View spent time
               permission_edit_time_entries: Edit time logs
               permission_edit_own_time_entries: Edit own time logs
               permission_manage_news: Manage news
               permission_comment_news: Comment news
               permission_view_documents: View documents
               permission_add_documents: Add documents
               permission_edit_documents: Edit documents
               permission_delete_documents: Delete documents
               permission_manage_files: Manage files
               permission_view_files: View files
               permission_manage_wiki: Manage wiki
               permission_rename_wiki_pages: Rename wiki pages
               permission_delete_wiki_pages: Delete wiki pages
               permission_view_wiki_pages: View wiki
               permission_view_wiki_edits: View wiki history
               permission_edit_wiki_pages: Edit wiki pages
               permission_delete_wiki_pages_attachments: Delete attachments
               permission_protect_wiki_pages: Protect wiki pages
               permission_manage_repository: Manage repository
               permission_browse_repository: Browse repository
               permission_view_changesets: View changesets
               permission_commit_access: Commit access
               permission_manage_boards: Manage forums
               permission_view_messages: View messages
               permission_add_messages: Post messages
               permission_edit_messages: Edit messages
               permission_edit_own_messages: Edit own messages
               permission_delete_messages: Delete messages
               permission_delete_own_messages: Delete own messages
               permission_export_wiki_pages: Export wiki pages
               permission_manage_subtasks: Manage subtasks
               permission_manage_related_issues: Manage related issues
               project_module_issue_tracking: Issue tracking
               project_module_time_tracking: Time tracking
               project_module_news: News
               project_module_documents: Documents
               project_module_files: Files
               project_module_wiki: Wiki
               project_module_repository: Repository
               project_module_boards: Forums
               project_module_calendar: Calendar
               project_module_gantt: Gantt
               label_user: User
               label_user_plural: Users
               label_user_new: New user
               label_user_anonymous: Anonymous
               label_project: Project
               label_project_new: New project
               label_project_plural: Projects
               label_x_projects:
                 zero:  no projects
                 one:   1 project
                 other: "%{count} projects"
               label_project_all: All Projects
               label_project_latest: Latest projects
               label_issue: Issue
               label_issue_new: New issue
               label_issue_plural: Issues
               label_issue_view_all: View all issues
               label_issues_by: "Issues by %{value}"
               label_issue_added: Issue added
               label_issue_updated: Issue updated
               label_issue_note_added: Note added
               label_issue_status_updated: Status updated
               label_issue_priority_updated: Priority updated
               label_document: Document
               label_document_new: New document
               label_document_plural: Documents
               label_document_added: Document added
               label_role: Role
               label_role_plural: Roles
               label_role_new: New role
               label_role_and_permissions: Roles and permissions
               label_role_anonymous: Anonymous
               label_role_non_member: Non member
               label_member: Member
               label_member_new: New member
               label_member_plural: Members
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: New tracker
               label_workflow: Workflow
               label_issue_status: Issue status
               label_issue_status_plural: Issue statuses
               label_issue_status_new: New status
               label_issue_category: Issue category
               label_issue_category_plural: Issue categories
               label_issue_category_new: New category
               label_custom_field: Custom field
               label_custom_field_plural: Custom fields
               label_custom_field_new: New custom field
               label_enumerations: Enumerations
               label_enumeration_new: New value
               label_information: Information
               label_information_plural: Information
               label_please_login: Please log in
               label_register: Register
               label_login_with_open_id_option: or login with OpenID
               label_password_lost: Lost password
               label_home: Home
               label_my_page: My page
               label_my_account: My account
               label_my_projects: My projects
               label_my_page_block: My page block
               label_administration: Administration
               label_login: Sign in
               label_logout: Sign out
               label_help: Help
               label_reported_issues: Reported issues
               label_assigned_to_me_issues: Issues assigned to me
               label_last_login: Last connection
               label_registered_on: Registered on
               label_activity: Activity
               label_overall_activity: Overall activity
               label_user_activity: "%{value}'s activity"
               label_new: New
               label_logged_as: Logged in as
               label_environment: Environment
               label_authentication: Authentication
               label_auth_source: Authentication mode
               label_auth_source_new: New authentication mode
               label_auth_source_plural: Authentication modes
               label_subproject_plural: Subprojects
               label_subproject_new: New subproject
               label_and_its_subprojects: "%{value} and its subprojects"
               label_min_max_length: Min - Max length
               label_list: List
               label_date: Date
               label_integer: Integer
               label_float: Float
               label_boolean: Boolean
               label_string: Text
               label_text: Long text
               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_no_data: No data to display
               label_change_status: Change status
               label_history: History
               label_attachment: File
               label_attachment_new: New file
               label_attachment_delete: Delete file
               label_attachment_plural: Files
               label_file_added: File added
               label_report: Report
               label_report_plural: Reports
               label_news: News
               label_news_new: Add news
               label_news_plural: News
               label_news_latest: Latest news
               label_news_view_all: View all news
               label_news_added: News added
               label_news_comment_added: Comment added to a news
               label_settings: Settings
               label_overview: Overview
               label_version: Version
               label_version_new: New version
               label_version_plural: Versions
               label_close_versions: Close completed versions
               label_confirmation: Confirmation
               label_export_to: 'Also available in:'
               label_read: Read...
               label_public_projects: Public projects
               label_open_issues: open
               label_open_issues_plural: open
               label_closed_issues: closed
               label_closed_issues_plural: closed
               label_x_open_issues_abbr_on_total:
                 zero:  0 open / %{total}
                 one:   1 open / %{total}
                 other: "%{count} open / %{total}"
               label_x_open_issues_abbr:
                 zero:  0 open
                 one:   1 open
                 other: "%{count} open"
               label_x_closed_issues_abbr:
                 zero:  0 closed
                 one:   1 closed
                 other: "%{count} closed"
               label_x_issues:
                 zero:  0 issues
                 one:   1 issue
                 other: "%{count} issues"
               label_total: Total
               label_total_time: Total time
               label_permissions: Permissions
               label_current_status: Current status
               label_new_statuses_allowed: New statuses allowed
               label_all: all
               label_any: any
               label_none: none
               label_nobody: nobody
               label_next: Next
               label_previous: Previous
               label_used_by: Used by
               label_details: Details
               label_add_note: Add a note
               label_per_page: Per page
               label_calendar: Calendar
               label_months_from: months from
               label_gantt: Gantt
               label_internal: Internal
               label_last_changes: "last %{count} changes"
               label_change_view_all: View all changes
               label_personalize_page: Personalize this page
               label_comment: Comment
               label_comment_plural: Comments
               label_x_comments:
                 zero: no comments
                 one: 1 comment
                 other: "%{count} comments"
               label_comment_add: Add a comment
               label_comment_added: Comment added
               label_comment_delete: Delete comments
               label_query: Custom query
               label_query_plural: Custom queries
               label_query_new: New query
               label_my_queries: My custom queries
               label_filter_add: Add filter
               label_filter_plural: Filters
               label_equals: is
               label_not_equals: is not
               label_in_less_than: in less than
               label_in_more_than: in more than
               label_in_the_next_days: in the next
               label_in_the_past_days: in the past
               label_greater_or_equal: '>='
               label_less_or_equal: '<='
               label_between: between
               label_in: in
               label_today: today
               label_all_time: all time
               label_yesterday: yesterday
               label_this_week: this week
               label_last_week: last week
               label_last_n_weeks: "last %{count} weeks"
               label_last_n_days: "last %{count} days"
               label_this_month: this month
               label_last_month: last month
               label_this_year: this year
               label_date_range: Date range
               label_less_than_ago: less than days ago
               label_more_than_ago: more than days ago
               label_ago: days ago
               label_contains: contains
               label_not_contains: doesn't contain
               label_any_issues_in_project: any issues in project
               label_any_issues_not_in_project: any issues not in project
               label_no_issues_in_project: no issues in project
               label_day_plural: days
               label_repository: Repository
               label_repository_new: New repository
               label_repository_plural: Repositories
               label_browse: Browse
               label_branch: Branch
               label_tag: Tag
               label_revision: Revision
               label_revision_plural: Revisions
               label_revision_id: "Revision %{value}"
               label_associated_revisions: Associated revisions
               label_added: added
               label_modified: modified
               label_copied: copied
               label_renamed: renamed
               label_deleted: deleted
               label_latest_revision: Latest revision
               label_latest_revision_plural: Latest revisions
               label_view_revisions: View revisions
               label_view_all_revisions: View all revisions
               label_max_size: Maximum size
               label_sort_highest: Move to top
               label_sort_higher: Move up
               label_sort_lower: Move down
               label_sort_lowest: Move to bottom
               label_roadmap: Roadmap
               label_roadmap_due_in: "Due in %{value}"
               label_roadmap_overdue: "%{value} late"
               label_roadmap_no_issues: No issues for this version
               label_search: Search
               label_result_plural: Results
               label_all_words: All words
               label_wiki: Wiki
               label_wiki_edit: Wiki edit
               label_wiki_edit_plural: Wiki edits
               label_wiki_page: Wiki page
               label_wiki_page_plural: Wiki pages
               label_index_by_title: Index by title
               label_index_by_date: Index by date
               label_current_version: Current version
               label_preview: Preview
               label_feed_plural: Feeds
               label_changes_details: Details of all changes
               label_issue_tracking: Issue tracking
               label_spent_time: Spent time
               label_overall_spent_time: Overall spent time
               label_f_hour: "%{value} hour"
               label_f_hour_plural: "%{value} hours"
               label_time_tracking: Time tracking
               label_change_plural: Changes
               label_statistics: Statistics
               label_commits_per_month: Commits per month
               label_commits_per_author: Commits per author
               label_diff: diff
               label_view_diff: View differences
               label_diff_inline: inline
               label_diff_side_by_side: side by side
               label_options: Options
               label_copy_workflow_from: Copy workflow from
               label_permissions_report: Permissions report
               label_watched_issues: Watched issues
               label_related_issues: Related issues
               label_applied_status: Applied status
               label_loading: Loading...
               label_relation_new: New relation
               label_relation_delete: Delete relation
               label_relates_to: Related to
               label_duplicates: Duplicates
               label_duplicated_by: Duplicated by
               label_blocks: Blocks
               label_blocked_by: Blocked by
               label_precedes: Precedes
               label_follows: Follows
               label_copied_to: Copied to
               label_copied_from: Copied from
               label_end_to_start: end to start
               label_end_to_end: end to end
               label_start_to_start: start to start
               label_start_to_end: start to end
               label_stay_logged_in: Stay logged in
               label_disabled: disabled
               label_show_completed_versions: Show completed versions
               label_me: me
               label_board: Forum
               label_board_new: New forum
               label_board_plural: Forums
               label_board_locked: Locked
               label_board_sticky: Sticky
               label_topic_plural: Topics
               label_message_plural: Messages
               label_message_last: Last message
               label_message_new: New message
               label_message_posted: Message added
               label_reply_plural: Replies
               label_send_information: Send account information to the user
               label_year: Year
               label_month: Month
               label_week: Week
               label_date_from: From
               label_date_to: To
               label_language_based: Based on user's language
               label_sort_by: "Sort by %{value}"
               label_send_test_email: Send a test email
               label_feeds_access_key: Atom access key
               label_missing_feeds_access_key: Missing a Atom access key
               label_feeds_access_key_created_on: "Atom access key created %{value} ago"
               label_module_plural: Modules
               label_added_time_by: "Added by %{author} %{age} ago"
               label_updated_time_by: "Updated by %{author} %{age} ago"
               label_updated_time: "Updated %{value} ago"
               label_jump_to_a_project: Jump to a project...
               label_file_plural: Files
               label_changeset_plural: Changesets
               label_default_columns: Default columns
               label_no_change_option: (No change)
               label_bulk_edit_selected_issues: Bulk edit selected issues
               label_bulk_edit_selected_time_entries: Bulk edit selected time entries
               label_theme: Theme
               label_default: Default
               label_search_titles_only: Search titles only
               label_user_mail_option_all: "For any event on all my projects"
               label_user_mail_option_selected: "For any event on the selected projects only..."
               label_user_mail_option_none: "No events"
               label_user_mail_option_only_my_events: "Only for things I watch or I'm involved in"
               label_user_mail_option_only_assigned: "Only for things I am assigned to"
               label_user_mail_option_only_owner: "Only for things I am the owner of"
               label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
               label_registration_activation_by_email: account activation by email
               label_registration_manual_activation: manual account activation
               label_registration_automatic_activation: automatic account activation
               label_display_per_page: "Per page: %{value}"
               label_age: Age
               label_change_properties: Change properties
               label_general: General
               label_more: More
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: LDAP authentication
               label_downloads_abbr: D/L
               label_optional_description: Optional description
               label_add_another_file: Add another file
               label_preferences: Preferences
               label_chronological_order: In chronological order
               label_reverse_chronological_order: In reverse chronological order
               label_planning: Planning
               label_incoming_emails: Incoming emails
               label_generate_key: Generate a key
               label_issue_watchers: Watchers
               label_example: Example
               label_display: Display
               label_sort: Sort
               label_ascending: Ascending
               label_descending: Descending
               label_date_from_to: From %{start} to %{end}
               label_wiki_content_added: Wiki page added
               label_wiki_content_updated: Wiki page updated
               label_group: Group
               label_group_plural: Groups
               label_group_new: New group
               label_time_entry_plural: Spent time
               label_version_sharing_none: Not shared
               label_version_sharing_descendants: With subprojects
               label_version_sharing_hierarchy: With project hierarchy
               label_version_sharing_tree: With project tree
               label_version_sharing_system: With all projects
               label_update_issue_done_ratios: Update issue done ratios
               label_copy_source: Source
               label_copy_target: Target
               label_copy_same_as_target: Same as target
               label_display_used_statuses_only: Only display statuses that are used by this tracker
               label_api_access_key: API access key
               label_missing_api_access_key: Missing an API access key
               label_api_access_key_created_on: "API access key created %{value} ago"
               label_profile: Profile
               label_subtask_plural: Subtasks
               label_project_copy_notifications: Send email notifications during the project copy
               label_principal_search: "Search for user or group:"
               label_user_search: "Search for user:"
               label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
               label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
               label_issues_visibility_all: All issues
               label_issues_visibility_public: All non private issues
               label_issues_visibility_own: Issues created by or assigned to the user
               label_git_report_last_commit: Report last commit for files and directories
               label_parent_revision: Parent
               label_child_revision: Child
               label_export_options: "%{export_format} export options"
               label_copy_attachments: Copy attachments
               label_copy_subtasks: Copy subtasks
               label_item_position: "%{position} of %{count}"
               label_completed_versions: Completed versions
               label_search_for_watchers: Search for watchers to add
               label_session_expiration: Session expiration
               label_show_closed_projects: View closed projects
               label_status_transitions: Status transitions
               label_fields_permissions: Fields permissions
               label_readonly: Read-only
               label_required: Required
               label_attribute_of_project: "Project's %{name}"
               label_attribute_of_issue: "Issue's %{name}"
               label_attribute_of_author: "Author's %{name}"
               label_attribute_of_assigned_to: "Assignee's %{name}"
               label_attribute_of_user: "User's %{name}"
               label_attribute_of_fixed_version: "Target version's %{name}"
               label_cross_project_descendants: With subprojects
               label_cross_project_tree: With project tree
               label_cross_project_hierarchy: With project hierarchy
               label_cross_project_system: With all projects
               label_gantt_progress_line: Progress line
               button_login: Login
               button_submit: Submit
               button_save: Save
               button_check_all: Check all
               button_uncheck_all: Uncheck all
               button_collapse_all: Collapse all
               button_expand_all: Expand all
               button_delete: Delete
               button_create: Create
               button_create_and_continue: Create and continue
               button_test: Test
               button_edit: Edit
               button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
               button_add: Add
               button_change: Change
               button_apply: Apply
               button_clear: Clear
               button_lock: Lock
               button_unlock: Unlock
               button_download: Download
               button_list: List
               button_view: View
               button_move: Move
               button_move_and_follow: Move and follow
               button_back: Back
               button_cancel: Cancel
               button_activate: Activate
               button_sort: Sort
               button_log_time: Log time
               button_rollback: Rollback to this version
               button_watch: Watch
               button_unwatch: Unwatch
               button_reply: Reply
               button_archive: Archive
               button_unarchive: Unarchive
               button_reset: Reset
               button_rename: Rename
               button_change_password: Change password
               button_copy: Copy
               button_copy_and_follow: Copy and follow
               button_annotate: Annotate
               button_update: Update
               button_configure: Configure
               button_quote: Quote
               button_duplicate: Duplicate
               button_show: Show
               button_hide: Hide
               button_edit_section: Edit this section
               button_export: Export
               button_delete_my_account: Delete my account
               button_close: Close
               button_reopen: Reopen
               status_active: active
               status_registered: registered
               status_locked: locked
               project_status_active: active
               project_status_closed: closed
               project_status_archived: archived
               version_status_open: open
               version_status_locked: locked
               version_status_closed: closed
               field_active: Active
               text_select_mail_notifications: Select actions for which email notifications should be sent.
               text_regexp_info: eg. ^[A-Z0-9]+$
               text_min_max_length_info: 0 means no restriction
               text_project_destroy_confirmation: Are you sure you want to delete this project and related data?
               text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
               text_workflow_edit: Select a role and a tracker to edit the workflow
               text_are_you_sure: Are you sure?
               text_journal_changed: "%{label} changed from %{old} to %{new}"
               text_journal_changed_no_detail: "%{label} updated"
               text_journal_set_to: "%{label} set to %{value}"
               text_journal_deleted: "%{label} deleted (%{old})"
               text_journal_added: "%{label} %{value} added"
               text_tip_issue_begin_day: issue beginning this day
               text_tip_issue_end_day: issue ending this day
               text_tip_issue_begin_end_day: issue beginning and ending this day
               text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed.'
               text_caracters_maximum: "%{count} characters maximum."
               text_caracters_minimum: "Must be at least %{count} characters long."
               text_length_between: "Length between %{min} and %{max} characters."
               text_tracker_no_workflow: No workflow defined for this tracker
               text_unallowed_characters: Unallowed characters
               text_comma_separated: Multiple values allowed (comma separated).
               text_line_separated: Multiple values allowed (one line for each value).
               text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
               text_issue_added: "Issue %{id} has been reported by %{author}."
               text_issue_updated: "Issue %{id} has been updated by %{author}."
               text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content?
               text_issue_category_destroy_question: "Some issues (%{count}) are assigned to this category. What do you want to do?"
               text_issue_category_destroy_assignments: Remove category assignments
               text_issue_category_reassign_to: Reassign issues to this category
               text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
               text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
               text_load_default_configuration: Load the default configuration
               text_status_changed_by_changeset: "Applied in changeset %{value}."
               text_time_logged_by_changeset: "Applied in changeset %{value}."
               text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
               text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
               text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
               text_select_project_modules: 'Select modules to enable for this project:'
               text_default_administrator_account_changed: Default administrator account changed
               text_file_repository_writable: Attachments directory writable
               text_plugin_assets_writable: Plugin assets directory writable
               text_rmagick_available: RMagick available (optional)
               text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do?"
               text_destroy_time_entries: Delete reported hours
               text_assign_time_entries_to_project: Assign reported hours to the project
               text_reassign_time_entries: 'Reassign reported hours to this issue:'
               text_user_wrote: "%{value} wrote:"
               text_enumeration_destroy_question: "%{count} objects are assigned to this value."
               text_enumeration_category_reassign_to: 'Reassign them to this value:'
               text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them."
               text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
               text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
               text_custom_field_possible_values_info: 'One line for each value'
               text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?"
               text_wiki_page_nullify_children: "Keep child pages as root pages"
               text_wiki_page_destroy_children: "Delete child pages and all their descendants"
               text_wiki_page_reassign_children: "Reassign child pages to this parent page"
               text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
               text_zoom_in: Zoom in
               text_zoom_out: Zoom out
               text_warn_on_leaving_unsaved: "The current page contains unsaved text that will be lost if you leave this page."
               text_scm_path_encoding_note: "Default: UTF-8"
               text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
               text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
               text_scm_command: Command
               text_scm_command_version: Version
               text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
               text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
               text_issue_conflict_resolution_overwrite: "Apply my changes anyway (previous notes will be kept but some changes may be overwritten)"
               text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes"
               text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}"
               text_account_destroy_confirmation: "Are you sure you want to proceed?\nYour account will be permanently deleted, with no way to reactivate it."
               text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
               text_project_closed: This project is closed and read-only.
               text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
               default_role_manager: Manager
               default_role_developer: Developer
               default_role_reporter: Reporter
               default_tracker_bug: Bug
               default_tracker_feature: Feature
               default_tracker_support: Support
               default_issue_status_new: New
               default_issue_status_in_progress: In Progress
               default_issue_status_resolved: Resolved
               default_issue_status_feedback: Feedback
               default_issue_status_closed: Closed
               default_issue_status_rejected: Rejected
               default_doc_category_user: User documentation
               default_doc_category_tech: Technical documentation
               default_priority_low: Low
               default_priority_normal: Normal
               default_priority_high: High
               default_priority_urgent: Urgent
               default_priority_immediate: Immediate
               default_activity_design: Design
               default_activity_development: Development
               enumeration_issue_priorities: Issue priorities
               enumeration_doc_categories: Document categories
               enumeration_activities: Activities (time tracking)
               enumeration_system_activity: System Activity
               description_filter: Filter
               description_search: Searchfield
               description_choose_project: Projects
               description_project_scope: Search scope
               description_notes: Notes
               description_message_content: Message content
               description_query_sort_criteria_attribute: Sort attribute
               description_query_sort_criteria_direction: Sort direction
               description_user_mail_notification: Mail notification settings
               description_available_columns: Available Columns
               description_selected_columns: Selected Columns
               description_all_columns: All Columns
               description_issue_category_reassign: Choose issue category
               description_wiki_subpages_reassign: Choose new parent page
               description_date_range_list: Choose range from list
               description_date_range_interval: Choose range by selecting start and end date
               description_date_from: Enter start date
               description_date_to: Enter end date
               text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'

config/locales/fr.yml +2 0

             # French translations for Ruby on Rails
             # by Christian Lescuyer (christian@flyingcoders.com)
             # contributor: Sebastien Grosjean - ZenCocoon.com
             # contributor: Thibaut Cuvelier - Developpez.com
             fr:
               direction: ltr
               date:
                 formats:
                   default: "%d/%m/%Y"
                   short: "%e %b"
                   long: "%e %B %Y"
                   long_ordinal: "%e %B %Y"
                   only_day: "%e"
                 day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
                 abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
                 month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
                 abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
                 order:
                   - :day
                   - :month
                   - :year
               time:
                 formats:
                   default: "%d/%m/%Y %H:%M"
                   time: "%H:%M"
                   short: "%d %b %H:%M"
                   long: "%A %d %B %Y %H:%M:%S %Z"
                   long_ordinal: "%A %d %B %Y %H:%M:%S %Z"
                   only_second: "%S"
                 am: 'am'
                 pm: 'pm'
               datetime:
                 distance_in_words:
                   half_a_minute: "30 secondes"
                   less_than_x_seconds:
                     zero:  "moins d'une seconde"
                     one:   "moins d'une seconde"
                     other: "moins de %{count} secondes"
                   x_seconds:
                     one:   "1 seconde"
                     other: "%{count} secondes"
                   less_than_x_minutes:
                     zero:  "moins d'une minute"
                     one:   "moins d'une minute"
                     other: "moins de %{count} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "%{count} minutes"
                   about_x_hours:
                     one:   "environ une heure"
                     other: "environ %{count} heures"
                   x_hours:
                     one:   "une heure"
                     other: "%{count} heures"
                   x_days:
                     one:   "un jour"
                     other: "%{count} jours"
                   about_x_months:
                     one:   "environ un mois"
                     other: "environ %{count} mois"
                   x_months:
                     one:   "un mois"
                     other: "%{count} mois"
                   about_x_years:
                     one:   "environ un an"
                     other: "environ %{count} ans"
                   over_x_years:
                     one:   "plus d'un an"
                     other: "plus de %{count} ans"
                   almost_x_years:
                     one:   "presqu'un an"
                     other: "presque %{count} ans"
                 prompts:
                   year:   "Année"
                   month:  "Mois"
                   day:    "Jour"
                   hour:   "Heure"
                   minute: "Minute"
                   second: "Seconde"
               number:
                 format:
                   precision: 3
                   separator: ','
                   delimiter: ' '
                 currency:
                   format:
                     unit: '€'
                     precision: 2
                     format: '%n %u'
                 human:
                   format:
                     precision: 3
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "octet"
                         other: "octet"
                       kb: "ko"
                       mb: "Mo"
                       gb: "Go"
                       tb: "To"
               support:
                 array:
                   sentence_connector: 'et'
                   skip_last_comma: true
                   word_connector: ", "
                   two_words_connector: " et "
                   last_word_connector: " et "
               activerecord:
                 errors:
                   template:
                     header:
                       one: "Impossible d'enregistrer %{model} : une erreur"
                       other: "Impossible d'enregistrer %{model} : %{count} erreurs."
                     body: "Veuillez vérifier les champs suivants :"
                   messages:
                     inclusion: "n'est pas inclus(e) dans la liste"
                     exclusion: "n'est pas disponible"
                     invalid: "n'est pas valide"
                     confirmation: "ne concorde pas avec la confirmation"
                     accepted: "doit être accepté(e)"
                     empty: "doit être renseigné(e)"
                     blank: "doit être renseigné(e)"
                     too_long: "est trop long (pas plus de %{count} caractères)"
                     too_short: "est trop court (au moins %{count} caractères)"
                     wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
                     taken: "est déjà utilisé"
                     not_a_number: "n'est pas un nombre"
                     not_a_date: "n'est pas une date valide"
                     greater_than: "doit être supérieur à %{count}"
                     greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
                     equal_to: "doit être égal à %{count}"
                     less_than: "doit être inférieur à %{count}"
                     less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
                     odd: "doit être impair"
                     even: "doit être pair"
                     greater_than_start_date: "doit être postérieure à la date de début"
                     not_same_project: "n'appartient pas au même projet"
                     circular_dependency: "Cette relation créerait une dépendance circulaire"
                     cant_link_an_issue_with_a_descendant: "Une demande ne peut pas être liée à l'une de ses sous-tâches"
                     earlier_than_minimum_start_date: "ne peut pas être antérieure au %{date} à cause des demandes qui précédent"
               actionview_instancetag_blank_option: Choisir
               general_text_No: 'Non'
               general_text_Yes: 'Oui'
               general_text_no: 'non'
               general_text_yes: 'oui'
               general_lang_name: 'Français'
               general_csv_separator: ';'
               general_csv_decimal_separator: ','
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: UTF-8
               general_first_day_of_week: '1'
               notice_account_updated: Le compte a été mis à jour avec succès.
               notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
               notice_account_password_updated: Mot de passe mis à jour avec succès.
               notice_account_wrong_password: Mot de passe incorrect
               notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
               notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
+              notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>.
+              notice_account_locked: Votre compte est verrouillé.
               notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
               notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
               notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
               notice_successful_create: Création effectuée avec succès.
               notice_successful_update: Mise à jour effectuée avec succès.
               notice_successful_delete: Suppression effectuée avec succès.
               notice_successful_connection: Connexion réussie.
               notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
               notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
               notice_not_authorized: "Vous n'êtes pas autorisé à accéder à cette page."
               notice_not_authorized_archived_project: Le projet auquel vous tentez d'accéder a été archivé.
               notice_email_sent: "Un email a été envoyé à %{value}"
               notice_email_error: "Erreur lors de l'envoi de l'email (%{value})"
               notice_feeds_access_key_reseted: "Votre clé d'accès aux flux Atom a été réinitialisée."
               notice_failed_to_save_issues: "%{count} demande(s) sur les %{total} sélectionnées n'ont pas pu être mise(s) à jour : %{ids}."
               notice_failed_to_save_time_entries: "%{count} temps passé(s) sur les %{total} sélectionnés n'ont pas pu être mis à jour: %{ids}."
               notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
               notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
               notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
               notice_unable_delete_version: Impossible de supprimer cette version.
               notice_issue_done_ratios_updated: L'avancement des demandes a été mis à jour.
               notice_api_access_key_reseted: Votre clé d'accès API a été réinitialisée.
               notice_gantt_chart_truncated: "Le diagramme a été tronqué car il excède le nombre maximal d'éléments pouvant être affichés (%{max})"
               notice_issue_successful_create: "Demande %{id} créée."
               notice_issue_update_conflict: "La demande a été mise à jour par un autre utilisateur pendant que vous la modifiez."
               notice_account_deleted: "Votre compte a été définitivement supprimé."
               notice_user_successful_create: "Utilisateur %{id} créé."
               error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage : %{value}"
               error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
               error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt : %{value}"
               error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée."
               error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
               error_can_not_reopen_issue_on_closed_version: 'Une demande assignée à une version fermée ne peut pas être réouverte'
               error_can_not_archive_project: "Ce projet ne peut pas être archivé"
               error_workflow_copy_source: 'Veuillez sélectionner un tracker et/ou un rôle source'
               error_workflow_copy_target: 'Veuillez sélectionner les trackers et rôles cibles'
               error_issue_done_ratios_not_updated: L'avancement des demandes n'a pas pu être mis à jour.
               error_attachment_too_big: Ce fichier ne peut pas être attaché car il excède la taille maximale autorisée (%{max_size})
               error_session_expired: "Votre session a expiré. Veuillez vous reconnecter."
               warning_attachments_not_saved: "%{count} fichier(s) n'ont pas pu être sauvegardés."
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'
               mail_subject_register: "Activation de votre compte %{value}"
               mail_body_register: 'Pour activer votre compte, cliquez sur le lien suivant :'
               mail_body_account_information_external: "Vous pouvez utiliser votre compte %{value} pour vous connecter."
               mail_body_account_information: Paramètres de connexion de votre compte
               mail_subject_account_activation_request: "Demande d'activation d'un compte %{value}"
               mail_body_account_activation_request: "Un nouvel utilisateur (%{value}) s'est inscrit. Son compte nécessite votre approbation :"
               mail_subject_reminder: "%{count} demande(s) arrivent à échéance (%{days})"
               mail_body_reminder: "%{count} demande(s) qui vous sont assignées arrivent à échéance dans les %{days} prochains jours :"
               mail_subject_wiki_content_added: "Page wiki '%{id}' ajoutée"
               mail_body_wiki_content_added: "La page wiki '%{id}' a été ajoutée par %{author}."
               mail_subject_wiki_content_updated: "Page wiki '%{id}' mise à jour"
               mail_body_wiki_content_updated: "La page wiki '%{id}' a été mise à jour par %{author}."
               field_name: Nom
               field_description: Description
               field_summary: Résumé
               field_is_required: Obligatoire
               field_firstname: Prénom
               field_lastname: Nom
               field_mail: "Email "
               field_filename: Fichier
               field_filesize: Taille
               field_downloads: Téléchargements
               field_author: Auteur
               field_created_on: "Créé "
               field_updated_on: "Mis-à-jour "
               field_closed_on: Fermé
               field_field_format: Format
               field_is_for_all: Pour tous les projets
               field_possible_values: Valeurs possibles
               field_regexp: Expression régulière
               field_min_length: Longueur minimum
               field_max_length: Longueur maximum
               field_value: Valeur
               field_category: Catégorie
               field_title: Titre
               field_project: Projet
               field_issue: Demande
               field_status: Statut
               field_notes: Notes
               field_is_closed: Demande fermée
               field_is_default: Valeur par défaut
               field_tracker: Tracker
               field_subject: Sujet
               field_due_date: Echéance
               field_assigned_to: Assigné à
               field_priority: Priorité
               field_fixed_version: Version cible
               field_user: Utilisateur
               field_role: Rôle
               field_homepage: "Site web "
               field_is_public: Public
               field_parent: Sous-projet de
               field_is_in_roadmap: Demandes affichées dans la roadmap
               field_login: "Identifiant "
               field_mail_notification: Notifications par mail
               field_admin: Administrateur
               field_last_login_on: "Dernière connexion "
               field_language: Langue
               field_effective_date: Date
               field_password: Mot de passe
               field_new_password: Nouveau mot de passe
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Hôte
               field_port: Port
               field_account: Compte
               field_base_dn: Base DN
               field_attr_login: Attribut Identifiant
               field_attr_firstname: Attribut Prénom
               field_attr_lastname: Attribut Nom
               field_attr_mail: Attribut Email
               field_onthefly: Création des utilisateurs à la volée
               field_start_date: Début
               field_done_ratio: "% réalisé"
               field_auth_source: Mode d'authentification
               field_hide_mail: Cacher mon adresse mail
               field_comments: Commentaire
               field_url: URL
               field_start_page: Page de démarrage
               field_subproject: Sous-projet
               field_hours: Heures
               field_activity: Activité
               field_spent_on: Date
               field_identifier: Identifiant
               field_is_filter: Utilisé comme filtre
               field_issue_to: Demande liée
               field_delay: Retard
               field_assignable: Demandes assignables à ce rôle
               field_redirect_existing_links: Rediriger les liens existants
               field_estimated_hours: Temps estimé
               field_column_names: Colonnes
               field_time_zone: Fuseau horaire
               field_searchable: Utilisé pour les recherches
               field_default_value: Valeur par défaut
               field_comments_sorting: Afficher les commentaires
               field_parent_title: Page parent
               field_editable: Modifiable
               field_watcher: Observateur
               field_identity_url: URL OpenID
               field_content: Contenu
               field_group_by: Grouper par
               field_sharing: Partage
               field_active: Actif
               field_parent_issue: Tâche parente
               field_visible: Visible
               field_warn_on_leaving_unsaved: "M'avertir lorsque je quitte une page contenant du texte non sauvegardé"
               field_issues_visibility: Visibilité des demandes
               field_is_private: Privée
               field_commit_logs_encoding: Encodage des messages de commit
               field_repository_is_default: Dépôt principal
               field_multiple: Valeurs multiples
               field_auth_source_ldap_filter: Filtre LDAP
               field_core_fields: Champs standards
               field_timeout: "Timeout (en secondes)"
               field_board_parent: Forum parent
               field_private_notes: Notes privées
               field_inherit_members: Hériter les membres
               field_generate_password: Générer un mot de passe
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application
               setting_welcome_text: Texte d'accueil
               setting_default_language: Langue par défaut
               setting_login_required: Authentification obligatoire
               setting_self_registration: Inscription des nouveaux utilisateurs
               setting_attachment_max_size: Taille maximale des fichiers
               setting_issues_export_limit: Limite d'exportation des demandes
               setting_mail_from: Adresse d'émission
               setting_bcc_recipients: Destinataires en copie cachée (cci)
               setting_plain_text_mail: Mail en texte brut (non HTML)
               setting_host_name: Nom d'hôte et chemin
               setting_text_formatting: Formatage du texte
               setting_wiki_compression: Compression de l'historique des pages wiki
               setting_feeds_limit: Nombre maximal d'éléments dans les flux Atom
               setting_default_projects_public: Définir les nouveaux projets comme publics par défaut
               setting_autofetch_changesets: Récupération automatique des commits
               setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
               setting_commit_ref_keywords: Mots-clés de référencement
               setting_commit_fix_keywords: Mots-clés de résolution
               setting_autologin: Durée maximale de connexion automatique
               setting_date_format: Format de date
               setting_time_format: Format d'heure
               setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
               setting_cross_project_subtasks: Autoriser les sous-tâches dans des projets différents
               setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
               setting_emails_footer: Pied-de-page des emails
               setting_protocol: Protocole
               setting_per_page_options: Options d'objets affichés par page
               setting_user_format: Format d'affichage des utilisateurs
               setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
               setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
               setting_enabled_scm: SCM activés
               setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes"
               setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
               setting_mail_handler_api_key: Clé de protection de l'API
               setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
               setting_gravatar_enabled: Afficher les Gravatar des utilisateurs
               setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées
               setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
               setting_repository_log_display_limit: "Nombre maximum de révisions affichées sur l'historique d'un fichier"
               setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
               setting_password_min_length: Longueur minimum des mots de passe
               setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
               setting_default_projects_modules: Modules activés par défaut pour les nouveaux projets
               setting_issue_done_ratio: Calcul de l'avancement des demandes
               setting_issue_done_ratio_issue_status: Utiliser le statut
               setting_issue_done_ratio_issue_field: 'Utiliser le champ % effectué'
               setting_rest_api_enabled: Activer l'API REST
               setting_gravatar_default: Image Gravatar par défaut
               setting_start_of_week: Jour de début des calendriers
               setting_cache_formatted_text: Mettre en cache le texte formaté
               setting_commit_logtime_enabled: Permettre la saisie de temps
               setting_commit_logtime_activity_id: Activité pour le temps saisi
               setting_gantt_items_limit: Nombre maximum d'éléments affichés sur le gantt
               setting_issue_group_assignment: Permettre l'assignement des demandes aux groupes
               setting_default_issue_start_date_to_creation_date: Donner à la date de début d'une nouvelle demande la valeur de la date du jour
               setting_commit_cross_project_ref: Permettre le référencement et la résolution des demandes de tous les autres projets
               setting_unsubscribe: Permettre aux utilisateurs de supprimer leur propre compte
               setting_session_lifetime: Durée de vie maximale des sessions
               setting_session_timeout: Durée maximale d'inactivité
               setting_thumbnails_enabled: Afficher les vignettes des images
               setting_thumbnails_size: Taille des vignettes (en pixels)
               setting_non_working_week_days: Jours non travaillés
               setting_jsonp_enabled: Activer le support JSONP
               setting_default_projects_tracker_ids: Trackers par défaut pour les nouveaux projets
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets
               permission_edit_project: Modifier le projet
               permission_close_project: Fermer / réouvrir le projet
               permission_select_project_modules: Choisir les modules
               permission_manage_members: Gérer les membres
               permission_manage_versions: Gérer les versions
               permission_manage_categories: Gérer les catégories de demandes
               permission_view_issues: Voir les demandes
               permission_add_issues: Créer des demandes
               permission_edit_issues: Modifier les demandes
               permission_manage_issue_relations: Gérer les relations
               permission_set_issues_private: Rendre les demandes publiques ou privées
               permission_set_own_issues_private: Rendre ses propres demandes publiques ou privées
               permission_add_issue_notes: Ajouter des notes
               permission_edit_issue_notes: Modifier les notes
               permission_edit_own_issue_notes: Modifier ses propres notes
               permission_view_private_notes: Voir les notes privées
               permission_set_notes_private: Rendre les notes privées
               permission_move_issues: Déplacer les demandes
               permission_delete_issues: Supprimer les demandes
               permission_manage_public_queries: Gérer les requêtes publiques
               permission_save_queries: Sauvegarder les requêtes
               permission_view_gantt: Voir le gantt
               permission_view_calendar: Voir le calendrier
               permission_view_issue_watchers: Voir la liste des observateurs
               permission_add_issue_watchers: Ajouter des observateurs
               permission_delete_issue_watchers: Supprimer des observateurs
               permission_log_time: Saisir le temps passé
               permission_view_time_entries: Voir le temps passé
               permission_edit_time_entries: Modifier les temps passés
               permission_edit_own_time_entries: Modifier son propre temps passé
               permission_manage_news: Gérer les annonces
               permission_comment_news: Commenter les annonces
               permission_view_documents: Voir les documents
               permission_add_documents: Ajouter des documents
               permission_edit_documents: Modifier les documents
               permission_delete_documents: Supprimer les documents
               permission_manage_files: Gérer les fichiers
               permission_view_files: Voir les fichiers
               permission_manage_wiki: Gérer le wiki
               permission_rename_wiki_pages: Renommer les pages
               permission_delete_wiki_pages: Supprimer les pages
               permission_view_wiki_pages: Voir le wiki
               permission_view_wiki_edits: "Voir l'historique des modifications"
               permission_edit_wiki_pages: Modifier les pages
               permission_delete_wiki_pages_attachments: Supprimer les fichiers joints
               permission_protect_wiki_pages: Protéger les pages
               permission_manage_repository: Gérer le dépôt de sources
               permission_browse_repository: Parcourir les sources
               permission_view_changesets: Voir les révisions
               permission_commit_access: Droit de commit
               permission_manage_boards: Gérer les forums
               permission_view_messages: Voir les messages
               permission_add_messages: Poster un message
               permission_edit_messages: Modifier les messages
               permission_edit_own_messages: Modifier ses propres messages
               permission_delete_messages: Supprimer les messages
               permission_delete_own_messages: Supprimer ses propres messages
               permission_export_wiki_pages: Exporter les pages
               permission_manage_project_activities: Gérer les activités
               permission_manage_subtasks: Gérer les sous-tâches
               permission_manage_related_issues: Gérer les demandes associées
               project_module_issue_tracking: Suivi des demandes
               project_module_time_tracking: Suivi du temps passé
               project_module_news: Publication d'annonces
               project_module_documents: Publication de documents
               project_module_files: Publication de fichiers
               project_module_wiki: Wiki
               project_module_repository: Dépôt de sources
               project_module_boards: Forums de discussion
               label_user: Utilisateur
               label_user_plural: Utilisateurs
               label_user_new: Nouvel utilisateur
               label_user_anonymous: Anonyme
               label_project: Projet
               label_project_new: Nouveau projet
               label_project_plural: Projets
               label_x_projects:
                 zero:  aucun projet
                 one:   un projet
                 other: "%{count} projets"
               label_project_all: Tous les projets
               label_project_latest: Derniers projets
               label_issue: Demande
               label_issue_new: Nouvelle demande
               label_issue_plural: Demandes
               label_issue_view_all: Voir toutes les demandes
               label_issue_added: Demande ajoutée
               label_issue_updated: Demande mise à jour
               label_issue_note_added: Note ajoutée
               label_issue_status_updated: Statut changé
               label_issue_priority_updated: Priorité changée
               label_issues_by: "Demandes par %{value}"
               label_document: Document
               label_document_new: Nouveau document
               label_document_plural: Documents
               label_document_added: Document ajouté
               label_role: Rôle
               label_role_plural: Rôles
               label_role_new: Nouveau rôle
               label_role_and_permissions: Rôles et permissions
               label_role_anonymous: Anonyme
               label_role_non_member: Non membre
               label_member: Membre
               label_member_new: Nouveau membre
               label_member_plural: Membres
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: Nouveau tracker
               label_workflow: Workflow
               label_issue_status: Statut de demandes
               label_issue_status_plural: Statuts de demandes
               label_issue_status_new: Nouveau statut
               label_issue_category: Catégorie de demandes
               label_issue_category_plural: Catégories de demandes
               label_issue_category_new: Nouvelle catégorie
               label_custom_field: Champ personnalisé
               label_custom_field_plural: Champs personnalisés
               label_custom_field_new: Nouveau champ personnalisé
               label_enumerations: Listes de valeurs
               label_enumeration_new: Nouvelle valeur
               label_information: Information
               label_information_plural: Informations
               label_please_login: Identification
               label_register: S'enregistrer
               label_login_with_open_id_option: S'authentifier avec OpenID
               label_password_lost: Mot de passe perdu
               label_home: Accueil
               label_my_page: Ma page
               label_my_account: Mon compte
               label_my_projects: Mes projets
               label_my_page_block: Blocs disponibles
               label_administration: Administration
               label_login: Connexion
               label_logout: Déconnexion
               label_help: Aide
               label_reported_issues: "Demandes soumises "
               label_assigned_to_me_issues: Demandes qui me sont assignées
               label_last_login: "Dernière connexion "
               label_registered_on: "Inscrit le "
               label_activity: Activité
               label_overall_activity: Activité globale
               label_user_activity: "Activité de %{value}"
               label_new: Nouveau
               label_logged_as: Connecté en tant que
               label_environment: Environnement
               label_authentication: Authentification
               label_auth_source: Mode d'authentification
               label_auth_source_new: Nouveau mode d'authentification
               label_auth_source_plural: Modes d'authentification
               label_subproject_plural: Sous-projets
               label_subproject_new: Nouveau sous-projet
               label_and_its_subprojects: "%{value} et ses sous-projets"
               label_min_max_length: Longueurs mini - maxi
               label_list: Liste
               label_date: Date
               label_integer: Entier
               label_float: Nombre décimal
               label_boolean: Booléen
               label_string: Texte
               label_text: Texte long
               label_attribute: Attribut
               label_attribute_plural: Attributs
               label_no_data: Aucune donnée à afficher
               label_change_status: Changer le statut
               label_history: Historique
               label_attachment: Fichier
               label_attachment_new: Nouveau fichier
               label_attachment_delete: Supprimer le fichier
               label_attachment_plural: Fichiers
               label_file_added: Fichier ajouté
               label_report: Rapport
               label_report_plural: Rapports
               label_news: Annonce
               label_news_new: Nouvelle annonce
               label_news_plural: Annonces
               label_news_latest: Dernières annonces
               label_news_view_all: Voir toutes les annonces
               label_news_added: Annonce ajoutée
               label_news_comment_added: Commentaire ajouté à une annonce
               label_settings: Configuration
               label_overview: Aperçu
               label_version: Version
               label_version_new: Nouvelle version
               label_version_plural: Versions
               label_confirmation: Confirmation
               label_export_to: 'Formats disponibles :'
               label_read: Lire...
               label_public_projects: Projets publics
               label_open_issues: ouvert
               label_open_issues_plural: ouverts
               label_closed_issues: fermé
               label_closed_issues_plural: fermés
               label_x_open_issues_abbr_on_total:
                 zero:  0 ouverte sur %{total}
                 one:   1 ouverte sur %{total}
                 other: "%{count} ouvertes sur %{total}"
               label_x_open_issues_abbr:
                 zero:  0 ouverte
                 one:   1 ouverte
                 other: "%{count} ouvertes"
               label_x_closed_issues_abbr:
                 zero:  0 fermée
                 one:   1 fermée
                 other: "%{count} fermées"
               label_x_issues:
                 zero:  0 demande
                 one:   1 demande
                 other: "%{count} demandes"
               label_total: Total
               label_total_time: Temps total
               label_permissions: Permissions
               label_current_status: Statut actuel
               label_new_statuses_allowed: Nouveaux statuts autorisés
               label_all: tous
               label_any: tous
               label_none: aucun
               label_nobody: personne
               label_next: Suivant
               label_previous: Précédent
               label_used_by: Utilisé par
               label_details: Détails
               label_add_note: Ajouter une note
               label_per_page: Par page
               label_calendar: Calendrier
               label_months_from: mois depuis
               label_gantt: Gantt
               label_internal: Interne
               label_last_changes: "%{count} derniers changements"
               label_change_view_all: Voir tous les changements
               label_personalize_page: Personnaliser cette page
               label_comment: Commentaire
               label_comment_plural: Commentaires
               label_x_comments:
                 zero: aucun commentaire
                 one: un commentaire
                 other: "%{count} commentaires"
               label_comment_add: Ajouter un commentaire
               label_comment_added: Commentaire ajouté
               label_comment_delete: Supprimer les commentaires
               label_query: Rapport personnalisé
               label_query_plural: Rapports personnalisés
               label_query_new: Nouveau rapport
               label_my_queries: Mes rapports personnalisés
               label_filter_add: "Ajouter le filtre "
               label_filter_plural: Filtres
               label_equals: égal
               label_not_equals: différent
               label_in_less_than: dans moins de
               label_in_more_than: dans plus de
               label_in_the_next_days: dans les prochains jours
               label_in_the_past_days: dans les derniers jours
               label_in: dans
               label_today: aujourd'hui
               label_all_time: toute la période
               label_yesterday: hier
               label_this_week: cette semaine
               label_last_week: la semaine dernière
               label_last_n_weeks: "les %{count} dernières semaines"
               label_last_n_days: "les %{count} derniers jours"
               label_this_month: ce mois-ci
               label_last_month: le mois dernier
               label_this_year: cette année
               label_date_range: Période
               label_less_than_ago: il y a moins de
               label_more_than_ago: il y a plus de
               label_ago: il y a
               label_contains: contient
               label_not_contains: ne contient pas
               label_any_issues_in_project: une demande du projet
               label_any_issues_not_in_project: une demande hors du projet
               label_no_issues_in_project: aucune demande du projet
               label_day_plural: jours
               label_repository: Dépôt
               label_repository_new: Nouveau dépôt
               label_repository_plural: Dépôts
               label_browse: Parcourir
               label_revision: "Révision "
               label_revision_plural: Révisions
               label_associated_revisions: Révisions associées
               label_added: ajouté
               label_modified: modifié
               label_copied: copié
               label_renamed: renommé
               label_deleted: supprimé
               label_latest_revision: Dernière révision
               label_latest_revision_plural: Dernières révisions
               label_view_revisions: Voir les révisions
               label_max_size: Taille maximale
               label_sort_highest: Remonter en premier
               label_sort_higher: Remonter
               label_sort_lower: Descendre
               label_sort_lowest: Descendre en dernier
               label_roadmap: Roadmap
               label_roadmap_due_in: "Échéance dans %{value}"
               label_roadmap_overdue: "En retard de %{value}"
               label_roadmap_no_issues: Aucune demande pour cette version
               label_search: "Recherche "
               label_result_plural: Résultats
               label_all_words: Tous les mots
               label_wiki: Wiki
               label_wiki_edit: Révision wiki
               label_wiki_edit_plural: Révisions wiki
               label_wiki_page: Page wiki
               label_wiki_page_plural: Pages wiki
               label_index_by_title: Index par titre
               label_index_by_date: Index par date
               label_current_version: Version actuelle
               label_preview: Prévisualisation
               label_feed_plural: Flux Atom
               label_changes_details: Détails de tous les changements
               label_issue_tracking: Suivi des demandes
               label_spent_time: Temps passé
               label_f_hour: "%{value} heure"
               label_f_hour_plural: "%{value} heures"
               label_time_tracking: Suivi du temps
               label_change_plural: Changements
               label_statistics: Statistiques
               label_commits_per_month: Commits par mois
               label_commits_per_author: Commits par auteur
               label_view_diff: Voir les différences
               label_diff_inline: en ligne
               label_diff_side_by_side: côte à côte
               label_options: Options
               label_copy_workflow_from: Copier le workflow de
               label_permissions_report: Synthèse des permissions
               label_watched_issues: Demandes surveillées
               label_related_issues: Demandes liées
               label_applied_status: Statut appliqué
               label_loading: Chargement...
               label_relation_new: Nouvelle relation
               label_relation_delete: Supprimer la relation
               label_relates_to: Lié à
               label_duplicates: Duplique
               label_duplicated_by: Dupliqué par
               label_blocks: Bloque
               label_blocked_by: Bloqué par
               label_precedes: Précède
               label_follows: Suit
               label_copied_to: Copié vers
               label_copied_from: Copié depuis
               label_end_to_start: fin à début
               label_end_to_end: fin à fin
               label_start_to_start: début à début
               label_start_to_end: début à fin
               label_stay_logged_in: Rester connecté
               label_disabled: désactivé
               label_show_completed_versions: Voir les versions passées
               label_me: moi
               label_board: Forum
               label_board_new: Nouveau forum
               label_board_plural: Forums
               label_topic_plural: Discussions
               label_message_plural: Messages
               label_message_last: Dernier message
               label_message_new: Nouveau message
               label_message_posted: Message ajouté
               label_reply_plural: Réponses
               label_send_information: Envoyer les informations à l'utilisateur
               label_year: Année
               label_month: Mois
               label_week: Semaine
               label_date_from: Du
               label_date_to: Au
               label_language_based: Basé sur la langue de l'utilisateur
               label_sort_by: "Trier par %{value}"
               label_send_test_email: Envoyer un email de test
               label_feeds_access_key_created_on: "Clé d'accès Atom créée il y a %{value}"
               label_module_plural: Modules
               label_added_time_by: "Ajouté par %{author} il y a %{age}"
               label_updated_time_by: "Mis à jour par %{author} il y a %{age}"
               label_updated_time: "Mis à jour il y a %{value}"
               label_jump_to_a_project: Aller à un projet...
               label_file_plural: Fichiers
               label_changeset_plural: Révisions
               label_default_columns: Colonnes par défaut
               label_no_change_option: (Pas de changement)
               label_bulk_edit_selected_issues: Modifier les demandes sélectionnées
               label_theme: Thème
               label_default: Défaut
               label_search_titles_only: Uniquement dans les titres
               label_user_mail_option_all: "Pour tous les événements de tous mes projets"
               label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
               label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements que j'effectue"
               label_registration_activation_by_email: activation du compte par email
               label_registration_manual_activation: activation manuelle du compte
               label_registration_automatic_activation: activation automatique du compte
               label_display_per_page: "Par page : %{value}"
               label_age: Âge
               label_change_properties: Changer les propriétés
               label_general: Général
               label_more: Plus
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: Authentification LDAP
               label_downloads_abbr: D/L
               label_optional_description: Description facultative
               label_add_another_file: Ajouter un autre fichier
               label_preferences: Préférences
               label_chronological_order: Dans l'ordre chronologique
               label_reverse_chronological_order: Dans l'ordre chronologique inverse
               label_planning: Planning
               label_incoming_emails: Emails entrants
               label_generate_key: Générer une clé
               label_issue_watchers: Observateurs
               label_example: Exemple
               label_display: Affichage
               label_sort: Tri
               label_ascending: Croissant
               label_descending: Décroissant
               label_date_from_to: Du %{start} au %{end}
               label_wiki_content_added: Page wiki ajoutée
               label_wiki_content_updated: Page wiki mise à jour
               label_group_plural: Groupes
               label_group: Groupe
               label_group_new: Nouveau groupe
               label_time_entry_plural: Temps passé
               label_version_sharing_none: Non partagé
               label_version_sharing_descendants: Avec les sous-projets
               label_version_sharing_hierarchy: Avec toute la hiérarchie
               label_version_sharing_tree: Avec tout l'arbre
               label_version_sharing_system: Avec tous les projets
               label_copy_source: Source
               label_copy_target: Cible
               label_copy_same_as_target: Comme la cible
               label_update_issue_done_ratios: Mettre à jour l'avancement des demandes
               label_display_used_statuses_only: N'afficher que les statuts utilisés dans ce tracker
               label_api_access_key: Clé d'accès API
               label_api_access_key_created_on: Clé d'accès API créée il y a %{value}
               label_feeds_access_key: Clé d'accès Atom
               label_missing_api_access_key: Clé d'accès API manquante
               label_missing_feeds_access_key: Clé d'accès Atom manquante
               label_close_versions: Fermer les versions terminées
               label_revision_id: Révision %{value}
               label_profile: Profil
               label_subtask_plural: Sous-tâches
               label_project_copy_notifications: Envoyer les notifications durant la copie du projet
               label_principal_search: "Rechercher un utilisateur ou un groupe :"
               label_user_search: "Rechercher un utilisateur :"
               label_additional_workflow_transitions_for_author: Autorisations supplémentaires lorsque l'utilisateur a créé la demande
               label_additional_workflow_transitions_for_assignee: Autorisations supplémentaires lorsque la demande est assignée à l'utilisateur
               label_issues_visibility_all: Toutes les demandes
               label_issues_visibility_public: Toutes les demandes non privées
               label_issues_visibility_own: Demandes créées par ou assignées à l'utilisateur
               label_export_options: Options d'exportation %{export_format}
               label_copy_attachments: Copier les fichiers
               label_copy_subtasks: Copier les sous-tâches
               label_item_position: "%{position} sur %{count}"
               label_completed_versions: Versions passées
               label_session_expiration: Expiration des sessions
               label_show_closed_projects: Voir les projets fermés
               label_status_transitions: Changements de statut
               label_fields_permissions: Permissions sur les champs
               label_readonly: Lecture
               label_required: Obligatoire
               label_attribute_of_project: "%{name} du projet"
               label_attribute_of_issue: "%{name} de la demande"
               label_attribute_of_author: "%{name} de l'auteur"
               label_attribute_of_assigned_to: "%{name} de l'assigné"
               label_attribute_of_user: "%{name} de l'utilisateur"
               label_attribute_of_fixed_version: "%{name} de la version cible"
               label_cross_project_descendants: Avec les sous-projets
               label_cross_project_tree: Avec tout l'arbre
               label_cross_project_hierarchy: Avec toute la hiérarchie
               label_cross_project_system: Avec tous les projets
               label_gantt_progress_line: Ligne de progression
               button_login: Connexion
               button_submit: Soumettre
               button_save: Sauvegarder
               button_check_all: Tout cocher
               button_uncheck_all: Tout décocher
               button_collapse_all: Plier tout
               button_expand_all: Déplier tout
               button_delete: Supprimer
               button_create: Créer
               button_create_and_continue: Créer et continuer
               button_test: Tester
               button_edit: Modifier
               button_add: Ajouter
               button_change: Changer
               button_apply: Appliquer
               button_clear: Effacer
               button_lock: Verrouiller
               button_unlock: Déverrouiller
               button_download: Télécharger
               button_list: Lister
               button_view: Voir
               button_move: Déplacer
               button_move_and_follow: Déplacer et suivre
               button_back: Retour
               button_cancel: Annuler
               button_activate: Activer
               button_sort: Trier
               button_log_time: Saisir temps
               button_rollback: Revenir à cette version
               button_watch: Surveiller
               button_unwatch: Ne plus surveiller
               button_reply: Répondre
               button_archive: Archiver
               button_unarchive: Désarchiver
               button_reset: Réinitialiser
               button_rename: Renommer
               button_change_password: Changer de mot de passe
               button_copy: Copier
               button_copy_and_follow: Copier et suivre
               button_annotate: Annoter
               button_update: Mettre à jour
               button_configure: Configurer
               button_quote: Citer
               button_duplicate: Dupliquer
               button_show: Afficher
               button_hide: Cacher
               button_edit_section: Modifier cette section
               button_export: Exporter
               button_delete_my_account: Supprimer mon compte
               button_close: Fermer
               button_reopen: Réouvrir
               status_active: actif
               status_registered: enregistré
               status_locked: verrouillé
               project_status_active: actif
               project_status_closed: fermé
               project_status_archived: archivé
               version_status_open: ouvert
               version_status_locked: verrouillé
               version_status_closed: fermé
               text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée
               text_regexp_info: ex. ^[A-Z0-9]+$
               text_min_max_length_info: 0 pour aucune restriction
               text_project_destroy_confirmation: Êtes-vous sûr de vouloir supprimer ce projet et toutes ses données ?
               text_subprojects_destroy_warning: "Ses sous-projets : %{value} seront également supprimés."
               text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
               text_are_you_sure: Êtes-vous sûr ?
               text_tip_issue_begin_day: tâche commençant ce jour
               text_tip_issue_end_day: tâche finissant ce jour
               text_tip_issue_begin_end_day: tâche commençant et finissant ce jour
               text_project_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et underscore sont autorisés, doit commencer par une minuscule.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
               text_caracters_maximum: "%{count} caractères maximum."
               text_caracters_minimum: "%{count} caractères minimum."
               text_length_between: "Longueur comprise entre %{min} et %{max} caractères."
               text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
               text_unallowed_characters: Caractères non autorisés
               text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
               text_line_separated: Plusieurs valeurs possibles (une valeur par ligne).
               text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
               text_issue_added: "La demande %{id} a été soumise par %{author}."
               text_issue_updated: "La demande %{id} a été mise à jour par %{author}."
               text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
               text_issue_category_destroy_question: "%{count} demandes sont affectées à cette catégorie. Que voulez-vous faire ?"
               text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
               text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
               text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
               text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé."
               text_load_default_configuration: Charger le paramétrage par défaut
               text_status_changed_by_changeset: "Appliqué par commit %{value}."
               text_time_logged_by_changeset: "Appliqué par commit %{value}"
               text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer la ou les demandes(s) selectionnée(s) ?'
               text_issues_destroy_descendants_confirmation: "Cela entrainera également la suppression de %{count} sous-tâche(s)."
               text_select_project_modules: 'Sélectionner les modules à activer pour ce projet :'
               text_default_administrator_account_changed: Compte administrateur par défaut changé
               text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture
               text_plugin_assets_writable: Répertoire public des plugins accessible en écriture
               text_rmagick_available: Bibliothèque RMagick présente (optionnelle)
               text_destroy_time_entries_question: "%{hours} heures ont été enregistrées sur les demandes à supprimer. Que voulez-vous faire ?"
               text_destroy_time_entries: Supprimer les heures
               text_assign_time_entries_to_project: Reporter les heures sur le projet
               text_reassign_time_entries: 'Reporter les heures sur cette demande:'
               text_user_wrote: "%{value} a écrit :"
               text_enumeration_destroy_question: "Cette valeur est affectée à %{count} objets."
               text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
               text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/configuration.yml et redémarrez l'application pour les activer."
               text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur Redmine associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés."
               text_diff_truncated: '... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.'
               text_custom_field_possible_values_info: 'Une ligne par valeur'
               text_wiki_page_destroy_question: "Cette page possède %{descendants} sous-page(s) et descendante(s). Que voulez-vous faire ?"
               text_wiki_page_nullify_children: "Conserver les sous-pages en tant que pages racines"
               text_wiki_page_destroy_children: "Supprimer les sous-pages et toutes leurs descedantes"
               text_wiki_page_reassign_children: "Réaffecter les sous-pages à cette page"
               text_own_membership_delete_confirmation: "Vous allez supprimer tout ou partie de vos permissions sur ce projet et ne serez peut-être plus autorisé à modifier ce projet.\nEtes-vous sûr de vouloir continuer ?"
               text_warn_on_leaving_unsaved: "Cette page contient du texte non sauvegardé qui sera perdu si vous quittez la page."
               text_issue_conflict_resolution_overwrite: "Appliquer quand même ma mise à jour (les notes précédentes seront conservées mais des changements pourront être écrasés)"
               text_issue_conflict_resolution_add_notes: "Ajouter mes notes et ignorer mes autres changements"
               text_issue_conflict_resolution_cancel: "Annuler ma mise à jour et réafficher %{link}"
               text_account_destroy_confirmation: "Êtes-vous sûr de vouloir continuer ?\nVotre compte sera définitivement supprimé, sans aucune possibilité de le réactiver."
               text_session_expiration_settings: "Attention : le changement de ces paramètres peut entrainer l'expiration des sessions utilisateurs en cours, y compris la vôtre."
               text_project_closed: Ce projet est fermé et accessible en lecture seule.
               text_turning_multiple_off: "Si vous désactivez les valeurs multiples, les valeurs multiples seront supprimées pour n'en conserver qu'une par objet."
               default_role_manager: "Manager "
               default_role_developer: "Développeur "
               default_role_reporter: "Rapporteur "
               default_tracker_bug: Anomalie
               default_tracker_feature: Evolution
               default_tracker_support: Assistance
               default_issue_status_new: Nouveau
               default_issue_status_in_progress: En cours
               default_issue_status_resolved: Résolu
               default_issue_status_feedback: Commentaire
               default_issue_status_closed: Fermé
               default_issue_status_rejected: Rejeté
               default_doc_category_user: Documentation utilisateur
               default_doc_category_tech: Documentation technique
               default_priority_low: Bas
               default_priority_normal: Normal
               default_priority_high: Haut
               default_priority_urgent: Urgent
               default_priority_immediate: Immédiat
               default_activity_design: Conception
               default_activity_development: Développement
               enumeration_issue_priorities: Priorités des demandes
               enumeration_doc_categories: Catégories des documents
               enumeration_activities: Activités (suivi du temps)
               label_greater_or_equal: ">="
               label_less_or_equal: "<="
               label_between: entre
               label_view_all_revisions: Voir toutes les révisions
               label_tag: Tag
               label_branch: Branche
               error_no_tracker_in_project: "Aucun tracker n'est associé à ce projet. Vérifier la configuration du projet."
               error_no_default_issue_status: "Aucun statut de demande n'est défini par défaut. Vérifier votre configuration (Administration -> Statuts de demandes)."
               text_journal_changed: "%{label} changé de %{old} à %{new}"
               text_journal_changed_no_detail: "%{label} mis à jour"
               text_journal_set_to: "%{label} mis à %{value}"
               text_journal_deleted: "%{label} %{old} supprimé"
               text_journal_added: "%{label} %{value} ajouté"
               enumeration_system_activity: Activité système
               label_board_sticky: Sticky
               label_board_locked: Verrouillé
               error_unable_delete_issue_status: Impossible de supprimer le statut de demande
               error_can_not_delete_custom_field: Impossible de supprimer le champ personnalisé
               error_unable_to_connect: Connexion impossible (%{value})
               error_can_not_remove_role: Ce rôle est utilisé et ne peut pas être supprimé.
               error_can_not_delete_tracker: Ce tracker contient des demandes et ne peut pas être supprimé.
               field_principal: Principal
               notice_failed_to_save_members: "Erreur lors de la sauvegarde des membres: %{errors}."
               text_zoom_out: Zoom arrière
               text_zoom_in: Zoom avant
               notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
               label_overall_spent_time: Temps passé global
               field_time_entries: Temps passé
               project_module_gantt: Gantt
               project_module_calendar: Calendrier
               button_edit_associated_wikipage: "Modifier la page wiki associée: %{page_title}"
               field_text: Champ texte
               label_user_mail_option_only_owner: Seulement pour ce que j'ai créé
               setting_default_notification_option: Option de notification par défaut
               label_user_mail_option_only_my_events: Seulement pour ce que je surveille
               label_user_mail_option_only_assigned: Seulement pour ce qui m'est assigné
               label_user_mail_option_none: Aucune notification
               field_member_of_group: Groupe de l'assigné
               field_assigned_to_role: Rôle de l'assigné
               setting_emails_header: En-tête des emails
               label_bulk_edit_selected_time_entries: Modifier les temps passés sélectionnés
               text_time_entries_destroy_confirmation: "Etes-vous sûr de vouloir supprimer les temps passés sélectionnés ?"
               field_scm_path_encoding: Encodage des chemins
               text_scm_path_encoding_note: "Défaut : UTF-8"
               field_path_to_repository: Chemin du dépôt
               field_root_directory: Répertoire racine
               field_cvs_module: Module
               field_cvsroot: CVSROOT
               text_mercurial_repository_note: "Dépôt local (exemples : /hgrepo, c:\\hgrepo)"
               text_scm_command: Commande
               text_scm_command_version: Version
               label_git_report_last_commit: Afficher le dernier commit des fichiers et répertoires
               text_scm_config: Vous pouvez configurer les commandes des SCM dans config/configuration.yml. Redémarrer l'application après modification.
               text_scm_command_not_available: Ce SCM n'est pas disponible. Vérifier les paramètres dans la section administration.
               label_diff: diff
               text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
               description_query_sort_criteria_direction: Ordre de tri
               description_project_scope: Périmètre de recherche
               description_filter: Filtre
               description_user_mail_notification: Option de notification
               description_date_from: Date de début
               description_message_content: Contenu du message
               description_available_columns: Colonnes disponibles
               description_all_columns: Toutes les colonnes
               description_date_range_interval: Choisir une période
               description_issue_category_reassign: Choisir une catégorie
               description_search: Champ de recherche
               description_notes: Notes
               description_date_range_list: Choisir une période prédéfinie
               description_choose_project: Projets
               description_date_to: Date de fin
               description_query_sort_criteria_attribute: Critère de tri
               description_wiki_subpages_reassign: Choisir une nouvelle page parent
               description_selected_columns: Colonnes sélectionnées
               label_parent_revision: Parent
               label_child_revision: Enfant
               error_scm_annotate_big_text_file: Cette entrée ne peut pas être annotée car elle excède la taille maximale.
               setting_repositories_encodings: Encodages des fichiers et des dépôts
               label_search_for_watchers: Rechercher des observateurs
               text_repository_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et underscore sont autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'

config/routes.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
+              get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
               delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               delete 'watchers', :to => 'watchers#destroy'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
               delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 shallow do
                   resources :memberships, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                     collection do
                       get 'autocomplete'
                     end
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create] do
                   resources :time_entries, :controller => 'timelog' do
                     collection do
                       get 'report'
                     end
                   end
                 end
                 # issue form update
                 match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 shallow do
                   resources :issue_categories
                 end
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 shallow do
                   resources :repositories, :except => [:index, :show] do
                     member do
                       match 'committers', :via => [:get, :post]
                     end
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
               get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
                 collection do
                   get 'autocomplete_for_new_user'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

test/functional/account_controller_test.rb +43 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class AccountControllerTest < ActionController::TestCase
               fixtures :users, :roles
               def setup
                 User.current = nil
               end
               def test_get_login
                 get :login
                 assert_response :success
                 assert_template 'login'
                 assert_select 'input[name=username]'
                 assert_select 'input[name=password]'
               end
               def test_get_login_while_logged_in_should_redirect_to_home
                 @request.session[:user_id] = 2
                 get :login
                 assert_redirected_to '/'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_login_should_redirect_to_back_url_param
                 # request.uri is "test.host" in test environment
                 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'
                 assert_redirected_to '/issues/show/1'
               end
               def test_login_should_not_redirect_to_another_host
                 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.foo/fake'
                 assert_redirected_to '/my/page'
               end
               def test_login_with_wrong_password
                 post :login, :username => 'admin', :password => 'bad'
                 assert_response :success
                 assert_template 'login'
                 assert_select 'div.flash.error', :text => /Invalid user or password/
                 assert_select 'input[name=username][value=admin]'
                 assert_select 'input[name=password]'
                 assert_select 'input[name=password][value]', 0
               end
+              def test_login_with_locked_account_should_fail
+                User.find(2).update_attribute :status, User::STATUS_LOCKED
+                post :login, :username => 'jsmith', :password => 'jsmith'
+                assert_redirected_to '/login'
+                assert_include 'locked', flash[:error]
+                assert_nil @request.session[:user_id]
+              end
+              def test_login_as_registered_user_with_manual_activation_should_inform_user
+                User.find(2).update_attribute :status, User::STATUS_REGISTERED
+                with_settings :self_registration => '2', :default_language => 'en' do
+                  post :login, :username => 'jsmith', :password => 'jsmith'
+                  assert_redirected_to '/login'
+                  assert_include 'pending administrator approval', flash[:error]
+                end
+              end
+              def test_login_as_registered_user_with_email_activation_should_propose_new_activation_email
+                User.find(2).update_attribute :status, User::STATUS_REGISTERED
+                with_settings :self_registration => '1', :default_language => 'en' do
+                  post :login, :username => 'jsmith', :password => 'jsmith'
+                  assert_redirected_to '/login'
+                  assert_equal 2, @request.session[:registered_user_id]
+                  assert_include 'new activation email', flash[:error]
+                end
+              end
               def test_login_should_rescue_auth_source_exception
                 source = AuthSource.create!(:name => 'Test')
                 User.find(2).update_attribute :auth_source_id, source.id
                 AuthSource.any_instance.stubs(:authenticate).raises(AuthSourceException.new("Something wrong"))
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 500
                 assert_error_tag :content => /Something wrong/
               end
               def test_login_should_reset_session
                 @controller.expects(:reset_session).once
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 302
               end
               def test_get_logout_should_not_logout
                 @request.session[:user_id] = 2
                 get :logout
                 assert_response :success
                 assert_template 'logout'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_logout
                 @request.session[:user_id] = 2
                 post :logout
                 assert_redirected_to '/'
                 assert_nil @request.session[:user_id]
               end
               def test_logout_should_reset_session
                 @controller.expects(:reset_session).once
                 @request.session[:user_id] = 2
                 post :logout
                 assert_response 302
               end
               def test_get_register_with_registration_on
                 with_settings :self_registration => '3' do
                   get :register
                   assert_response :success
                   assert_template 'register'
                   assert_not_nil assigns(:user)
                   assert_select 'input[name=?]', 'user[password]'
                   assert_select 'input[name=?]', 'user[password_confirmation]'
                 end
               end
               def test_get_register_should_detect_user_language
                 with_settings :self_registration => '3' do
                   @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                   get :register
                   assert_response :success
                   assert_not_nil assigns(:user)
                   assert_equal 'fr', assigns(:user).language
                   assert_select 'select[name=?]', 'user[language]' do
                     assert_select 'option[value=fr][selected=selected]'
                   end
                 end
               end
               def test_get_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   get :register
                   assert_redirected_to '/'
                 end
               end
               # See integration/account_test.rb for the full test
               def test_post_register_with_registration_on
                 with_settings :self_registration => '3' do
                   assert_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'secret123',
                       :password_confirmation => 'secret123',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/my/account'
                   end
                   user = User.first(:order => 'id DESC')
                   assert_equal 'register', user.login
                   assert_equal 'John', user.firstname
                   assert_equal 'Doe', user.lastname
                   assert_equal 'register@example.com', user.mail
                   assert user.check_password?('secret123')
                   assert user.active?
                 end
               end
               def test_post_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   assert_no_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'test',
                       :password_confirmation => 'test',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/'
                   end
                 end
               end
               def test_get_lost_password_should_display_lost_password_form
                 get :lost_password
                 assert_response :success
                 assert_select 'input[name=mail]'
               end
               def test_lost_password_for_active_user_should_create_a_token
                 Token.delete_all
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'ActionMailer::Base.deliveries.size' do
                   assert_difference 'Token.count' do
                     with_settings :host_name => 'mydomain.foo', :protocol => 'http' do
                       post :lost_password, :mail => 'JSmith@somenet.foo'
                       assert_redirected_to '/login'
                     end
                   end
                 end
                 token = Token.order('id DESC').first
                 assert_equal User.find(2), token.user
                 assert_equal 'recovery', token.action
                 assert_select_email do
                   assert_select "a[href=?]", "http://mydomain.foo/account/lost_password?token=#{token.value}"
                 end
               end
               def test_lost_password_for_unknown_user_should_fail
                 Token.delete_all
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'invalid@somenet.foo'
                   assert_response :success
                 end
               end
               def test_lost_password_for_non_active_user_should_fail
                 Token.delete_all
                 assert User.find(2).lock!
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'JSmith@somenet.foo'
-                  assert_response :success
+                  assert_redirected_to '/account/lost_password'
                 end
               end
               def test_get_lost_password_with_token_should_display_the_password_recovery_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 get :lost_password, :token => token.value
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_get_lost_password_with_invalid_token_should_redirect
                 get :lost_password, :token => "abcdef"
                 assert_redirected_to '/'
               end
               def test_post_lost_password_with_token_should_change_the_user_password
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/login'
                 user.reload
                 assert user.check_password?('newpass123')
                 assert_nil Token.find_by_id(token.id), "Token was not deleted"
               end
               def test_post_lost_password_with_token_for_non_active_user_should_fail
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 user.lock!
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/'
                 assert ! user.check_password?('newpass123')
               end
               def test_post_lost_password_with_token_and_password_confirmation_failure_should_redisplay_the_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'wrongpass'
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_not_nil Token.find_by_id(token.id), "Token was deleted"
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_post_lost_password_with_invalid_token_should_redirect
                 post :lost_password, :token => "abcdef", :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to '/'
               end
+              def test_activation_email_should_send_an_activation_email
+                User.find(2).update_attribute :status, User::STATUS_REGISTERED
+                @request.session[:registered_user_id] = 2
+                with_settings :self_registration => '1' do
+                  assert_difference 'ActionMailer::Base.deliveries.size' do
+                    get :activation_email
+                    assert_redirected_to '/login'
+                  end
+                end
+              end
             end

test/integration/account_test.rb +45 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             begin
               require 'mocha/setup'
             rescue
               # Won't run some tests
             end
             class AccountTest < ActionController::IntegrationTest
               fixtures :users, :roles
               # Replace this with your real tests.
               def test_login
                 get "my/page"
                 assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fmy%2Fpage"
                 log_user('jsmith', 'jsmith')
                 get "my/account"
                 assert_response :success
                 assert_template "my/account"
               end
               def test_autologin
                 user = User.find(1)
                 Setting.autologin = "7"
                 Token.delete_all
                 # User logs in with 'autologin' checked
                 post '/login', :username => user.login, :password => 'admin', :autologin => 1
                 assert_redirected_to '/my/page'
                 token = Token.first
                 assert_not_nil token
                 assert_equal user, token.user
                 assert_equal 'autologin', token.action
                 assert_equal user.id, session[:user_id]
                 assert_equal token.value, cookies['autologin']
                 # Session is cleared
                 reset!
                 User.current = nil
                 # Clears user's last login timestamp
                 user.update_attribute :last_login_on, nil
                 assert_nil user.reload.last_login_on
                 # User comes back with his autologin cookie
                 cookies[:autologin] = token.value
                 get '/my/page'
                 assert_response :success
                 assert_template 'my/page'
                 assert_equal user.id, session[:user_id]
                 assert_not_nil user.reload.last_login_on
               end
               def test_autologin_should_use_autologin_cookie_name
                 Token.delete_all
                 Redmine::Configuration.stubs(:[]).with('autologin_cookie_name').returns('custom_autologin')
                 Redmine::Configuration.stubs(:[]).with('autologin_cookie_path').returns('/')
                 Redmine::Configuration.stubs(:[]).with('autologin_cookie_secure').returns(false)
                 with_settings :autologin => '7' do
                   assert_difference 'Token.count' do
                     post '/login', :username => 'admin', :password => 'admin', :autologin => 1
                   end
                   assert_response 302
                   assert cookies['custom_autologin'].present?
                   token = cookies['custom_autologin']
                   # Session is cleared
                   reset!
                   cookies['custom_autologin'] = token
                   get '/my/page'
                   assert_response :success
                   assert_difference 'Token.count', -1 do
                     post '/logout'
                   end
                   assert cookies['custom_autologin'].blank?
                 end
               end
               def test_lost_password
                 Token.delete_all
                 get "account/lost_password"
                 assert_response :success
                 assert_template "account/lost_password"
                 assert_select 'input[name=mail]'
                 post "account/lost_password", :mail => 'jSmith@somenet.foo'
                 assert_redirected_to "/login"
                 token = Token.first
                 assert_equal 'recovery', token.action
                 assert_equal 'jsmith@somenet.foo', token.user.mail
                 assert !token.expired?
                 get "account/lost_password", :token => token.value
                 assert_response :success
                 assert_template "account/password_recovery"
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
                 assert_select 'input[name=new_password]'
                 assert_select 'input[name=new_password_confirmation]'
                 post "account/lost_password",
                      :token => token.value, :new_password => 'newpass123',
                      :new_password_confirmation => 'newpass123'
                 assert_redirected_to "/login"
                 assert_equal 'Password was successfully updated.', flash[:notice]
                 log_user('jsmith', 'newpass123')
                 assert_equal 0, Token.count
               end
               def test_register_with_automatic_activation
                 Setting.self_registration = '3'
                 get 'account/register'
                 assert_response :success
                 assert_template 'account/register'
                 post 'account/register',
                      :user => {:login => "newuser", :language => "en",
                                :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
                                :password => "newpass123", :password_confirmation => "newpass123"}
                 assert_redirected_to '/my/account'
                 follow_redirect!
                 assert_response :success
                 assert_template 'my/account'
                 user = User.find_by_login('newuser')
                 assert_not_nil user
                 assert user.active?
                 assert_not_nil user.last_login_on
               end
               def test_register_with_manual_activation
                 Setting.self_registration = '2'
                 post 'account/register',
                      :user => {:login => "newuser", :language => "en",
                                :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
                                :password => "newpass123", :password_confirmation => "newpass123"}
                 assert_redirected_to '/login'
                 assert !User.find_by_login('newuser').active?
               end
               def test_register_with_email_activation
                 Setting.self_registration = '1'
                 Token.delete_all
                 post 'account/register',
                      :user => {:login => "newuser", :language => "en",
                                :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
                                :password => "newpass123", :password_confirmation => "newpass123"}
                 assert_redirected_to '/login'
                 assert !User.find_by_login('newuser').active?
                 token = Token.first
                 assert_equal 'register', token.action
                 assert_equal 'newuser@foo.bar', token.user.mail
                 assert !token.expired?
                 get 'account/activate', :token => token.value
                 assert_redirected_to '/login'
                 log_user('newuser', 'newpass123')
               end
               def test_onthefly_registration
                 # disable registration
                 Setting.self_registration = '0'
                 AuthSource.expects(:authenticate).returns(
                   {:login => 'foo', :firstname => 'Foo', :lastname => 'Smith',
                    :mail => 'foo@bar.com', :auth_source_id => 66})
                 post '/login', :username => 'foo', :password => 'bar'
                 assert_redirected_to '/my/page'
                 user = User.find_by_login('foo')
                 assert user.is_a?(User)
                 assert_equal 66, user.auth_source_id
                 assert user.hashed_password.blank?
               end
               def test_onthefly_registration_with_invalid_attributes
                 # disable registration
                 Setting.self_registration = '0'
                 AuthSource.expects(:authenticate).returns(
                   {:login => 'foo', :lastname => 'Smith', :auth_source_id => 66})
                 post '/login', :username => 'foo', :password => 'bar'
                 assert_response :success
                 assert_template 'account/register'
                 assert_tag :input, :attributes => { :name => 'user[firstname]', :value => '' }
                 assert_tag :input, :attributes => { :name => 'user[lastname]', :value => 'Smith' }
                 assert_no_tag :input, :attributes => { :name => 'user[login]' }
                 assert_no_tag :input, :attributes => { :name => 'user[password]' }
                 post 'account/register',
                      :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'}
                 assert_redirected_to '/my/account'
                 user = User.find_by_login('foo')
                 assert user.is_a?(User)
                 assert_equal 66, user.auth_source_id
                 assert user.hashed_password.blank?
               end
+              def test_registered_user_should_be_able_to_get_a_new_activation_email
+                Token.delete_all
+                with_settings :self_registration => '1', :default_language => 'en' do
+                  # register a new account
+                  assert_difference 'User.count' do
+                    assert_difference 'Token.count' do
+                      post 'account/register',
+                         :user => {:login => "newuser", :language => "en",
+                                   :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
+                                   :password => "newpass123", :password_confirmation => "newpass123"}
+                    end
+                  end
+                  user = User.order('id desc').first
+                  assert_equal User::STATUS_REGISTERED, user.status
+                  reset!
+                  # try to use "lost password"
+                  assert_no_difference 'ActionMailer::Base.deliveries.size' do
+                    post '/account/lost_password', :mail => 'newuser@foo.bar'
+                  end
+                  assert_redirected_to '/account/lost_password'
+                  follow_redirect!
+                  assert_response :success
+                  assert_select 'div.flash', :text => /new activation email/
+                  assert_select 'div.flash a[href=/account/activation_email]'
+                  # request a new action activation email
+                  assert_difference 'ActionMailer::Base.deliveries.size' do
+                    get '/account/activation_email'
+                  end
+                  assert_redirected_to '/login'
+                  token = Token.order('id desc').first
+                  activation_path = "/account/activate?token=#{token.value}"
+                  assert_include activation_path, mail_body(ActionMailer::Base.deliveries.last)
+                  # activate the account
+                  get activation_path
+                  assert_redirected_to '/login'
+                  post '/login', :username => 'newuser', :password => 'newpass123'
+                  assert_redirected_to '/my/page'
+                end
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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