jro_apps/redmine Commit - r15:18ee1fef4172

notice messages translation...

Jean-Philippe Lang -

r15:18ee1fef4172

parent child

Context file:

r15:18ee1fef4172

Expand all files

redmine/app/controllers/account_controller.rb +9 -4

             # redMine - project management software
             # Copyright (C) 2006  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
               layout 'base'
               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, :only => [:login, :lost_password, :register]
               before_filter :require_login, :except => [:show, :login, :lost_password, :register]
               # Show user's account
               def show
                 @user = User.find(params[:id])
               end
               # Login request and validation
               def login
                 if request.get?
                   # Logout user
                   self.logged_in_user = nil
                 else
                   # Authenticate user
                   user = User.try_to_login(params[:login], params[:password])
                   if user
                     self.logged_in_user = user
                     redirect_back_or_default :controller => 'account', :action => 'my_page'
                   else
                     flash.now[:notice] = l(:notice_account_invalid_creditentials)
                   end
                 end
               end
               # Log out current user and redirect to welcome page
               def logout
                 self.logged_in_user = nil
                 redirect_to :controller => ''
               end
               # Show logged in user's page
               def my_page
                 @user = self.logged_in_user
                 @reported_issues = Issue.find(:all, :conditions => ["author_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
                 @assigned_issues = Issue.find(:all, :conditions => ["assigned_to_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
               end
               # Edit logged in user's account
               def my_account
                 @user = self.logged_in_user
                 if request.post? and @user.update_attributes(@params[:user])
                   set_localization
                   flash.now[:notice] = l(:notice_account_updated)
                   self.logged_in_user.reload
                 end
               end
               # Change logged in user's password
               def change_password
                 @user = self.logged_in_user
-                flash.now[:notice] = l(:notice_can_t_change_password) and render :action => 'my_account' and return if @user.auth_source_id
+                flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'my_account' and return if @user.auth_source_id
                 if @user.check_password?(@params[:password])
                   @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-                  flash.now[:notice] = l(:notice_account_password_updated) if @user.save
+                  if @user.save
+                    flash[:notice] = l(:notice_account_password_updated)
+                  else
+                    render :action => 'my_account'
+                    return
+                  end
                 else
-                  flash.now[:notice] = l(:notice_account_wrong_password)
+                  flash[:notice] = l(:notice_account_wrong_password)
                 end
-                render :action => 'my_account'
+                redirect_to :action => 'my_account'
               end
               # Enable user to choose a new password
               def lost_password
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
                   redirect_to :controller => '' and return unless @token and !@token.expired?
                   @user = @token.user
                   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 :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
                     # user not found in db
                     flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
                     # user uses an external authentification
                     flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
                       # send token to user via email
                       Mailer.set_language_if_valid(user.language)
                       Mailer.deliver_lost_password(token)
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 redirect_to :controller => '' and return if $RDM_SELF_REGISTRATION == false
                 if params[:token]
                   token = Token.find_by_action_and_value("register", params[:token])
                   redirect_to :controller => '' and return unless token and !token.expired?
                   user = token.user
                   redirect_to :controller => '' and return unless user.status == User::STATUS_REGISTERED
                   user.status = User::STATUS_ACTIVE
                   if user.save
                     token.destroy
                     flash[:notice] = l(:notice_account_activated)
                     redirect_to :action => 'login'
                     return
                   end
                 else
                   if request.get?
                     @user = User.new(:language => $RDM_DEFAULT_LANG)
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                   else
                     @user = User.new(params[:user])
                     @user.admin = false
                     @user.login = params[:user][:login]
                     @user.status = User::STATUS_REGISTERED
                     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                     token = Token.new(:user => @user, :action => "register")
                     if @user.save and token.save
                       Mailer.set_language_if_valid(@user.language)
                       Mailer.deliver_register(token)
                       flash[:notice] = l(:notice_account_register_done)
                       redirect_to :controller => ''
                     end
                   end
                 end
               end
             end

redmine/app/controllers/admin_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 AdminController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
               end
               def projects
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               def mail_options
                 @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
                 if request.post?
                   @actions.each { |a|
                     a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s
                     a.save
                   }
-                  flash[:notice] = "Mail options were successfully updated."
+                  flash.now[:notice] = l(:notice_successful_update)
                 end
               end
               def info
                 @adapter_name = ActiveRecord::Base.connection.adapter_name
               end
             end

redmine/app/controllers/application.rb +3 -5

             # redMine - project management software
             # Copyright (C) 2006  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 ApplicationController < ActionController::Base
               before_filter :check_if_login_required, :set_localization
               def logged_in_user=(user)
                 @logged_in_user = user
                 session[:user_id] = (user ? user.id : nil)
               end
               def logged_in_user
                 if session[:user_id]
                   @logged_in_user ||= User.find(session[:user_id], :include => :memberships)
                 else
                   nil
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 require_login if $RDM_LOGIN_REQUIRED
               end
               def set_localization
                 lang = begin
                   if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
                     self.logged_in_user.language
                   elsif request.env['HTTP_ACCEPT_LANGUAGE']
                     accept_lang = HTTPUtils.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
                     if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
                       accept_lang
                     end
                   end
                 rescue
                   nil
                 end || $RDM_DEFAULT_LANG
                 set_language_if_valid(lang)
               end
               def require_login
                 unless self.logged_in_user
                   store_location
-                  redirect_to(:controller => "account", :action => "login")
+                  redirect_to :controller => "account", :action => "login"
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 unless self.logged_in_user.admin?
-                  flash[:notice] = "Acces denied"
+                  render :nothing => true, :status => 403
-                  redirect_to:controller => ''
                   return false
                 end
                 true
               end
               # authorizes the user for the requested action.
               def authorize
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ]
                   return true
                 end
                 # if action is not public, force login
                 return unless require_login
                 # admin is always authorized
                 return true if self.logged_in_user.admin?
                 # if not admin, check membership permission
                 @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])
                 if @user_membership and Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], @user_membership.role_id )
                   return true
                 end
