jro_apps/redmine Commit - r755:a96421019f3a

Search engines now supports pagination....

Jean-Philippe Lang -

r755:a96421019f3a

parent child

Context file:

r755:a96421019f3a

Expand all files

lib/plugins/acts_as_searchable/init.rb created 644 +2 0

@@ -0,0 +1,2
	1	require File.dirname(__FILE__) + '/lib/acts_as_searchable'
	2	ActiveRecord::Base.send(:include, Redmine::Acts::Searchable)

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb created 644 +89 0

@@ -0,0 +1,89
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Acts
	20	module Searchable
	21	def self.included(base)
	22	base.extend ClassMethods
	23	end
	24
	25	module ClassMethods
	26	def acts_as_searchable(options = {})
	27	return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
	28
	29	cattr_accessor :searchable_options
	30	self.searchable_options = options
	31
	32	if searchable_options[:columns].nil?
	33	raise 'No searchable column defined.'
	34	elsif !searchable_options[:columns].is_a?(Array)
	35	searchable_options[:columns] = [] << searchable_options[:columns]
	36	end
	37
	38	if searchable_options[:project_key]
	39	elsif column_names.include?('project_id')
	40	searchable_options[:project_key] = "#{table_name}.project_id"
	41	else
	42	raise 'No project key defined.'
	43	end
	44
	45	if searchable_options[:date_column]
	46	elsif column_names.include?('created_on')
	47	searchable_options[:date_column] = "#{table_name}.created_on"
	48	else
	49	raise 'No date column defined defined.'
	50	end
	51
	52	send :include, Redmine::Acts::Searchable::InstanceMethods
	53	end
	54	end
	55
	56	module InstanceMethods
	57	def self.included(base)
	58	base.extend ClassMethods
	59	end
	60
	61	module ClassMethods
	62	def search(tokens, all_tokens, project, options={})
	63	tokens = [] << tokens unless tokens.is_a?(Array)
	64	find_options = {:include => searchable_options[:include]}
	65	find_options[:limit] = options[:limit] if options[:limit]
	66	find_options[:order] = "#{searchable_options[:date_column]} " + (options[:before] ? 'DESC' : 'ASC')
	67
	68	sql = ([ '(' + searchable_options[:columns].collect {\|column\| "(LOWER(#{column}) LIKE ?)"}.join(' OR ') + ')' ] * tokens.size).join(all_tokens ? ' AND ' : ' OR ')
	69	if options[:offset]
	70	sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
	71	end
	72	find_options[:conditions] = [sql, * (tokens * searchable_options[:columns].size).sort]
	73
	74	results = with_scope(:find => {:conditions => ["#{searchable_options[:project_key]} = ?", project.id]}) do
	75	find(:all, find_options)
	76	end
	77	if searchable_options[:with]
	78	searchable_options[:with].each do \|model, assoc\|
	79	results += model.to_s.camelcase.constantize.search(tokens, all_tokens, project, options).collect {\|r\| r.send assoc}
	80	end
	81	results.uniq!
	82	end
	83	results
	84	end
	85	end
	86	end
	87	end
	88	end
	89	end

app/controllers/search_controller.rb +22 -15

             # 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 SearchController < ApplicationController
               layout 'base'
               helper :messages
               include MessagesHelper
               def index
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
+                offset = nil
+                begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                 # quick jump to an issue
                 if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
                   redirect_to :controller => "issues", :action => "show", :id => $1
                   return
                 end
                 if params[:id]
                   find_project
                   return unless check_project_privacy
                 end
                 if @project
-                  @object_types = %w(projects issues changesets news documents wiki_pages messages)
-                  @object_types.delete('wiki_pages') unless @project.wiki
-                  @object_types.delete('changesets') unless @project.repository
                   # only show what the user is allowed to view
+                  @object_types = %w(issues news documents changesets wiki_pages messages)
                   @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
                   @scope = @object_types.select {|t| params[t]}
-                  # default objects to search if none is specified in parameters
                   @scope = @object_types if @scope.empty?
                 else
                   @object_types = @scope = %w(projects)
                 end
                 # tokens must be at least 3 character long
                 @tokens = @question.split.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
                   operator = @all_words ? " AND " : " OR "
-                  limit = 10
                   @results = []
+                  limit = 10
                   if @project