-                flash[:notice] = "Acces denied"
+                render :nothing => true, :status => 403
-                redirect_to :controller => ''
                 false
               end
               # store current uri in session.
               # return to this location by calling redirect_back_or_default
               def store_location
                 session[:return_to] = @request.request_uri
               end
               # move to the last store_location call or to the passed default one
               def redirect_back_or_default(default)
                 if session[:return_to].nil?
                   redirect_to default
                 else
                   redirect_to_url session[:return_to]
                   session[:return_to] = nil
                 end
               end
             end

redmine/app/controllers/custom_fields_controller.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006  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 CustomFieldsController < ApplicationController
               layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               def list
                 @custom_field_pages, @custom_fields = paginate :custom_fields, :per_page => 15
               end
               def new
                 case params[:type]
                   when "IssueCustomField"
                     @custom_field = IssueCustomField.new(params[:custom_field])
                     @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
                   when "UserCustomField"
                     @custom_field = UserCustomField.new(params[:custom_field])
                   when "ProjectCustomField"
                     @custom_field = ProjectCustomField.new(params[:custom_field])
                   else
                     redirect_to :action => 'list'
                     return
                 end
                 if request.post? and @custom_field.save
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)
               end
               def edit
                 @custom_field = CustomField.find(params[:id])
                 if request.post? and @custom_field.update_attributes(params[:custom_field])
                   if @custom_field.is_a? IssueCustomField
                     @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
                   end
-                  flash[:notice] = 'Custom field was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)
               end
               def destroy
                 CustomField.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete custom field"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/documents_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 DocumentsController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
               def show
               end
               def edit
                 @categories = Enumeration::get_values('DCAT')
                 if request.post? and @document.update_attributes(params[:document])
-                  flash[:notice] = 'Document was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end
               def destroy
                 @document.destroy
                 redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
               end
               def download
                 @attachment = @document.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               end
               def add_attachment
                 # Save the attachment
                 if params[:attachment][:file].size > 0
                   @attachment = @document.attachments.build(params[:attachment])
                   @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   @attachment.save
                 end
                 render :action => 'show'
               end
               def destroy_attachment
                 @document.attachments.find(params[:attachment_id]).destroy
                 render :action => 'show'
               end
             private
             	def find_project
                 @document = Document.find(params[:id])
             		@project = @document.project
             	end
             end

redmine/app/controllers/issue_categories_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 IssueCategoriesController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
               def edit
                 if request.post? and @category.update_attributes(params[:category])
-                  flash[:notice] = 'Issue category was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
                 end
               end
               def destroy
                 @category.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project
               rescue
                 flash[:notice] = "Categorie can't be deleted"
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project
               end
             private
             	def find_project
                 @category = IssueCategory.find(params[:id])
             		@project = @category.project
             	end
             end

redmine/app/controllers/issue_statuses_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  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 IssueStatusesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               def list
                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 10
               end
               def new
                 @issue_status = IssueStatus.new
               end
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
-                  flash[:notice] = 'IssueStatus was successfully created.'
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @issue_status = IssueStatus.find(params[:id])
               end
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
-                  flash[:notice] = 'IssueStatus was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 IssueStatus.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/issues_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  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 IssuesController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
             	helper :custom_fields
             	include CustomFieldsHelper
             	def show
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
             	end
             	def edit
             		@priorities = Enumeration::get_values('IPRI')
             		if request.get?
             			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
             		else
             			# Retrieve custom fields and values
             			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
             			@issue.custom_values = @custom_values
             			@issue.attributes = params[:issue]
             			if @issue.save
-            				flash[:notice] = 'Issue was successfully updated.'
+            				flash[:notice] = l(:notice_successful_update)
             				redirect_to :action => 'show', :id => @issue
             			end
             		end
             	end
             	def change_status
             		@history = @issue.histories.build(params[:history])
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
             		if params[:confirm]
             				@history.author_id = self.logged_in_user.id if self.logged_in_user
             			if @history.save
             				@issue.status = @history.status
             				@issue.fixed_version_id = (params[:issue][:fixed_version_id])
             				@issue.assigned_to_id = (params[:issue][:assigned_to_id])
             				if @issue.save
-            					flash[:notice] = 'Issue was successfully updated.'
+            					flash[:notice] = l(:notice_successful_update)
             					Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
             					redirect_to :action => 'show', :id => @issue
             				end
             			end
             		end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
             	end
             	def destroy
             		@issue.destroy
             		redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
             	end
               def add_attachment
                 # Save the attachment
                 if params[:attachment][:file].size > 0
                   @attachment = @issue.attachments.build(params[:attachment])
                   @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   @attachment.save
                 end
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 @issue.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @issue
               end
               # Send the file in stream mode
               def download
                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               end
             private
               def find_project
                 @issue = Issue.find(params[:id])
                 @project = @issue.project
               end
             end

redmine/app/controllers/members_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  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 MembersController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
             	def edit
             		if request.post? and @member.update_attributes(params[:member])
-            			flash[:notice] = 'Member was successfully updated.'
+            			flash[:notice] = l(:notice_successful_update)
             			redirect_to :controller => 'projects', :action => 'settings', :id => @project
             		end
             	end
             	def destroy
             		@member.destroy
-                flash[:notice] = 'Member was successfully removed.'
+                flash[:notice] = l(:notice_successful_delete)
             		redirect_to :controller => 'projects', :action => 'settings', :id => @project
             	end
             private
             	def find_project
                 @member = Member.find(params[:id])
             		@project = @member.project
             	end
             end

redmine/app/controllers/news_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 NewsController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
               def show
               end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
-                  flash[:notice] = 'News was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end
             	def destroy
             		@news.destroy
             		redirect_to :controller => 'projects', :action => 'list_news', :id => @project
             	end
             private
             	def find_project
                 @news = News.find(params[:id])
             		@project = @news.project
             	end
             end

redmine/app/controllers/projects_controller.rb +10 -6

             # redMine - project management software
             # Copyright (C) 2006  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 ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
-                    flash[:notice] = 'Project was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField::find_all
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
                 @custom_values = ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
-                    flash[:notice] = 'Project was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
+              	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
-                    flash[:notice] = 'Member was successfully added.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Create the document if a file was sent
                   if params[:attachment][:file].size > 0
                     @attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
-                    flash[:notice] = "Issue was successfully added."
+                    flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 search_filter_update if params[:set_filter] or request.post?
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                 @issues = Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause
                 export = StringIO.new
                 CSV::Writer.generate(export, ',') do |csv|
                   csv << %w(Id Status Tracker Subject Author Created Updated)
                   @issues.each do |issue|
                     csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                   end
                 end
                 export.rewind
                 send_data(export.read,
                   :type => 'text/csv; charset=utf-8; header=present',
                   :filename => 'export.csv')
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
               end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
+                      flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog of @project
               def changelog
                 @fixed_issues = @project.issues.find(:all,
                                                    :include => [ :fixed_version, :status, :tracker ],
                                                    :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
                                                   )
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue
-                flash[:notice] = 'Project not found.'
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/roles_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  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 RolesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids]
                   if @role.save
-                    flash[:notice] = 'Role was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(@params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
-                  flash[:notice] = 'Role was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
-                    flash[:notice] = 'Workflow was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                   end
                 end
                 @roles = Role.find_all
                 @trackers = Tracker.find_all
                 @statuses = IssueStatus.find(:all, :include => :workflows)
               end
             end

redmine/app/controllers/trackers_controller.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006  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 TrackersController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :require_admin
+              before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10
               end
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
-                  flash[:notice] = 'Tracker was successfully created.'
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
-                  flash[:notice] = 'Tracker was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?
                   flash[:notice] = "This tracker contains issues and can\'t be deleted."
                 else
                   @tracker.destroy
                 end
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/users_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  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 UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
             								@params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
               end
               def add
                 if request.get?
                   @user = User.new(:language => $RDM_DEFAULT_LANG)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