-                    @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
+                    @scope.each do |s|
-                    Journal.with_scope :find => {:conditions => ["#{Issue.table_name}.project_id = ?", @project.id]} do
+                      @results += s.singularize.camelcase.constantize.search(like_tokens, @all_words, @project,
-                      @results += Journal.find(:all, :include => :issue, :limit => limit, :conditions => [ (["(LOWER(notes) like ? OR LOWER(notes) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ).collect(&:issue) if @scope.include? 'issues'
+                      :limit => (limit+1), :offset => offset, :before => params[:previous].nil?)
+                    end
+                    @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
+                    if params[:previous].nil?
+                      @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
+                      if @results.size > limit
+                        @pagination_next_date = @results[limit-1].event_datetime
+                        @results = @results[0, limit]
+                      end
+                    else
+                      @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
+                      if @results.size > limit
+                        @pagination_previous_date = @results[-(limit)].event_datetime
+                        @results = @results[-(limit), limit]
                       end
-                    @results.uniq!
-                    @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
-                    @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
-                    @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki_pages')
-                    @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comments) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
-                    Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do
-                      @results += Message.find(:all, :include => :board, :limit => limit, :conditions => [ (["(LOWER(subject) like ? OR LOWER(content) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'messages'
                     end
                   else
                     Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
                       @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects'
                     end
                     # if only one project is found, user is redirected to its overview
                     redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1
                   end
                   @question = @tokens.join(" ")
                 else
                   @question = ""
                 end
+                render :layout => false if request.xhr?
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/helpers/search_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 SearchHelper
               def highlight_tokens(text, tokens)
-                return text unless tokens && !tokens.empty?
+                return text unless text && tokens && !tokens.empty?
                 regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE
                 result = ''
                 text.split(regexp).each_with_index do |words, i|
                   if result.length > 1200
                     # maximum length of the preview reached
                     result << '...'
                     break
                   end
                   result << (i.even? ? h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', h(words), :class => 'highlight'))
                 end
                 result
               end
             end

app/models/changeset.rb +5 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Changeset < ActiveRecord::Base
               belongs_to :repository
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
                             :description => :comments,
                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
+              acts_as_searchable :columns => 'comments',
+                                 :include => :repository,
+                                 :project_key => "#{Repository.table_name}.project_id",
+                                 :date_column => 'committed_on'
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_numericality_of :revision, :only_integer => true
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def comments=(comment)
                 write_attribute(:comments, comment.strip)
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
                 # status applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
                 return if kw_regexp.blank?
                 # remove any associated issues
                 self.issues.clear
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # don't change the status is the issue is already closed
                       next if issue.status.is_closed?
                       issue.status = fix_status
                       issue.save
                     end
                   end
                   self.issues << target_issues
                 end
               end
             end

app/models/document.rb +3 -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 Document < ActiveRecord::Base
               belongs_to :project
               belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
               has_many :attachments, :as => :container, :dependent => :destroy
-              acts_as_event :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
+              acts_as_searchable :columns => ['title', 'description']
+              acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
+                            :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
             end

app/models/issue.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Issue < ActiveRecord::Base
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
               has_many :time_entries, :dependent => :nullify
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :custom_fields, :through => :custom_values
               has_and_belongs_to_many :changesets, :order => "revision ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_watchable
+              acts_as_searchable :columns => ['subject', 'description'], :with => {:journal => :issue}
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
               validates_presence_of :subject, :description, :priority, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               validates_associated :custom_values, :on => :update
               # set default status for new issues
               def before_validation
                 self.status = IssueStatus.default if status.nil?
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :activerecord_error_greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :activerecord_error_invalid
                 end
                 # validate assignment
                 if assigned_to && !assignable_users.include?(assigned_to)
                   errors.add :assigned_to_id, :activerecord_error_invalid
                 end
               end
               def before_create
                 # default assignment based on category
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     next if (@custom_values_before_change[c.custom_field_id]==c.value ||
                               (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value)
                   }
                   @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
                 end
               end
               def after_save
                 # Update start/due dates of following issues
                 relations_from.each(&:set_issue_to_dates)
                 # Close duplicates if the issue was closed
                 if @issue_before_change && !@issue_before_change.closed? && self.closed?
                   duplicates.each do |duplicate|
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               def custom_value_for(custom_field)
                 self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
                 return nil
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 @current_journal
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Users the issue can be assigned to
               def assignable_users
                 project.members.select {|m| m.role.assignable?}.collect {|m| m.user}
               end
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               def relations
                 (relations_from + relations_to).sort
               end
               def all_dependent_issues
                 dependencies = []
                 relations_from.each do |relation|
                   dependencies << relation.issue_to
                   dependencies += relation.issue_to.all_dependent_issues
                 end
                 dependencies
               end
               # Returns an array of the duplicate issues
               def duplicates
                 relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
               end
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
               end
             end

app/models/journal.rb +5 0

             # 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 Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               # added as a quick fix to allow eager loading of the polymorphic association
               # since always associated to an issue, for now
               belongs_to :issue, :foreign_key => :journalized_id
               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
+              acts_as_searchable :columns => 'notes',
+                                 :include => :issue,
+                                 :project_key => "#{Issue.table_name}.project_id",
+                                 :date_column => "#{Issue.table_name}.created_on"
             end

app/models/message.rb +5 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Message < ActiveRecord::Base
               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               has_many :attachments, :as => :container, :dependent => :destroy
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
+              acts_as_searchable :columns => ['subject', 'content'], :include => :board, :project_key => "project_id"
+              acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
+                            :description => :content,
+                            :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
               validates_presence_of :subject, :content
               validates_length_of :subject, :maximum => 255
               def after_create
                 board.update_attribute(:last_message_id, self.id)
                 board.increment! :messages_count
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 else
                   board.increment! :topics_count
                 end
               end
               def project
                 board.project
               end
             end

app/models/news.rb +1 0

             # 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 News < ActiveRecord::Base
               belongs_to :project
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
               validates_presence_of :title, :description
               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
+              acts_as_searchable :columns => ['title', 'description']
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
               # returns latest news for projects visible by user
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => Project.visible_by(user), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
               end
             end

app/models/project.rb +4 0

             # 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 Project < ActiveRecord::Base
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
               has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :enabled_modules, :dependent => :delete_all
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :delete_all, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :order => "position ASC"
               has_one :repository, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
+              acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
+              acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
+                            :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
               attr_protected :status, :enabled_module_names
               validates_presence_of :name, :description, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :custom_values, :on => :update
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               validates_length_of :description, :maximum => 255
               validates_length_of :homepage, :maximum => 60
               validates_length_of :identifier, :in => 3..12
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
                 if include_subprojects && !active_children.empty?
                   ids = [id] + active_children.collect {|c| c.id}
                   conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
                 end
                 conditions ||= ["#{Issue.table_name}.project_id = ?", id]
                 Issue.with_scope :find => { :conditions => conditions } do
                   yield
                 end
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
               end
               def self.visible_by(user=nil)
                 if user && user.admin?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def archive
                 # Archive subprojects if any
                 children.each do |subproject|
                   subproject.archive
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
               def unarchive
                 return false if parent && !parent.active?
                 update_attribute :status, STATUS_ACTIVE
               end
               def active_children
                 children.select {|child| child.active?}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def custom_fields_for_issues(tracker)
                 all_custom_fields.select {|c| tracker.custom_fields.include? c }
               end
               def all_custom_fields
                 @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
               end
               def <=>(project)
                 name <=> project.name
               end
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 enabled_modules.clear
                 module_names = [] unless module_names && module_names.is_a?(Array)
                 module_names.each do |name|
                   enabled_modules << EnabledModule.new(:name => name.to_s)
                 end
               end
             protected
               def validate
                 errors.add(parent_id, " must be a root project") if parent and parent.parent
                 errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
             end

app/models/wiki_page.rb +13 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'diff'
             class WikiPage < ActiveRecord::Base
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
+                            :description => :text,
+                            :datetime => :created_on,
+                            :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project_id, :page => o.title}}
+              acts_as_searchable :columns => ['title', 'text'],
+                                 :include => [:wiki, :content],
+                                 :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               def title=(value)
                 value = Wiki.titleize(value)
                 @previous_title = read_attribute(:title) if @previous_title.blank?
                 write_attribute(:title, value)
               end
               def before_save
                 self.title = Wiki.titleize(title)
                 # Manage redirects if the title has changed
                 if !@previous_title.blank? && (@previous_title != title) && !new_record?
                   # Update redirects that point to the old title
                   wiki.redirects.find_all_by_redirects_to(@previous_title).each do |r|
                     r.redirects_to = title
                     r.title == r.redirects_to ? r.destroy : r.save
                   end
                   # Remove redirects for the new title
                   wiki.redirects.find_all_by_title(title).each(&:destroy)
                   # Create a redirect to the new title
                   wiki.redirects << WikiRedirect.new(:title => @previous_title, :redirects_to => title) unless redirect_existing_links == "0"
                   @previous_title = nil
                 end
               end
               def before_destroy
                 # Remove redirects to this page
                 wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 result = content.versions.find_by_version(version.to_i) if version
                 result ||= content
                 result
               end
               def diff(version_to=nil, version_from=nil)
                 version_to = version_to ? version_to.to_i : self.content.version
                 version_from = version_from ? version_from.to_i : version_to - 1
                 version_to, version_from = version_from, version_to unless version_from < version_to
                 content_to = content.versions.find_by_version(version_to)
                 content_from = content.versions.find_by_version(version_from)
                 (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
               def project
                 wiki.project
               end
+              def text
+                content.text if content
+              end
             end
             class WikiDiff
               attr_reader :diff, :words, :content_to, :content_from
               def initialize(content_to, content_from)
                 @content_to = content_to
                 @content_from = content_from
                 @words = content_to.text.split(/(\s+)/)
                 @words = @words.select {|word| word != ' '}
                 words_from = content_from.text.split(/(\s+)/)
                 words_from = words_from.select {|word| word != ' '}
                 @diff = words_from.diff @words
               end
             end

app/views/search/index.rhtml +19 -31

@@ -1,53 +1,41
1	<h2><%= l(:label_search) %></h2>	1	<h2><%= l(:label_search) %></h2>
2		2
3	<div class="box">	3	<div class="box">
4	<% form_tag({}, :method => :get) do %>	4	<% form_tag({}, :method => :get) do %>
5	<p><%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>	5	<p><%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
6	<%= javascript_tag "Field.focus('search-input')" %>	6	<%= javascript_tag "Field.focus('search-input')" %>
7		7
8	<% @object_types.each do \|t\| %>	8	<% @object_types.each do \|t\| %>
9	<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>	9	<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
10	<% end %>	10	<% end %>
11	<br />	11	<br />
12	<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>	12	<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
13	<%= submit_tag l(:button_submit), :name => 'submit' %>	13	<%= submit_tag l(:button_submit), :name => 'submit' %>
14	<% end %>	14	<% end %>
15	</div>	15	</div>
16		16
17	<% if @results %>	17	<% if @results %>
18	<h3><%= lwr(:label_result, ~~@results~~.~~length~~) %></h3>	18	<h3><%= l(:label_result_plural) %></h3>
19	<ul>	19	<ul>
20	<% @results.each do \|e\| %>	20	<% @results.each do \|e\| %>
21	<li><p>	21	<li><p><%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
22	<% if e.is_a? Project %>	22	<%= highlight_tokens(e.event_description, @tokens) %><br />
23	<%= link_to highlight_tokens(h(e.name), @tokens), :controller => 'projects', :action => 'show', :id => e %><br />	23	<span class="author"><%= format_time(e.event_datetime) %></span></p></li>
24	<%= highlight_tokens(e.description, @tokens) %>
25	<% elsif e.is_a? Issue %>
26	<%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
27	<%= highlight_tokens(e.description, @tokens) %><br />
28	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
29	<% elsif e.is_a? News %>
30	<%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
31	<%= highlight_tokens(e.description, @tokens) %><br />
32	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
33	<% elsif e.is_a? Document %>
34	<%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
35	<%= highlight_tokens(e.description, @tokens) %><br />
36	<i><%= format_time(e.created_on) %></i>
37	<% elsif e.is_a? WikiPage %>
38	<%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
39	<%= highlight_tokens(e.content.text, @tokens) %><br />
40	<i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
41	<% elsif e.is_a? Changeset %>
42	<%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
43	<%= highlight_tokens(e.comments, @tokens) %><br />
44	<em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>
45	<% elsif e.is_a? Message %>
46	<%=h e.board.name %>: <%= link_to_message e %><br />
47	<%= highlight_tokens(e.content, @tokens) %><br />
48	<em><%= e.author ? e.author.name : "Anonymous" %>, <%= format_time(e.created_on) %></em>
49	<% end %>
50	</p></li>
51	<% end %>	24	<% end %>
52	</ul>	25	</ul>
53	<% end %>	26	<% end %>
		27
		28	<p><center>
		29	<% if @pagination_previous_date %>
		30	<%= link_to_remote ('« ' + l(:label_previous)),
		31	{:update => :content,
		32	:url => params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))
		33	}, :href => url_for(params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>
		34	<% end %>
		35	<% if @pagination_next_date %>
		36	<%= link_to_remote (l(:label_next) + ' »'),
		37	{:update => :content,
		38	:url => params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))
		39	}, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
		40	<% end %>
		41	</center></p>

config/environment.rb +2 0

             # Be sure to restart your web server when you modify this file.
             # Uncomment below to force Rails into production mode when
             # you don't control web/app server and can't set it the proper way
             # ENV['RAILS_ENV'] ||= 'production'
             # Bootstrap the Rails environment, frameworks, and default configuration
             require File.join(File.dirname(__FILE__), 'boot')
             Rails::Initializer.run do |config|
               # Settings in config/environments/* take precedence those specified here
               # Skip frameworks you're not going to use
               # config.frameworks -= [ :action_web_service, :action_mailer ]
               # Add additional load paths for sweepers
               config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
+              config.plugin_paths = ['lib/plugins', 'vendor/plugins']
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)
               # config.log_level = :debug
               # Use the database for sessions instead of the file system
               # (create the session table with 'rake create_sessions_table')
               # config.action_controller.session_store = :active_record_store
               # Enable page/fragment caching by setting a file-based store
               # (remember to create the caching directory and make it readable to the application)
               # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
               # Activate observers that should always be running
               # config.active_record.observers = :cacher, :garbage_collector
               config.active_record.observers = :message_observer
               # Make Active Record use UTC-base instead of local time
               # config.active_record.default_timezone = :utc
               # Use Active Record's schema dumper instead of SQL when creating the test database
               # (enables use of different database adapters for development and test environments)
               # config.active_record.schema_format = :ruby
               # See Rails::Configuration for more options
             	# SMTP server configuration
             	config.action_mailer.smtp_settings = {
             		:address => "127.0.0.1",
             		:port => 25,
             		:domain => "somenet.foo",
             		:authentication => :login,
             		:user_name => "redmine",
             		:password => "redmine",
             	}
             	config.action_mailer.perform_deliveries = true
             	# Tell ActionMailer not to deliver emails to the real world.
             	# The :test delivery method accumulates sent emails in the
             	# ActionMailer::Base.deliveries array.
             	#config.action_mailer.delivery_method = :test
             	config.action_mailer.delivery_method = :smtp
               # Uncomment this line if the engines plugin is installed.
               # This will ensure that engines is loaded first.
               # config.plugins = ["engines", "*"]
             end
             ActiveRecord::Errors.default_error_messages = {
               :inclusion => "activerecord_error_inclusion",
               :exclusion => "activerecord_error_exclusion",
               :invalid => "activerecord_error_invalid",
               :confirmation => "activerecord_error_confirmation",
               :accepted  => "activerecord_error_accepted",
               :empty => "activerecord_error_empty",
               :blank => "activerecord_error_blank",
               :too_long => "activerecord_error_too_long",
               :too_short => "activerecord_error_too_short",
               :wrong_length => "activerecord_error_wrong_length",
               :taken => "activerecord_error_taken",
               :not_a_number => "activerecord_error_not_a_number"
             }
             ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             GLoc.set_config :default_language => :en
             GLoc.clear_strings
             GLoc.set_kcode
             GLoc.load_localized_strings
             GLoc.set_config(:raise_string_not_found_errors => false)
             require 'redmine'

lang/en.yml +1 -2

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
             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
             activerecord_error_not_a_date: is not a valid date
             activerecord_error_greater_than_start_date: must be greater than start date
             activerecord_error_not_same_project: doesn't belong to the same project
             activerecord_error_circular_dependency: This relation would create a circular dependency
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%m/%%d/%%Y
             general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'No'
             general_text_Yes: 'Yes'
             general_text_no: 'no'
             general_text_yes: 'yes'
             general_lang_name: 'English'
             general_csv_separator: ','
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
             notice_account_unknown_email: Unknown user.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
             notice_locking_conflict: Data have been updated by another user.
             notice_scm_error: Entry and/or revision doesn't exist in the repository.
             notice_not_authorized: You are not authorized to access this page.
             notice_email_sent: An email was sent to %s
             notice_email_error: An error occurred while sending mail (%s)
             notice_feeds_access_key_reseted: Your RSS access key was reseted.
             mail_subject_lost_password: Your redMine password
             mail_subject_register: redMine account activation
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             field_name: Name
             field_description: Description
             field_summary: Summary
             field_is_required: Required
             field_firstname: Firstname
             field_lastname: Lastname
             field_mail: Email
             field_filename: File
             field_filesize: Size
             field_downloads: Downloads
             field_author: Author
             field_created_on: Created
             field_updated_on: Updated
             field_field_format: Format
             field_is_for_all: For all projects
             field_possible_values: Possible values
             field_regexp: Regular expression
             field_min_length: Minimum length
             field_max_length: Maximum length
             field_value: Value
             field_category: Category
             field_title: Title
             field_project: Project
             field_issue: Issue
             field_status: Status
             field_notes: Notes
             field_is_closed: Issue closed
             field_is_default: Default status
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Subject
             field_due_date: Due date
             field_assigned_to: Assigned to
             field_priority: Priority
             field_fixed_version: Fixed version
             field_user: User
             field_role: Role
             field_homepage: Homepage
             field_is_public: Public
             field_parent: Subproject of
             field_is_in_chlog: Issues displayed in changelog
             field_is_in_roadmap: Issues displayed in roadmap
             field_login: Login
             field_mail_notification: Mail notifications
             field_admin: Administrator
             field_last_login_on: Last connection
             field_language: Language
             field_effective_date: Date
             field_password: Password
             field_new_password: New password
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Host
             field_port: Port
             field_account: Account
             field_base_dn: Base DN
             field_attr_login: Login attribute
             field_attr_firstname: Firstname attribute
             field_attr_lastname: Lastname attribute
             field_attr_mail: Email attribute
             field_onthefly: On-the-fly user creation
             field_start_date: Start
             field_done_ratio: %% Done
             field_auth_source: Authentication mode
             field_hide_mail: Hide my email address
             field_comments: Comment
             field_url: URL
             field_start_page: Start page
             field_subproject: Subproject
             field_hours: Hours
             field_activity: Activity
             field_spent_on: Date
             field_identifier: Identifier
             field_is_filter: Used as a filter
             field_issue_to_id: Related issue
             field_delay: Delay
             field_assignable: Issues can be assigned to this role
             field_redirect_existing_links: Redirect existing links
             field_estimated_hours: Estimated time
             setting_app_title: Application title
             setting_app_subtitle: Application subtitle
             setting_welcome_text: Welcome text
             setting_default_language: Default language
             setting_login_required: Authent. required
             setting_self_registration: Self-registration enabled
             setting_attachment_max_size: Attachment max. size
             setting_issues_export_limit: Issues export limit
             setting_mail_from: Emission mail address
             setting_host_name: Host name
             setting_text_formatting: Text formatting
             setting_wiki_compression: Wiki history compression
             setting_feeds_limit: Feed content limit
             setting_autofetch_changesets: Autofetch commits
             setting_sys_api_enabled: Enable WS for repository management
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
             setting_autologin: Autologin
             setting_date_format: Date format
             setting_cross_project_issue_relations: Allow cross-project issue relations
             label_user: User
             label_user_plural: Users
             label_user_new: New user
             label_project: Project
             label_project_new: New project
             label_project_plural: Projects
             label_project_all: All Projects
             label_project_latest: Latest projects
             label_issue: Issue
             label_issue_new: New issue
             label_issue_plural: Issues
             label_issue_view_all: View all issues
             label_document: Document
             label_document_new: New document
             label_document_plural: Documents
             label_role: Role
             label_role_plural: Roles
             label_role_new: New role
             label_role_and_permissions: Roles and permissions
             label_member: Member
             label_member_new: New member
             label_member_plural: Members
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: New tracker
             label_workflow: Workflow
             label_issue_status: Issue status
             label_issue_status_plural: Issue statuses
             label_issue_status_new: New status
             label_issue_category: Issue category
             label_issue_category_plural: Issue categories
             label_issue_category_new: New category
             label_custom_field: Custom field
             label_custom_field_plural: Custom fields
             label_custom_field_new: New custom field
             label_enumerations: Enumerations
             label_enumeration_new: New value
             label_information: Information
             label_information_plural: Information
             label_please_login: Please login
             label_register: Register
             label_password_lost: Lost password
             label_home: Home
             label_my_page: My page
             label_my_account: My account
             label_my_projects: My projects
             label_administration: Administration
             label_login: Sign in
             label_logout: Sign out
             label_help: Help
             label_reported_issues: Reported issues
             label_assigned_to_me_issues: Issues assigned to me
             label_last_login: Last connection
             label_last_updates: Last updated
             label_last_updates_plural: %d last updated
             label_registered_on: Registered on
             label_activity: Activity
             label_new: New
             label_logged_as: Logged as
             label_environment: Environment
             label_authentication: Authentication
             label_auth_source: Authentication mode
             label_auth_source_new: New authentication mode
             label_auth_source_plural: Authentication modes
             label_subproject_plural: Subprojects
             label_min_max_length: Min - Max length
             label_list: List
             label_date: Date
             label_integer: Integer
             label_boolean: Boolean
             label_string: Text
             label_text: Long text
             label_attribute: Attribute
             label_attribute_plural: Attributes
             label_download: %d Download
             label_download_plural: %d Downloads
             label_no_data: No data to display
             label_change_status: Change status
             label_history: History
             label_attachment: File
             label_attachment_new: New file
             label_attachment_delete: Delete file
             label_attachment_plural: Files
             label_report: Report
             label_report_plural: Reports
             label_news: News
             label_news_new: Add news
             label_news_plural: News
             label_news_latest: Latest news
             label_news_view_all: View all news
             label_change_log: Change log
             label_settings: Settings
             label_overview: Overview
             label_version: Version
             label_version_new: New version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Export to
             label_read: Read...
             label_public_projects: Public projects
             label_open_issues: open
             label_open_issues_plural: open
             label_closed_issues: closed
             label_closed_issues_plural: closed
             label_total: Total
             label_permissions: Permissions
             label_current_status: Current status
             label_new_statuses_allowed: New statuses allowed
             label_all: all
             label_none: none
             label_next: Next
             label_previous: Previous
             label_used_by: Used by
             label_details: Details
             label_add_note: Add a note
             label_per_page: Per page
             label_calendar: Calendar
             label_months_from: months from
             label_gantt: Gantt
             label_internal: Internal
             label_last_changes: last %d changes
             label_change_view_all: View all changes
             label_personalize_page: Personalize this page
             label_comment: Comment
             label_comment_plural: Comments
             label_comment_add: Add a comment
             label_comment_added: Comment added
             label_comment_delete: Delete comments
             label_query: Custom query
             label_query_plural: Custom queries
             label_query_new: New query
             label_filter_add: Add filter
             label_filter_plural: Filters
             label_equals: is
             label_not_equals: is not
             label_in_less_than: in less than
             label_in_more_than: in more than
             label_in: in
             label_today: today
             label_this_week: this week
             label_less_than_ago: less than days ago
             label_more_than_ago: more than days ago
             label_ago: days ago
             label_contains: contains
             label_not_contains: doesn't contain
             label_day_plural: days
             label_repository: Repository
             label_browse: Browse
             label_modification: %d change
             label_modification_plural: %d changes
             label_revision: Revision
             label_revision_plural: Revisions
             label_added: added
             label_modified: modified
             label_deleted: deleted
             label_latest_revision: Latest revision
             label_latest_revision_plural: Latest revisions
             label_view_revisions: View revisions
             label_max_size: Maximum size
             label_on: 'on'
             label_sort_highest: Move to top
             label_sort_higher: Move up
             label_sort_lower: Move down
             label_sort_lowest: Move to bottom
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
             label_roadmap_overdue: %s late
             label_roadmap_no_issues: No issues for this version
             label_search: Search
-            label_result: %d result
+            label_result_plural: Results
-            label_result_plural: %d results
             label_all_words: All words
             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
             label_wiki_page: Wiki page
             label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Current version
             label_preview: Preview
             label_feed_plural: Feeds
             label_changes_details: Details of all changes
             label_issue_tracking: Issue tracking
             label_spent_time: Spent time
             label_f_hour: %.2f hour
             label_f_hour_plural: %.2f hours
             label_time_tracking: Time tracking
             label_change_plural: Changes
             label_statistics: Statistics
             label_commits_per_month: Commits per month
             label_commits_per_author: Commits per author
             label_view_diff: View differences
             label_diff_inline: inline
             label_diff_side_by_side: side by side
             label_options: Options
             label_copy_workflow_from: Copy workflow from
             label_permissions_report: Permissions report
             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
             label_loading: Loading...
             label_relation_new: New relation
             label_relation_delete: Delete relation
             label_relates_to: related to
             label_duplicates: duplicates
             label_blocks: blocks
             label_blocked_by: blocked by
             label_precedes: precedes
             label_follows: follows
             label_end_to_start: end to start
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
             label_show_completed_versions: Show completed versions
             label_me: me
             label_board: Forum
             label_board_new: New forum
             label_board_plural: Forums
             label_topic_plural: Topics
             label_message_plural: Messages
             label_message_last: Last message
             label_message_new: New message
             label_reply_plural: Replies
             label_send_information: Send account information to the user
             label_year: Year
             label_month: Month
             label_week: Week
             label_date_from: From
             label_date_to: To
             label_language_based: Language based
             label_sort_by: Sort by "%s"
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules
             label_added_time_by: Added by %s %s ago
             label_updated_time: Updated %s ago
             label_jump_to_a_project: Jump to a project...
             label_file_plural: Files
             label_changeset_plural: Changesets
             button_login: Login
             button_submit: Submit
             button_save: Save
             button_check_all: Check all
             button_uncheck_all: Uncheck all
             button_delete: Delete
             button_create: Create
             button_test: Test
             button_edit: Edit
             button_add: Add
             button_change: Change
             button_apply: Apply
             button_clear: Clear
             button_lock: Lock
             button_unlock: Unlock
             button_download: Download
             button_list: List
             button_view: View
             button_move: Move
             button_back: Back
             button_cancel: Cancel
             button_activate: Activate
             button_sort: Sort
             button_log_time: Log time
             button_rollback: Rollback to this version
             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
             button_archive: Archive
             button_unarchive: Unarchive
             button_reset: Reset
             button_rename: Rename
             status_active: active
             status_registered: registered
             status_locked: locked
             text_select_mail_notifications: Select actions for which mail notifications should be sent.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 means no restriction
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
             text_are_you_sure: Are you sure ?
             text_journal_changed: changed from %s to %s
             text_journal_set_to: set to %s
             text_journal_deleted: deleted
             text_tip_task_begin_day: task beginning this day
             text_tip_task_end_day: task ending this day
             text_tip_task_begin_end_day: task beginning and ending this day
             text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.'
             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
             text_unallowed_characters: Unallowed characters
             text_comma_separated: Multiple values allowed (comma separated).
             text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
             text_issue_added: Issue %s has been reported.
             text_issue_updated: Issue %s has been updated.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
             text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
             text_issue_category_destroy_assignments: Remove category assignments
             text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Developer
             default_role_reporter: Reporter
             default_tracker_bug: Bug
             default_tracker_feature: Feature
             default_tracker_support: Support
             default_issue_status_new: New
             default_issue_status_assigned: Assigned
             default_issue_status_resolved: Resolved
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Closed
             default_issue_status_rejected: Rejected
             default_doc_category_user: User documentation
             default_doc_category_tech: Technical documentation
             default_priority_low: Low
             default_priority_normal: Normal
             default_priority_high: High
             default_priority_urgent: Urgent
             default_priority_immediate: Immediate
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: Issue priorities
             enumeration_doc_categories: Document categories
             enumeration_activities: Activities (time tracking)

lang/fr.yml +1 -2

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Janvier,Février,Mars,Avril,Mai,Juin,Juillet,Août,Septembre,Octobre,Novembre,Décembre
             actionview_datehelper_select_month_names_abbr: Jan,Fév,Mars,Avril,Mai,Juin,Juil,Août,Sept,Oct,Nov,Déc
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 jour
             actionview_datehelper_time_in_words_day_plural: %d jours
             actionview_datehelper_time_in_words_hour_about: environ une heure
             actionview_datehelper_time_in_words_hour_about_plural: environ %d heures
             actionview_datehelper_time_in_words_hour_about_single: environ une heure
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: 30 secondes
             actionview_datehelper_time_in_words_minute_less_than: moins d'une 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: moins d'une seconde
             actionview_datehelper_time_in_words_second_less_than_plural: moins de %d secondes
             actionview_instancetag_blank_option: Choisir
             activerecord_error_inclusion: n'est pas inclus dans la liste
             activerecord_error_exclusion: est reservé
             activerecord_error_invalid: est invalide
             activerecord_error_confirmation: ne correspond pas à la confirmation
             activerecord_error_accepted: doit être accepté
             activerecord_error_empty: doit être renseigné
             activerecord_error_blank: doit être renseigné
             activerecord_error_too_long: est trop long
             activerecord_error_too_short: est trop court
             activerecord_error_wrong_length: n'est pas de la bonne longueur
             activerecord_error_taken: est déjà utilisé
             activerecord_error_not_a_number: n'est pas un nombre
             activerecord_error_not_a_date: n'est pas une date valide
             activerecord_error_greater_than_start_date: doit être postérieur à la date de début
             activerecord_error_not_same_project: n'appartient pas au même projet
             activerecord_error_circular_dependency: Cette relation créerait une dépendance circulaire
             general_fmt_age: %d an
             general_fmt_age_plural: %d ans
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'Non'
             general_text_Yes: 'Oui'
             general_text_no: 'non'
             general_text_yes: 'oui'
             general_lang_name: 'Français'
             general_csv_separator: ';'
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche
             notice_account_updated: Le compte a été mis à jour avec succès.
             notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
             notice_account_password_updated: Mot de passe mis à jour avec succès.
             notice_account_wrong_password: Mot de passe incorrect
             notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
             notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
             notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
             notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
             notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
             notice_successful_create: Création effectuée avec succès.
             notice_successful_update: Mise à jour effectuée avec succès.
             notice_successful_delete: Suppression effectuée avec succès.
             notice_successful_connection: Connection réussie.
             notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
             notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
             notice_scm_error: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
             notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
             notice_email_sent: "Un email a été envoyé à %s"
             notice_email_error: "Erreur lors de l'envoi de l'email (%s)"
             notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
             mail_subject_lost_password: Votre mot de passe redMine
             mail_subject_register: Activation de votre compte redMine
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             field_name: Nom
             field_description: Description
             field_summary: Résumé
             field_is_required: Obligatoire
             field_firstname: Prénom
             field_lastname: Nom
             field_mail: Email
             field_filename: Fichier
             field_filesize: Taille
             field_downloads: Téléchargements
             field_author: Auteur
             field_created_on: Créé
             field_updated_on: Mis à jour
             field_field_format: Format
             field_is_for_all: Pour tous les projets
             field_possible_values: Valeurs possibles
             field_regexp: Expression régulière
             field_min_length: Longueur minimum
             field_max_length: Longueur maximum
             field_value: Valeur
             field_category: Catégorie
             field_title: Titre
             field_project: Projet
             field_issue: Demande
             field_status: Statut
             field_notes: Notes
             field_is_closed: Demande fermée
             field_is_default: Statut par défaut
             field_html_color: Couleur
             field_tracker: Tracker
             field_subject: Sujet
             field_due_date: Date d'échéance
             field_assigned_to: Assigné à
             field_priority: Priorité
             field_fixed_version: Version corrigée
             field_user: Utilisateur
             field_role: Rôle
             field_homepage: Site web
             field_is_public: Public
             field_parent: Sous-projet de
             field_is_in_chlog: Demandes affichées dans l'historique
             field_is_in_roadmap: Demandes affichées dans la roadmap
             field_login: Identifiant
             field_mail_notification: Notifications par mail
             field_admin: Administrateur
             field_last_login_on: Dernière connexion
             field_language: Langue
             field_effective_date: Date
             field_password: Mot de passe
             field_new_password: Nouveau mot de passe
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Hôte
             field_port: Port
             field_account: Compte
             field_base_dn: Base DN
             field_attr_login: Attribut Identifiant
             field_attr_firstname: Attribut Prénom
             field_attr_lastname: Attribut Nom
             field_attr_mail: Attribut Email
             field_onthefly: Création des utilisateurs à la volée
             field_start_date: Début
             field_done_ratio: %% Réalisé
             field_auth_source: Mode d'authentification
             field_hide_mail: Cacher mon adresse mail
             field_comments: Commentaire
             field_url: URL
             field_start_page: Page de démarrage
             field_subproject: Sous-projet
             field_hours: Heures
             field_activity: Activité
             field_spent_on: Date
             field_identifier: Identifiant
             field_is_filter: Utilisé comme filtre
             field_issue_to_id: Demande liée
             field_delay: Retard
             field_assignable: Demandes assignables à ce rôle
             field_redirect_existing_links: Rediriger les liens existants
             field_estimated_hours: Temps estimé
             setting_app_title: Titre de l'application
             setting_app_subtitle: Sous-titre de l'application
             setting_welcome_text: Texte d'accueil
             setting_default_language: Langue par défaut
             setting_login_required: Authentif. obligatoire
             setting_self_registration: Enregistrement autorisé
             setting_attachment_max_size: Taille max des fichiers
             setting_issues_export_limit: Limite export demandes
             setting_mail_from: Adresse d'émission
             setting_host_name: Nom d'hôte
             setting_text_formatting: Formatage du texte
             setting_wiki_compression: Compression historique wiki
             setting_feeds_limit: Limite du contenu des flux RSS
             setting_autofetch_changesets: Récupération auto. des commits
             setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
             setting_commit_ref_keywords: Mot-clés de référencement
             setting_commit_fix_keywords: Mot-clés de résolution
             setting_autologin: Autologin
             setting_date_format: Format de date
             setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_user_new: Nouvel utilisateur
             label_project: Projet
             label_project_new: Nouveau projet
             label_project_plural: Projets
             label_project_all: Tous les projets
             label_project_latest: Derniers projets
             label_issue: Demande
             label_issue_new: Nouvelle demande
             label_issue_plural: Demandes
             label_issue_view_all: Voir toutes les demandes
             label_document: Document
             label_document_new: Nouveau document
             label_document_plural: Documents
             label_role: Rôle
             label_role_plural: Rôles
             label_role_new: Nouveau rôle
             label_role_and_permissions: Rôles et permissions
             label_member: Membre
             label_member_new: Nouveau membre
             label_member_plural: Membres
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nouveau tracker
             label_workflow: Workflow
             label_issue_status: Statut de demandes
             label_issue_status_plural: Statuts de demandes
             label_issue_status_new: Nouveau statut
             label_issue_category: Catégorie de demandes
             label_issue_category_plural: Catégories de demandes
             label_issue_category_new: Nouvelle catégorie
             label_custom_field: Champ personnalisé
             label_custom_field_plural: Champs personnalisés
             label_custom_field_new: Nouveau champ personnalisé
             label_enumerations: Listes de valeurs
             label_enumeration_new: Nouvelle valeur
             label_information: Information
             label_information_plural: Informations
             label_please_login: Identification
             label_register: S'enregistrer
             label_password_lost: Mot de passe perdu
             label_home: Accueil
             label_my_page: Ma page
             label_my_account: Mon compte
             label_my_projects: Mes projets
             label_administration: Administration
             label_login: Connexion
             label_logout: Déconnexion
             label_help: Aide
             label_reported_issues: Demandes soumises
             label_assigned_to_me_issues: Demandes qui me sont assignées
             label_last_login: Dernière connexion
             label_last_updates: Dernière mise à jour
             label_last_updates_plural: %d dernières mises à jour
             label_registered_on: Inscrit le
             label_activity: Activité
             label_new: Nouveau
             label_logged_as: Connecté en tant que
             label_environment: Environnement
             label_authentication: Authentification
             label_auth_source: Mode d'authentification
             label_auth_source_new: Nouveau mode d'authentification
             label_auth_source_plural: Modes d'authentification
             label_subproject_plural: Sous-projets
             label_min_max_length: Longueurs mini - maxi
             label_list: Liste
             label_date: Date
             label_integer: Entier
             label_boolean: Booléen
             label_string: Texte
             label_text: Texte long
             label_attribute: Attribut
             label_attribute_plural: Attributs
             label_download: %d Téléchargement
             label_download_plural: %d Téléchargements
             label_no_data: Aucune donnée à afficher
             label_change_status: Changer le statut
             label_history: Historique
             label_attachment: Fichier
             label_attachment_new: Nouveau fichier
             label_attachment_delete: Supprimer le fichier
             label_attachment_plural: Fichiers
             label_report: Rapport
             label_report_plural: Rapports
             label_news: Annonce
             label_news_new: Nouvelle annonce
             label_news_plural: Annonces
             label_news_latest: Dernières annonces
             label_news_view_all: Voir toutes les annonces
             label_change_log: Historique
             label_settings: Configuration
             label_overview: Aperçu
             label_version: Version
             label_version_new: Nouvelle version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Exporter en
             label_read: Lire...
             label_public_projects: Projets publics
             label_open_issues: ouvert
             label_open_issues_plural: ouverts
             label_closed_issues: fermé
             label_closed_issues_plural: fermés
             label_total: Total
             label_permissions: Permissions
             label_current_status: Statut actuel
             label_new_statuses_allowed: Nouveaux statuts autorisés
             label_all: tous
             label_none: aucun
             label_next: Suivant
             label_previous: Précédent
             label_used_by: Utilisé par
             label_details: Détails
             label_add_note: Ajouter une note
             label_per_page: Par page
             label_calendar: Calendrier
             label_months_from: mois depuis
             label_gantt: Gantt
             label_internal: Interne
             label_last_changes: %d derniers changements
             label_change_view_all: Voir tous les changements
             label_personalize_page: Personnaliser cette page
             label_comment: Commentaire
             label_comment_plural: Commentaires
             label_comment_add: Ajouter un commentaire
             label_comment_added: Commentaire ajouté
             label_comment_delete: Supprimer les commentaires
             label_query: Rapport personnalisé
             label_query_plural: Rapports personnalisés
             label_query_new: Nouveau rapport
             label_filter_add: Ajouter le filtre
             label_filter_plural: Filtres
             label_equals: égal
             label_not_equals: différent
             label_in_less_than: dans moins de
             label_in_more_than: dans plus de
             label_in: dans
             label_today: aujourd'hui
             label_this_week: cette semaine
             label_less_than_ago: il y a moins de
             label_more_than_ago: il y a plus de
             label_ago: il y a
             label_contains: contient
             label_not_contains: ne contient pas
             label_day_plural: jours
             label_repository: Dépôt
             label_browse: Parcourir
             label_modification: %d modification
             label_modification_plural: %d modifications
             label_revision: Révision
             label_revision_plural: Révisions
             label_added: ajouté
             label_modified: modifié
             label_deleted: supprimé
             label_latest_revision: Dernière révision
             label_latest_revision_plural: Dernières révisions
             label_view_revisions: Voir les révisions
             label_max_size: Taille maximale
             label_on: sur
             label_sort_highest: Remonter en premier
             label_sort_higher: Remonter
             label_sort_lower: Descendre
             label_sort_lowest: Descendre en dernier
             label_roadmap: Roadmap
             label_roadmap_due_in: Echéance dans
             label_roadmap_overdue: En retard de %s
             label_roadmap_no_issues: Aucune demande pour cette version
             label_search: Recherche
-            label_result: %d résultat
+            label_result_plural: Résultats
-            label_result_plural: %d résultats
             label_all_words: Tous les mots
             label_wiki: Wiki
             label_wiki_edit: Révision wiki
             label_wiki_edit_plural: Révisions wiki
             label_wiki_page: Page wiki
             label_wiki_page_plural: Pages wiki
             label_page_index: Index
             label_current_version: Version actuelle
             label_preview: Prévisualisation
             label_feed_plural: Flux RSS
             label_changes_details: Détails de tous les changements
             label_issue_tracking: Suivi des demandes
             label_spent_time: Temps passé
             label_f_hour: %.2f heure
             label_f_hour_plural: %.2f heures
             label_time_tracking: Suivi du temps
             label_change_plural: Changements
             label_statistics: Statistiques
             label_commits_per_month: Commits par mois
             label_commits_per_author: Commits par auteur
             label_view_diff: Voir les différences
             label_diff_inline: en ligne
             label_diff_side_by_side: côte à côte
             label_options: Options
             label_copy_workflow_from: Copier le workflow de
             label_permissions_report: Synthèse des permissions
             label_watched_issues: Demandes surveillées
             label_related_issues: Demandes liées
             label_applied_status: Statut appliqué
             label_loading: Chargement...
             label_relation_new: Nouvelle relation
             label_relation_delete: Supprimer la relation
             label_relates_to: lié à
             label_duplicates: doublon de
             label_blocks: bloque
             label_blocked_by: bloqué par
             label_precedes: précède
             label_follows: suit
             label_end_to_start: fin à début
             label_end_to_end: fin à fin
             label_start_to_start: début à début
             label_start_to_end: début à fin
             label_stay_logged_in: Rester connecté
             label_disabled: désactivé
             label_show_completed_versions: Voire les versions passées
             label_me: moi
             label_board: Forum
             label_board_new: Nouveau forum
             label_board_plural: Forums
             label_topic_plural: Discussions
             label_message_plural: Messages
             label_message_last: Dernier message
             label_message_new: Nouveau message
             label_reply_plural: Réponses
             label_send_information: Envoyer les informations à l'utilisateur
             label_year: Année
             label_month: Mois
             label_week: Semaine
             label_date_from: Du
             label_date_to: Au
             label_language_based: Basé sur la langue
             label_sort_by: Trier par "%s"
             label_send_test_email: Envoyer un email de test
             label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s
             label_module_plural: Modules
             label_added_time_by: Ajouté par %s il y a %s
             label_updated_time: Mis à jour il y a %s
             label_jump_to_a_project: Aller à un projet...
             label_file_plural: Fichiers
             label_changeset_plural: Révisions
             button_login: Connexion
             button_submit: Soumettre
             button_save: Sauvegarder
             button_check_all: Tout cocher
             button_uncheck_all: Tout décocher
             button_delete: Supprimer
             button_create: Créer
             button_test: Tester
             button_edit: Modifier
             button_add: Ajouter
             button_change: Changer
             button_apply: Appliquer
             button_clear: Effacer
             button_lock: Verrouiller
             button_unlock: Déverrouiller
             button_download: Télécharger
             button_list: Lister
             button_view: Voir
             button_move: Déplacer
             button_back: Retour
             button_cancel: Annuler
             button_activate: Activer
             button_sort: Trier
             button_log_time: Saisir temps
             button_rollback: Revenir à cette version
             button_watch: Surveiller
             button_unwatch: Ne plus surveiller
             button_reply: Répondre
             button_archive: Archiver
             button_unarchive: Désarchiver
             button_reset: Réinitialiser
             button_rename: Renommer
             status_active: actif
             status_registered: enregistré
             status_locked: vérouillé
             text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
             text_regexp_info: ex. ^[A-Z0-9]+$
             text_min_max_length_info: 0 pour aucune restriction
             text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
             text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
             text_are_you_sure: Etes-vous sûr ?
             text_journal_changed: changé de %s à %s
             text_journal_set_to: mis à %s
             text_journal_deleted: supprimé
             text_tip_task_begin_day: tâche commençant ce jour
             text_tip_task_end_day: tâche finissant ce jour
             text_tip_task_begin_end_day: tâche commençant et finissant ce jour
             text_project_identifier_info: 'Lettres minuscules (a-z), chiffres et tirets autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
             text_caracters_maximum: %d caractères maximum.
             text_length_between: Longueur comprise entre %d et %d caractères.
             text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
             text_unallowed_characters: Caractères non autorisés
             text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
             text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
             text_issue_added: La demande %s a été soumise.
             text_issue_updated: La demande %s a été mise à jour.
             text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
             text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
             text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
             text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
             default_role_manager: Manager
             default_role_developper: Développeur
             default_role_reporter: Rapporteur
             default_tracker_bug: Anomalie
             default_tracker_feature: Evolution
             default_tracker_support: Assistance
             default_issue_status_new: Nouveau
             default_issue_status_assigned: Assigné
             default_issue_status_resolved: Résolu
             default_issue_status_feedback: Commentaire
             default_issue_status_closed: Fermé
             default_issue_status_rejected: Rejeté
             default_doc_category_user: Documentation utilisateur
             default_doc_category_tech: Documentation technique
             default_priority_low: Bas
             default_priority_normal: Normal
             default_priority_high: Haut
             default_priority_urgent: Urgent
             default_priority_immediate: Immédiat
             default_activity_design: Conception
             default_activity_development: Développement
             enumeration_issue_priorities: Priorités des demandes
             enumeration_doc_categories: Catégories des documents
             enumeration_activities: Activités (suivi du temps)

lib/plugins/acts_as_event/init.rb ~~lib/redmine/acts_as_event/init.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_event/init.rb to lib/plugins/acts_as_event/init.rb

lib/plugins/acts_as_event/lib/acts_as_event.rb ~~lib/redmine/acts_as_event/lib/acts_as_event.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_event/lib/acts_as_event.rb to lib/plugins/acts_as_event/lib/acts_as_event.rb

lib/plugins/acts_as_watchable/init.rb ~~lib/redmine/acts_as_watchable/init.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_watchable/init.rb to lib/plugins/acts_as_watchable/init.rb

lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb ~~lib/redmine/acts_as_watchable/lib/acts_as_watchable.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_watchable/lib/acts_as_watchable.rb to lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb

lib/redmine.rb 0 -2

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
-            require 'redmine/acts_as_watchable/init'
-            require 'redmine/acts_as_event/init'
             require 'redmine/plugin'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity, :feeds]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => [:list_issues, :export_issues_csv, :export_issues_pdf, :changelog, :roadmap],
                                               :issues => [:show, :export_pdf],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin
                 map.permission :edit_issues, {:issues => [:edit, :destroy_attachment]}, :require => :loggedin
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}, :require => :loggedin
                 map.permission :add_issue_notes, {:issues => :add_note}, :require => :loggedin
                 map.permission :change_issue_status, {:issues => :change_status}, :require => :loggedin
                 map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_pulic_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :projects => :gantt
                 map.permission :view_calendar, :projects => :calendar
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:details, :report]
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:projects => :list_news, :news => :show}, :public => true
                 map.permission :comment_news, {:news => :add_comment}, :require => :loggedin
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:projects => :add_document, :documents => [:edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
                 map.permission :view_documents, :projects => :list_documents, :documents => [:show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :special]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, :repositories => [:edit, :destroy]
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply]}, :require => :loggedin
               end
             end
             # Project menu configuration
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :label_overview, :controller => 'projects', :action => 'show'
               menu.push :label_activity, :controller => 'projects', :action => 'activity'
               menu.push :label_roadmap, :controller => 'projects', :action => 'roadmap'
               menu.push :label_issue_plural, :controller => 'projects', :action => 'list_issues'
               menu.push :label_news_plural, :controller => 'projects', :action => 'list_news'
               menu.push :label_document_plural, :controller => 'projects', :action => 'list_documents'
               menu.push :label_wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }
               menu.push :label_attachment_plural, :controller => 'projects', :action => 'list_files'
               menu.push :label_repository, { :controller => 'repositories', :action => 'show' }, :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :label_settings, :controller => 'projects', :action => 'settings'
             end

test/functional/search_controller_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             require 'search_controller'
             # Re-raise errors caught by the controller.
             class SearchController; def rescue_action(e) raise e end; end
             class SearchControllerTest < Test::Unit::TestCase
               fixtures :projects, :issues
               def setup
                 @controller = SearchController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_search_for_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 get :index, :q => "cook"
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Project.find(1))
               end
               def test_search_in_project
                 get :index, :id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:project)
-                get :index, :id => 1, :q => "can", :scope => ["issues", "news", "documents"]
+                get :index, :id => 1, :q => "can"
                 assert_response :success
                 assert_template 'index'
               end
               def test_quick_jump_to_issue
                 # issue of a public project
                 get :index, :q => "3"
                 assert_redirected_to 'issues/show/3'
                 # issue of a private project
                 get :index, :q => "4"
                 assert_response :success
                 assert_template 'index'
               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