-                    flash[:notice] = 'User was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
               end
               def edit
                 @user = User.find(params[:id])
                 if request.get?
                   @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 else
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty?
                   if params[:custom_fields]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
-                    flash[:notice] = 'User was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/versions_controller.rb +20 -19

             # redMine - project management software
             # Copyright (C) 2006  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 VersionsController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
-            	def edit
+              def edit
-            		if request.post? and @version.update_attributes(params[:version])
+                if request.post? and @version.update_attributes(params[:version])
-                  flash[:notice] = 'Version was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
-            		end
+                end
-            	end
+              end
-            	def destroy
+              def destroy
-            		@version.destroy
+                @version.destroy
-            		redirect_to :controller => 'projects', :action => 'settings', :id => @project
+                redirect_to :controller => 'projects', :action => 'settings', :id => @project
               rescue
                 flash[:notice] = "Unable to delete version"
-            		redirect_to :controller => 'projects', :action => 'settings', :id => @project
+                redirect_to :controller => 'projects', :action => 'settings', :id => @project
-            	end
+              end
               def download
                 @attachment = @version.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash[:notice]="Requested file doesn't exist or has been deleted."
+                flash[:notice] = l(:notice_file_not_found)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
               def destroy_file
                 @version.attachments.find(params[:attachment_id]).destroy
+                flash[:notice] = l(:notice_successful_delete)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
             private
-            	def find_project
+              def find_project
                 @version = Version.find(params[:id])
-            		@project = @version.project
+                @project = @version.project
-            	end
+              end
             end

redmine/app/helpers/application_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             module ApplicationHelper
               # return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # return true if user is loggend in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime(time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html =''
                 html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
                 html << (pagination_links(paginator, options, html_options) || '')
                 html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
                 html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg)
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, object.errors.count) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select
-                GLoc.valid_languages.collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+                (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
             end

redmine/app/helpers/custom_fields_helper.rb +8 -5

             # redMine - project management software
             # Copyright (C) 2006  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.
             module CustomFieldsHelper
               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
+                field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "string", "int", "date"
-                  text_field_tag field_name, custom_value.value
+                  text_field_tag field_name, custom_value.value, :id => field_id
                 when "text"
-                  text_area_tag field_name, custom_value.value, :cols => 60, :rows => 3
+                  text_area_tag field_name, custom_value.value, :id => field_id, :cols => 60, :rows => 3
                 when "bool"
-                  check_box_tag(field_name, "1", custom_value.value == "1") +
+                  check_box_tag(field_name, "1", custom_value.value == "1", :id => field_id) +
                   hidden_field_tag(field_name, "0")
                 when "list"
                   select_tag field_name,
                               "<option></option>" + options_for_select(custom_field.possible_values.split('|'),
-                              custom_value.value)
+                              custom_value.value), :id => field_id
                 end
               end
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
-            	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : "")
+            	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
+            	:for => "custom_fields_#{custom_value.custom_field.id}"
               end
               def custom_field_tag_with_label(custom_value)
                 case custom_value.custom_field.field_format
                 when "bool"
                   custom_field_tag(custom_value) + " " + custom_field_label_tag(custom_value)
                 else
                   custom_field_label_tag(custom_value) + "<br />" + custom_field_tag(custom_value)
                 end
               end
               def show_value(custom_value)
                 case custom_value.custom_field.field_format
                 when "bool"
                   l_YesNo(custom_value.value == "1")
                 else
                   custom_value.value
                 end
               end
               def custom_field_formats_for_select
                 CustomField::FIELD_FORMATS.keys.collect { |k| [ l(CustomField::FIELD_FORMATS[k]), k ] }
               end
             end

redmine/app/views/account/my_account.rhtml +3 -3

             <h2><%=l(:label_my_account)%></h2>
             <p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
             <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %>,
             <%=l(:field_updated_on)%>: <%= format_time(@user.updated_on) %></p>
             <%= error_messages_for 'user' %>
             <div class="splitcontentleft">
               <div class="box">
               <h3><%=l(:label_information_plural)%></h3>
-              &nbsp;
               <%= start_form_tag :action => 'my_account' %>
               <!--[form:user]-->
               <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'firstname'  %></p>
               <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'lastname'  %></p>
               <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/>
-              <%= text_field 'user', 'mail' %></p>
+              <%= text_field 'user', 'mail', :size => 40 %></p>
               <p><label for="user_language"><%=l(:field_language)%></label><br/>
               <%= select("user", "language", lang_options_for_select) %></p>
               <!--[eoform:user]-->
               <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             </div>
             <div class="splitcontentright">
             <% unless @user.auth_source_id %>
               <div class="box">
               <h3><%=l(:field_password)%></h3>
-              &nbsp;
               <%= start_form_tag :action => 'change_password' %>
               <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'password', nil, :size => 25 %></p>
               <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
               <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             <% end %>
             </div>

redmine/app/views/admin/mail_options.rhtml +12 -3

             <h2><%=l(:field_mail_notification)%></h2>
             <p><%=l(:text_select_mail_notifications)%></p>
             <%= start_form_tag ({}, :id => 'mail_options_form')%>
-            <% for action in @actions %>
-              <%= check_box_tag "action_ids[]", action.id, action.mail_enabled? %>
+            <% actions = @actions.group_by {|p| p.group_id } %>
-              <%= action.description %><br />
+            <% actions.keys.sort.each do |group_id| %>
+            <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
+            <% actions[group_id].each do |p| %>
+              <div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %>
+              <%= l(p.description.to_sym) %>
+              </div>
+            <% end %>
+            </fieldset>
             <% end %>
             <br />
             <p>
             <a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> |
             <a href="javascript:checkAll('mail_options_form', false)"><%=l(:button_uncheck_all)%></a>
             </p>
             <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/projects/show.rhtml +2 -4

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= @project.description %>
             	<ul>
             	<li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>
             	<% end %>
             	<% end %>
             	</ul>
               <div class="box">
                 <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
                   <%= lwr(:label_open_issues, issue_count) %>
                   </li>
                 <% end %>
                 </ul>
                 <% if authorize_for 'projects', 'add_issue' %>
                     &#187; <%=l(:label_issue_new)%>:
                     <ul>
                     <% @trackers.each do |tracker| %>
                     <li><%= link_to tracker.name, :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
                     <% end %>
                     </ul>
                 <% end %>
                 <center><small>[ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>
             		<% for member in @members %>
             		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
             		<% end %>
             	</div>
               <% if @subprojects %>
              	<div class="box">
             		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>
             		<% for subproject in @subprojects %>
             		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
             		<% end %>
             	</div>
               <% end %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <% for news in @news %>
-                  <p>
+                  <p><b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
-                  <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.summary %>
-                  <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
+                  <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small></p>
-                  </p>
                   <hr />
                 <% end %>
                 <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
               </div>
             </div>

redmine/lang/es.yml +17 -17

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre
             actionview_datehelper_select_month_names_abbr: Ene,Feb,Mar,Abr,Mayo,Jun,Jul,Ago,Sep,Oct,Nov,Dic
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
-            general_fmt_age: %d yr
+            general_fmt_age: %d año
-            general_fmt_age_plural: %d yrs
+            general_fmt_age_plural: %d años
-            general_fmt_date: %%b %%d, %%Y (%%a)
+            general_fmt_date: %%d/%%m/%%Y
-            general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
+            general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
-            general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+            general_fmt_datetime_short: %%d/%%m %%H:%%M
-            general_fmt_time: %%I:%%M %%p
+            general_fmt_time: %%H:%%M
             general_text_No: 'No'
-            general_text_Yes: 'Yes'
+            general_text_Yes: 'Sí'
             general_text_no: 'no'
-            general_text_yes: 'yes'
+            general_text_yes: 'sí'
             general_lang_es: 'Español'
             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.
             notice_account_unknown_email: Unknown user.
             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: Requested file doesn't exist or has been deleted.
             gui_validation_error: 1 error
-            gui_validation_error_plural: %d errors
+            gui_validation_error_plural: %d errores
             field_name: Nombre
             field_description: Descripción
             field_summary: Resumen
             field_is_required: Obligatorio
             field_firstname: Nombre
             field_lastname: Apellido
             field_mail: Email
             field_filename: Fichero
-            #field_filesize: Size
+            field_filesize: Tamaño
             field_downloads: Telecargas
             field_author: Autor
             field_created_on: Creado
             field_updated_on: Actualizado
-            #field_field_format: Format
+            field_field_format: Formato
             field_is_for_all: Para todos los proyectos
             field_possible_values: Valores posibles
             field_regexp: Expresión regular
             #field_min_length: Minimum length
             #field_max_length: Maximum length
             field_value: Valor
             field_category: Categoría
             field_title: Título
             field_project: Proyecto
             field_issue: Petición
             field_status: Estatuto
-            #field_notes: Notes
+            field_notes: Notas
             field_is_closed: Petición resuelta
             field_is_default: Estatuto por defecto
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Tema
             #field_due_date: Due date
             field_assigned_to: Asignado a
             field_priority: Prioridad
             field_fixed_version: Versión corregida
             field_user: Usuario
             field_role: Papel
             field_homepage: Sitio web
             field_is_public: Público
             #field_parent: Subproject de
             field_is_in_chlog: Consultar las peticiones en el histórico
             field_login: Identificador
             field_mail_notification: Notificación por mail
             field_admin: Administrador
             field_locked: Cerrado
             field_last_login_on: Última conexión
             field_language: Lengua
             field_effective_date: Fecha
             field_password: Contraseña
             field_new_password: Nueva contraseña
             field_password_confirmation: Confirmación
             field_version: Versión
             field_type: Tipo
             #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
             label_user: Usuario
             label_user_plural: Usuarios
             label_user_new: Nuevo usuario
             label_project: Proyecto
             label_project_new: Nuevo proyecto
             label_project_plural: Proyectos
             #label_project_latest: Latest projects
             label_issue: Petición
             label_issue_new: Nueva petición
             label_issue_plural: Peticiones
             label_issue_view_all: Ver todas las peticiones
             label_document: Documento
             label_document_new: Nuevo documento
             label_document_plural: Documentos
             label_role: Papel
             label_role_plural: Papeles
             label_role_new: Nuevo papel
             label_role_and_permissions: Papeles y permisos
             label_member: Miembro
             label_member_new: Nuevo miembro
             label_member_plural: Miembros
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nuevo tracker
             label_workflow: Workflow
             label_issue_status: Estatuto de petición
             label_issue_status_plural: Estatutos de las peticiones
             label_issue_status_new: Nuevo estatuto
             label_issue_category: Categoría de las peticiones
             label_issue_category_plural: Categorías de las peticiones
             label_issue_category_new: Nueva categoría
             label_custom_field: Campo personalizado
             label_custom_field_plural: Campos personalizados
             label_custom_field_new: Nuevo campo personalizado
             label_enumerations: Listas de valores
             label_enumeration_new: Nuevo valor
             label_information: Informacion
             label_information_plural: Informaciones
             label_please_login: Conexión
             #label_register: Register
-            #label_password_lost: Lost password
+            label_password_lost: ¿Olvidaste la contraseña?
             label_home: Acogida
             label_my_page: Mi página
             label_my_account: Mi cuenta
             label_my_projects: Mis proyectos
             label_administration: Administración
             label_login: Conexión
             label_logout: Desconexión
             label_help: Ayuda
             label_reported_issues: Peticiones registradas
             label_assigned_to_me_issues: Peticiones que me están asignadas
             label_last_login: Última conexión
             label_last_updates: Actualizado
             label_last_updates_plural: %d Actualizados
             label_registered_on: Inscrito el
             label_activity: Actividad
             label_new: Nuevo
             label_logged_as: Conectado como
             #label_environment: Environment
             #label_authentication: Authentication
             #label_auth_source: Authentification mode
             #label_auth_source_new: New authentication mode
             #label_auth_source_plural: Authentification modes
             #label_subproject: Subproject
             #label_subproject_plural: Subprojects
             #label_min_max_length: Min - Max length
             #label_list: List
             label_date: Fecha
             #label_integer: Integer
             #label_boolean: Boolean
             #label_string: String
             #label_text: Text
             #label_attribute: Attribute
             #label_attribute_plural: Attributes
             label_download: %d Telecarga
             label_download_plural: %d Telecargas
             #label_no_data: No data to display
             label_change_status: Cambiar el estatuto
             label_history: Histórico
             label_attachment: Fichero
             label_attachment_new: Nuevo fichero
             #label_attachment_delete: Delete file
             label_attachment_plural: Ficheros
             #label_report: Report
             #label_report_plural: Reports
             label_news: Noticia
             label_news_new: Nueva noticia
             label_news_plural: Noticias
             label_news_latest: Últimas noticias
             label_news_view_all: Ver todas las noticias
             label_change_log: Cambios
             label_settings: Configuración
             label_overview: Vistazo
             label_version: Versión
             label_version_new: Nueva versión
             label_version_plural: Versiónes
             label_confirmation: Confirmación
-            #label_export_csv: Export to CSV
+            label_export_csv: Exportar a CSV
             label_read: Leer...
             label_public_projects: Proyectos publicos
             label_open_issues: Abierta
             label_open_issues_plural: Abiertas
             label_closed_issues: Cerrada
             label_closed_issues_plural: Cerradas
             label_total: Total
             label_permissions: Permisos
             #label_current_status: Current status
             label_new_statuses_allowed: Nuevos estatutos autorizados
             label_all: Todos
             label_none: Ninguno
             label_next: Próximo
             label_previous: Precedente
             label_used_by: Utilizado por
             button_login: Conexión
             button_submit: Someter
             button_save: Validar
             button_check_all: Seleccionar todo
             button_uncheck_all: No seleccionar nada
             button_delete: Suprimir
             button_create: Crear
             button_test: Testar
             button_edit: Modificar
             button_add: Añadir
             button_change: Cambiar
             button_apply: Aplicar
             button_clear: Anular
             button_lock: Bloquear
             button_unlock: Desbloquear
             button_download: Telecargar
             button_list: Listar
             button_view: Ver
             text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 para ninguna restricción
             #text_possible_values_info: values separated with |
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
-            #default_role_manager: Manager
+            default_role_manager: Manager
-            #default_role_developper: Developer
+            default_role_developper: Desarrollador
-            #default_role_reporter: Reporter
+            default_role_reporter: Informador
             default_tracker_bug: Anomalía
             default_tracker_feature: Evolución
             default_tracker_support: Asistencia
             default_issue_status_new: Nuevo
             default_issue_status_assigned: Asignada
             default_issue_status_resolved: Resuelta
             default_issue_status_feedback: Comentario
             default_issue_status_closed: Cerrada
             default_issue_status_rejected: Rechazada
             default_doc_category_user: Documentación del usuario
             default_doc_category_tech: Documentación tecnica
             default_priority_low: Bajo
             default_priority_normal: Normal
             default_priority_high: Alto
             default_priority_urgent: Urgente
             default_priority_immediate: Ahora
             enumeration_issue_priorities: Prioridad de las peticiones
             enumeration_doc_categories: Categorías del documento

redmine/public/stylesheets/application.css +2 -2

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             }
             a{
             color:#467aa7;
             font-weight:bold;
             text-decoration:none;
             background-color:inherit;
             }
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{padding:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:5px auto;
             padding:1px 0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             border:2px solid #a0a0a0;
             }
             #header{
             height:5.5em;
             /*width:758px;*/
             margin:0 1px 1px 1px;
             background:#467aa7;
             color:#ffffff;
             }
             #header h1{
             padding:14px 0 0 20px;
             font-size:2.4em;
             background-color:inherit;
             color:#fff; /*rgb(152, 26, 33);*/
             letter-spacing:-2px;
             font-weight:normal;
             }
             #header h2{
             margin:10px 0 0 40px;
             font-size:1.4em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             /*width:758px;*/
             margin:0 1px;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             /*text-transform:uppercase;*/
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons links *******************/
             .picHome {	background: url(../images/home.png) no-repeat 4px 50%; }
             .picUser {	background: url(../images/user.png) no-repeat 4px 50%; }
             .picUserPage {	background: url(../images/user_page.png) no-repeat 4px 50%; }
             .picAdmin {	background: url(../images/admin.png) no-repeat 4px 50%; }
             .picProject { background: url(../images/projects.png) no-repeat 4px 50%; }
             .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
             .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
             /**************** Content styles ****************/
             #content{
             /*float:right;*/
             /*width:530px;*/
             width: auto;
             min-height: 500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             /*position: absolute;*/
             margin: 0 0 0 140px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2{
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#505050;
             background-color:inherit;
             }
             #content h2 a{font-weight:normal;}
-            #content h3{margin:0 0 5px 0; font-size:1.4em; letter-spacing:-1px;}
+            #content h3{margin:0 0 12px 0; font-size:1.4em; letter-spacing:-1px;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             /***********************************************/
             /*
             form{
             	padding:15px;
             	margin:0 0 20px 0;
             	border:1px solid #c0c0c0;
             	background-color:#CEE1ED;
             	width:600px;
             }
             */
             form {
             	display: inline;
             }
             .noborder {
             	border:0px;
             	background-color:#fff;
             	width:100%;
             }
             textarea {
                 padding:0;
                 margin:0;
             }
             input {
             	vertical-align: top;
             }
             input.button-small
             {
                 font-size: 0.8em;
             }
             select.select-small
             {
                border: 1px solid #7F9DB9;
               padding: 1px;
                font-size: 0.8em;
             }
             .active-filter
             {
               background-color: #F9FA9E;
             }
             label {
             	font-weight: bold;
             	font-size: 1em;
             }
             fieldset {
                 border:1px solid #7F9DB9;
                 padding: 6px;
             }
             legend {
                 color: #505050;
             }
             .required {
             	color: #bb0000;
             }
             table.listTableContent {
             	/*margin: 2em 2em 2em 0;	*/
             	border:1px solid #c0c0c0;
             	width:99%;
             }
             table.listTableContent td {
             	margin: 2px;
             }
             tr.ListHead {
             	background-color:#467aa7;
             	color:#FFFFFF;
             	text-align:center;
             }
             tr.ListHead a {
             	color:#FFFFFF;
             	text-decoration:underline;
             }
             tr.odd {
             	background-color: #C1E2F7;
             }
             tr.even {
             	background-color:#CEE1ED;
             }
-            hr { border:0px; border-bottom:1px dashed #000000; }
+            hr { border:none; border-bottom: dotted 2px #c0c0c0; }
             /**************** Sidebar styles ****************/
             #subcontent{
             float:left;
             clear:both;
             width:130px;
             padding:20px 20px 10px 5px;
             line-height:1.4em;
             }
             #subcontent h2{
             display:block;
             margin:0 0 15px 0;
             font-size:1.6em;
             font-weight:normal;
             text-align:left;
             letter-spacing:-1px;
             color:#505050;
             background-color:inherit;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.9em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:3px 0 3px 15px; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Searchbar styles ****************/
             #searchbar{margin:0 0 20px 0;}
             #searchbar form fieldset{margin-left:10px; border:0 solid;}
             #searchbar #s{
             height:1.2em;
             width:110px;
             margin:0 5px 0 0;
             border:1px solid #a0a0a0;
             }
             #searchbar #searchbutton{
             width:auto;
             padding:0 1px;
             border:1px solid #808080;
             font-size:0.9em;
             text-align:center;
             }
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             /*width:758px;*/
             padding:5px 0;
             margin:0 1px;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             .login {
             width: 50%;
             text-align: left;
             }

redmine/test/integration/account_test.rb +7 -2

             # redMine - project management software
             # Copyright (C) 2006  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.dirname(__FILE__)}/../test_helper"
             class AccountTest < ActionController::IntegrationTest
               fixtures :users
               # Replace this with your real tests.
               def test_login
                 get "account/my_page"
                 assert_redirected_to "account/login"
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
               end
               def test_change_password
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
                 assert_response :success
+                assert_template "account/my_account"
                 assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
+                post "account/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello"
+                assert_redirected_to "account/my_account"
+                assert_equal 'Wrong password', flash[:notice]
                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
-                assert_response :success
+                assert_redirected_to "account/my_account"
                 log_user('jsmith', 'hello')
               end
               def test_my_account
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
                 post "account/my_account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
                 assert_response :success
                 assert_template "account/my_account"
                 user = User.find(2)
                 assert_equal "Joe", user.firstname
                 assert_equal "jsmith", user.login
                 assert_equal false, user.admin?
               end
               def test_my_page
                 log_user('jsmith', 'jsmith')
                 get "account/my_page"
                 assert_response :success
                 assert_template "account/my_page"
               end
               def test_lost_password
                 get "account/lost_password"
                 assert_response :success
                 assert_template "account/lost_password"
                 post "account/lost_password", :mail => 'jsmith@somenet.foo'
                 assert_redirected_to "account/login"
                 token = Token.find(: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"
                 post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to "account/login"
                 assert_equal 'Password was successfully updated.', flash[:notice]
                 log_user('jsmith', 'newpass')
                 assert_equal 0, Token.count
               end
             end

redmine/test/integration/admin_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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.dirname(__FILE__)}/../test_helper"
             class AdminTest < ActionController::IntegrationTest
               fixtures :users
               def test_add_user
                 log_user("admin", "admin")
                 get "/users/add"
                 assert_response :success
                 assert_template "users/add"
                 post "/users/add", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
                 assert_redirected_to "users/list"
                 user = User.find_by_login("psmith")
                 assert_kind_of User, user
                 logged_user = User.try_to_login("psmith", "psmith09")
                 assert_kind_of User, logged_user
                 assert_equal "Paul", logged_user.firstname
                 post "users/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
                 assert_redirected_to "users/list"
                 locked_user = User.try_to_login("psmith", "psmith09")
                 assert_equal nil, locked_user
               end
               def test_add_project
                 log_user("admin", "admin")
                 get "projects/add"
                 assert_response :success
                 assert_template "projects/add"
                 post "projects/add", :project => { :name => "blog", :description => "weblog", :is_public => 1}
                 assert_redirected_to "admin/projects"
-                assert_equal 'Project was successfully created.', flash[:notice]
+                assert_equal 'Successful creation.', flash[:notice]
                 project = Project.find_by_name("blog")
                 assert_kind_of Project, project
                 assert_equal "weblog", project.description
                 assert_equal true, project.is_public?
                 get "admin/projects"
                 assert_response :success
                 assert_template "admin/projects"
               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