Skip to content

O
OHR Support
Commit e9efa5b9 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Refactor: use :id instead of :page when linking to Wiki Pages 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 70bf0706
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 281 deletions
app/controllers/wiki_controller.rb
View file @ e9efa5b9
...@@ -49,7 +49,7 @@ class WikiController < ApplicationController ...@@ -49,7 +49,7 @@ class WikiController < ApplicationController
# display a page (in editing mode if it doesn't exist) # display a page (in editing mode if it doesn't exist)
def show def show
page_title = params[:page] page_title = params[:id]
@page = @wiki.find_or_new_page(page_title) @page = @wiki.find_or_new_page(page_title)
if @page.new_record? if @page.new_record?
if User.current.allowed_to?(:edit_wiki_pages, @project) && editable? if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
...@@ -82,7 +82,7 @@ class WikiController < ApplicationController ...@@ -82,7 +82,7 @@ class WikiController < ApplicationController
# edit an existing page or a new one # edit an existing page or a new one
def edit def edit
@page = @wiki.find_or_new_page(params[:page]) @page = @wiki.find_or_new_page(params[:id])
return render_403 unless editable? return render_403 unless editable?
@page.content = WikiContent.new(:page => @page) if @page.new_record? @page.content = WikiContent.new(:page => @page) if @page.new_record?
...@@ -101,7 +101,7 @@ class WikiController < ApplicationController ...@@ -101,7 +101,7 @@ class WikiController < ApplicationController
verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed } verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
# Creates a new page or updates an existing one # Creates a new page or updates an existing one
def update def update
@page = @wiki.find_or_new_page(params[:page]) @page = @wiki.find_or_new_page(params[:id])
return render_403 unless editable? return render_403 unless editable?
@page.content = WikiContent.new(:page => @page) if @page.new_record? @page.content = WikiContent.new(:page => @page) if @page.new_record?
...@@ -114,7 +114,7 @@ class WikiController < ApplicationController ...@@ -114,7 +114,7 @@ class WikiController < ApplicationController
attachments = Attachment.attach_files(@page, params[:attachments]) attachments = Attachment.attach_files(@page, params[:attachments])
render_attachment_warning_if_needed(@page) render_attachment_warning_if_needed(@page)
# don't save if text wasn't changed # don't save if text wasn't changed
redirect_to :action => 'show', :project_id => @project, :page => @page.title redirect_to :action => 'show', :project_id => @project, :id => @page.title
return return
end end
@content.attributes = params[:content] @content.attributes = params[:content]
...@@ -124,7 +124,7 @@ class WikiController < ApplicationController ...@@ -124,7 +124,7 @@ class WikiController < ApplicationController
attachments = Attachment.attach_files(@page, params[:attachments]) attachments = Attachment.attach_files(@page, params[:attachments])
render_attachment_warning_if_needed(@page) render_attachment_warning_if_needed(@page)
call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page}) call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
redirect_to :action => 'show', :project_id => @project, :page => @page.title redirect_to :action => 'show', :project_id => @project, :id => @page.title
end end
rescue ActiveRecord::StaleObjectError rescue ActiveRecord::StaleObjectError
...@@ -140,13 +140,13 @@ class WikiController < ApplicationController ...@@ -140,13 +140,13 @@ class WikiController < ApplicationController
@original_title = @page.pretty_title @original_title = @page.pretty_title
if request.post? && @page.update_attributes(params[:wiki_page]) if request.post? && @page.update_attributes(params[:wiki_page])
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'show', :project_id => @project, :page => @page.title redirect_to :action => 'show', :project_id => @project, :id => @page.title
end end
end end
def protect def protect
@page.update_attribute :protected, params[:protected] @page.update_attribute :protected, params[:protected]
redirect_to :action => 'show', :project_id => @project, :page => @page.title redirect_to :action => 'show', :project_id => @project, :id => @page.title
end end
# show page history # show page history
...@@ -210,7 +210,7 @@ class WikiController < ApplicationController ...@@ -210,7 +210,7 @@ class WikiController < ApplicationController
export = render_to_string :action => 'export_multiple', :layout => false export = render_to_string :action => 'export_multiple', :layout => false
send_data(export, :type => 'text/html', :filename => "wiki.html") send_data(export, :type => 'text/html', :filename => "wiki.html")
else else
redirect_to :action => 'show', :project_id => @project, :page => nil redirect_to :action => 'show', :project_id => @project, :id => nil
end end
end end
...@@ -219,7 +219,7 @@ class WikiController < ApplicationController ...@@ -219,7 +219,7 @@ class WikiController < ApplicationController
end end
def preview def preview
page = @wiki.find_page(params[:page]) page = @wiki.find_page(params[:id])
# page is nil when previewing a new page # page is nil when previewing a new page
return render_403 unless page.nil? || editable?(page) return render_403 unless page.nil? || editable?(page)
if page if page
...@@ -234,7 +234,7 @@ class WikiController < ApplicationController ...@@ -234,7 +234,7 @@ class WikiController < ApplicationController
return render_403 unless editable? return render_403 unless editable?
attachments = Attachment.attach_files(@page, params[:attachments]) attachments = Attachment.attach_files(@page, params[:attachments])
render_attachment_warning_if_needed(@page) render_attachment_warning_if_needed(@page)
redirect_to :action => 'show', :page => @page.title redirect_to :action => 'show', :id => @page.title
end end
private private
...@@ -249,7 +249,7 @@ private ...@@ -249,7 +249,7 @@ private
# Finds the requested page and returns a 404 error if it doesn't exist # Finds the requested page and returns a 404 error if it doesn't exist
def find_existing_page def find_existing_page
@page = @wiki.find_page(params[:page]) @page = @wiki.find_page(params[:id])
render_404 if @page.nil? render_404 if @page.nil?
end end
......
app/helpers/application_helper.rb
View file @ e9efa5b9
...@@ -177,7 +177,7 @@ module ApplicationHelper ...@@ -177,7 +177,7 @@ module ApplicationHelper
content << "<ul class=\"pages-hierarchy\">\n" content << "<ul class=\"pages-hierarchy\">\n"
pages[node].each do |page| pages[node].each do |page|
content << "<li>" content << "<li>"
content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :page => page.title}, content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
:title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil)) :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id] content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
content << "</li>\n" content << "</li>\n"
...@@ -541,7 +541,7 @@ module ApplicationHelper ...@@ -541,7 +541,7 @@ module ApplicationHelper
when :local; "#{title}.html" when :local; "#{title}.html"
when :anchor; "##{title}" # used for single-file wiki export when :anchor; "##{title}" # used for single-file wiki export
else else
url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :page => Wiki.titleize(page), :anchor => anchor) url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :id => Wiki.titleize(page), :anchor => anchor)
end end
link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new'))) link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
else else
......
app/models/mailer.rb
View file @ e9efa5b9
...@@ -178,9 +178,9 @@ class Mailer < ActionMailer::Base ...@@ -178,9 +178,9 @@ class Mailer < ActionMailer::Base
message_id wiki_content message_id wiki_content
recipients wiki_content.recipients recipients wiki_content.recipients
cc(wiki_content.page.wiki.watcher_recipients - recipients) cc(wiki_content.page.wiki.watcher_recipients - recipients)
subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}" subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content, body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title) :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title)
render_multipart('wiki_content_added', body) render_multipart('wiki_content_added', body)
end end
...@@ -195,10 +195,10 @@ class Mailer < ActionMailer::Base ...@@ -195,10 +195,10 @@ class Mailer < ActionMailer::Base
message_id wiki_content message_id wiki_content
recipients wiki_content.recipients recipients wiki_content.recipients
cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients) cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :page => wiki_content.page.pretty_title)}" subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content, body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title), :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title),
:wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version) :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :id => wiki_content.page.title, :version => wiki_content.version)
render_multipart('wiki_content_updated', body) render_multipart('wiki_content_updated', body)
end end
......
app/models/wiki_content.rb
View file @ e9efa5b9
...@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base ...@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base
:description => :comments, :description => :comments,
:datetime => :updated_on, :datetime => :updated_on,
:type => 'wiki-page', :type => 'wiki-page',
:url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :page => o.page.title, :version => o.version}} :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :id => o.page.title, :version => o.version}}
acts_as_activity_provider :type => 'wiki_edits', acts_as_activity_provider :type => 'wiki_edits',
:timestamp => "#{WikiContent.versioned_table_name}.updated_on", :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
......
app/models/wiki_page.rb
View file @ e9efa5b9
...@@ -28,7 +28,7 @@ class WikiPage < ActiveRecord::Base ...@@ -28,7 +28,7 @@ class WikiPage < ActiveRecord::Base
acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"}, acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
:description => :text, :description => :text,
:datetime => :created_on, :datetime => :created_on,
:url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :page => o.title}} :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
acts_as_searchable :columns => ['title', 'text'], acts_as_searchable :columns => ['title', 'text'],
:include => [{:wiki => :project}, :content], :include => [{:wiki => :project}, :content],
...@@ -139,7 +139,7 @@ class WikiPage < ActiveRecord::Base ...@@ -139,7 +139,7 @@ class WikiPage < ActiveRecord::Base
parent_page = t.blank? ? nil : self.wiki.find_page(t) parent_page = t.blank? ? nil : self.wiki.find_page(t)
self.parent = parent_page self.parent = parent_page
end end
protected protected
def validate def validate
......
app/views/mailer/wiki_content_added.text.html.rhtml
View file @ e9efa5b9
<p><%= l(:mail_body_wiki_content_added, :page => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), <p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
:author => h(@wiki_content.author)) %><br /> :author => h(@wiki_content.author)) %><br />
<em><%=h @wiki_content.comments %></em></p> <em><%=h @wiki_content.comments %></em></p>
app/views/mailer/wiki_content_added.text.plain.rhtml
View file @ e9efa5b9
<%= l(:mail_body_wiki_content_added, :page => h(@wiki_content.page.pretty_title), <%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title),
:author => h(@wiki_content.author)) %> :author => h(@wiki_content.author)) %>
<%= @wiki_content.comments %> <%= @wiki_content.comments %>
......
app/views/mailer/wiki_content_updated.text.html.rhtml
View file @ e9efa5b9
<p><%= l(:mail_body_wiki_content_updated, :page => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), <p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
:author => h(@wiki_content.author)) %><br /> :author => h(@wiki_content.author)) %><br />
<em><%=h @wiki_content.comments %></em></p> <em><%=h @wiki_content.comments %></em></p>
......
app/views/mailer/wiki_content_updated.text.plain.rhtml
View file @ e9efa5b9
<%= l(:mail_body_wiki_content_updated, :page => h(@wiki_content.page.pretty_title), <%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title),
:author => h(@wiki_content.author)) %> :author => h(@wiki_content.author)) %>
<%= @wiki_content.comments %> <%= @wiki_content.comments %>
......
app/views/projects/settings/_versions.rhtml
View file @ e9efa5b9
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<td class="description"><%=h version.description %></td> <td class="description"><%=h version.description %></td>
<td class="status"><%= l("version_status_#{version.status}") %></td> <td class="status"><%= l("version_status_#{version.status}") %></td>
<td class="sharing"><%=h format_version_sharing(version.sharing) %></td> <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
<td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td> <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :id => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
<td class="buttons"> <td class="buttons">
<% if version.project == @project %> <% if version.project == @project %>
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
......
app/views/versions/show.rhtml
View file @ e9efa5b9
<div class="contextual"> <div class="contextual">
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %> <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %> <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %> <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
</div> </div>
......
app/views/wiki/_sidebar.rhtml
View file @ e9efa5b9
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<h3><%= l(:label_wiki) %></h3> <h3><%= l(:label_wiki) %></h3>
<%= link_to l(:field_start_page), {:action => 'show', :page => nil} %><br /> <%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
<%= link_to l(:label_index_by_title), {:action => 'index'} %><br /> <%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
<%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br /> <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
app/views/wiki/annotate.rhtml
View file @ e9efa5b9
<div class="contextual"> <div class="contextual">
<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %> <%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %>
<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div> </div>
<h2><%= @page.pretty_title %></h2> <h2><%= @page.pretty_title %></h2>
<p> <p>
<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :page => @page.title, :version => @annotate.content.version %> <%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :id => @page.title, :version => @annotate.content.version %>
<em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em> <em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
</p> </p>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<% @annotate.lines.each do |line| -%> <% @annotate.lines.each do |line| -%>
<tr class="bloc-<%= colors[line[0]] %>"> <tr class="bloc-<%= colors[line[0]] %>">
<th class="line-num"><%= line_num %></th> <th class="line-num"><%= line_num %></th>
<td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title, :version => line[0] %></td> <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title, :version => line[0] %></td>
<td class="author"><%= h(line[1]) %></td> <td class="author"><%= h(line[1]) %></td>
<td class="line-code"><pre><%=h line[2] %></pre></td> <td class="line-code"><pre><%=h line[2] %></pre></td>
</tr> </tr>
......
app/views/wiki/date_index.html.erb
View file @ e9efa5b9
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<h3><%= format_date(date) %></h3> <h3><%= format_date(date) %></h3>
<ul> <ul>
<% @pages_by_date[date].each do |page| %> <% @pages_by_date[date].each do |page| %>
<li><%= link_to page.pretty_title, :action => 'show', :page => page.title %></li> <li><%= link_to page.pretty_title, :action => 'show', :id => page.title %></li>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>
......
app/views/wiki/destroy.rhtml
View file @ e9efa5b9
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
</div> </div>
<%= submit_tag l(:button_apply) %> <%= submit_tag l(:button_apply) %>
<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title %> <%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
<% end %> <% end %>
app/views/wiki/diff.rhtml
View file @ e9efa5b9
<div class="contextual"> <div class="contextual">
<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div> </div>
<h2><%= @page.pretty_title %></h2> <h2><%= @page.pretty_title %></h2>
<p> <p>
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :page => @page.title, :version => @diff.content_from.version %> <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :version => @diff.content_from.version %>
<em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
&#8594; &#8594;
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %> <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
<em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
</p> </p>
......
app/views/wiki/edit.rhtml
View file @ e9efa5b9
<h2><%=h @page.pretty_title %></h2> <h2><%=h @page.pretty_title %></h2>
<% form_for :content, @content, :url => {:action => 'update', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %> <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
<%= f.hidden_field :version %> <%= f.hidden_field :version %>
<%= error_messages_for 'content' %> <%= error_messages_for 'content' %>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<p><%= submit_tag l(:button_save) %> <p><%= submit_tag l(:button_save) %>
<%= link_to_remote l(:label_preview), <%= link_to_remote l(:label_preview),
{ :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :page => @page.title }, { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
:method => 'post', :method => 'post',
:update => 'preview', :update => 'preview',
:with => "Form.serialize('wiki_form')", :with => "Form.serialize('wiki_form')",
......
app/views/wiki/history.rhtml
View file @ e9efa5b9
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
<% line_num = 1 %> <% line_num = 1 %>
<% @versions.each do |ver| %> <% @versions.each do |ver| %>
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<td class="id"><%= link_to ver.version, :action => 'show', :page => @page.title, :version => ver.version %></td> <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :version => ver.version %></td>
<td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td> <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
<td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td> <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
<td align="center"><%= format_time(ver.updated_on) %></td> <td align="center"><%= format_time(ver.updated_on) %></td>
<td><%= link_to_user ver.author %></td> <td><%= link_to_user ver.author %></td>
<td><%=h ver.comments %></td> <td><%=h ver.comments %></td>
<td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :page => @page.title, :version => ver.version %></td> <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
</tr> </tr>
<% line_num += 1 %> <% line_num += 1 %>
<% end %> <% end %>
......
app/views/wiki/show.rhtml
View file @ e9efa5b9
<div class="contextual"> <div class="contextual">
<% if @editable %> <% if @editable %>
<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %> <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
<%= watcher_tag(@page, User.current) %> <%= watcher_tag(@page, User.current) %>
<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %> <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %> <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %> <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %> <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %> <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
<% end %> <% end %>
<%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div> </div>
<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %> <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title}}) %>
<% if @content.version != @page.content.version %> <% if @content.version != @page.content.version %>
<p> <p>
<%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %> <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
<%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
<%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => @page.title, :version => @content.version) + ')' if @content.version > 1 %> - <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :version => @content.version) + ')' if @content.version > 1 %> -
<%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %> <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
<%= link_to(l(:label_current_version), :action => 'show', :page => @page.title) %> <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title) %>
<br /> <br />
<em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br /> <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
<%=h @content.comments %> <%=h @content.comments %>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div id="wiki_add_attachment"> <div id="wiki_add_attachment">
<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;", <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
:id => 'attach_files_link' %></p> :id => 'attach_files_link' %></p>
<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
<div class="box"> <div class="box">
<p><%= render :partial => 'attachments/form' %></p> <p><%= render :partial => 'attachments/form' %></p>
</div> </div>
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<% end %> <% end %>
<% other_formats_links do |f| %> <% other_formats_links do |f| %>
<%= f.link_to 'HTML', :url => {:page => @page.title, :version => @content.version} %> <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
<%= f.link_to 'TXT', :url => {:page => @page.title, :version => @content.version} %> <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
<% end if User.current.allowed_to?(:export_wiki_pages, @project) %> <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% content_for :header_tags do %> <% content_for :header_tags do %>
......
config/locales/bg.yml
View file @ e9efa5b9
...@@ -809,12 +809,12 @@ bg: ...@@ -809,12 +809,12 @@ bg:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/bs.yml
View file @ e9efa5b9
...@@ -829,12 +829,12 @@ bs: ...@@ -829,12 +829,12 @@ bs:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/ca.yml
View file @ e9efa5b9
...@@ -195,10 +195,10 @@ ca: ...@@ -195,10 +195,10 @@ ca:
mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:" mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:"
mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies" mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies"
mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:" mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:"
mail_subject_wiki_content_added: "S'ha afegit la pàgina wiki «{{page}}»" mail_subject_wiki_content_added: "S'ha afegit la pàgina wiki «{{id}}»"
mail_body_wiki_content_added: "En {{author}} ha afegit la pàgina wiki «{{page}}»." mail_body_wiki_content_added: "En {{author}} ha afegit la pàgina wiki «{{id}}»."
mail_subject_wiki_content_updated: "S'ha actualitzat la pàgina wiki «{{page}}»" mail_subject_wiki_content_updated: "S'ha actualitzat la pàgina wiki «{{id}}»"
mail_body_wiki_content_updated: "En {{author}} ha actualitzat la pàgina wiki «{{page}}»." mail_body_wiki_content_updated: "En {{author}} ha actualitzat la pàgina wiki «{{id}}»."
gui_validation_error: 1 error gui_validation_error: 1 error
gui_validation_error_plural: "{{count}} errors" gui_validation_error_plural: "{{count}} errors"
......
config/locales/cs.yml
View file @ e9efa5b9
...@@ -815,12 +815,12 @@ cs: ...@@ -815,12 +815,12 @@ cs:
text_wiki_page_destroy_children: Smazat podstránky a všechny jejich potomky text_wiki_page_destroy_children: Smazat podstránky a všechny jejich potomky
setting_password_min_length: Minimální délka hesla setting_password_min_length: Minimální délka hesla
field_group_by: Seskupovat výsledky podle field_group_by: Seskupovat výsledky podle
mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována" mail_subject_wiki_content_updated: "'{{id}}' Wiki stránka byla aktualizována"
label_wiki_content_added: Wiki stránka přidána label_wiki_content_added: Wiki stránka přidána
mail_subject_wiki_content_added: "'{{page}}' Wiki stránka byla přidána" mail_subject_wiki_content_added: "'{{id}}' Wiki stránka byla přidána"
mail_body_wiki_content_added: "'{{page}}' Wiki stránka byla přidána od {{author}}." mail_body_wiki_content_added: "'{{id}}' Wiki stránka byla přidána od {{author}}."
label_wiki_content_updated: Wiki stránka aktualizována label_wiki_content_updated: Wiki stránka aktualizována
mail_body_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována od {{author}}." mail_body_wiki_content_updated: "'{{id}}' Wiki stránka byla aktualizována od {{author}}."
permission_add_project: Vytvořit projekt permission_add_project: Vytvořit projekt
setting_new_project_user_role_id: Role přiřazená uživateli bez práv administrátora, který projekt vytvořil setting_new_project_user_role_id: Role přiřazená uživateli bez práv administrátora, který projekt vytvořil
label_view_all_revisions: Zobrazit všechny revize label_view_all_revisions: Zobrazit všechny revize
......
config/locales/da.yml
View file @ e9efa5b9
...@@ -831,12 +831,12 @@ da: ...@@ -831,12 +831,12 @@ da:
text_wiki_page_destroy_children: Slet undersider ogalle deres afledte sider. text_wiki_page_destroy_children: Slet undersider ogalle deres afledte sider.
setting_password_min_length: Mindste længde på kodeord setting_password_min_length: Mindste længde på kodeord
field_group_by: Gruppér resultater efter field_group_by: Gruppér resultater efter
mail_subject_wiki_content_updated: "'{{page}}' wikisiden er blevet opdateret" mail_subject_wiki_content_updated: "'{{id}}' wikisiden er blevet opdateret"
label_wiki_content_added: Wiki side tilføjet label_wiki_content_added: Wiki side tilføjet
mail_subject_wiki_content_added: "'{{page}}' wikisiden er blevet tilføjet" mail_subject_wiki_content_added: "'{{id}}' wikisiden er blevet tilføjet"
mail_body_wiki_content_added: The '{{page}}' wikiside er blevet tilføjet af {{author}}. mail_body_wiki_content_added: The '{{id}}' wikiside er blevet tilføjet af {{author}}.
label_wiki_content_updated: Wikiside opdateret label_wiki_content_updated: Wikiside opdateret
mail_body_wiki_content_updated: Wikisiden '{{page}}' er blevet opdateret af {{author}}. mail_body_wiki_content_updated: Wikisiden '{{id}}' er blevet opdateret af {{author}}.
permission_add_project: Opret projekt permission_add_project: Opret projekt
setting_new_project_user_role_id: Denne rolle gives til en bruger, som ikke er administrator, og som opretter et projekt setting_new_project_user_role_id: Denne rolle gives til en bruger, som ikke er administrator, og som opretter et projekt
label_view_all_revisions: Se alle revisioner label_view_all_revisions: Se alle revisioner
......
config/locales/de.yml
View file @ e9efa5b9
...@@ -211,10 +211,10 @@ de: ...@@ -211,10 +211,10 @@ de:
mail_body_account_activation_request: "Ein neuer Benutzer ({{value}}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:" mail_body_account_activation_request: "Ein neuer Benutzer ({{value}}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:"
mail_subject_reminder: "{{count}} Tickets müssen in den nächsten {{days}} Tagen abgegeben werden" mail_subject_reminder: "{{count}} Tickets müssen in den nächsten {{days}} Tagen abgegeben werden"
mail_body_reminder: "{{count}} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten {{days}} Tagen abgegeben werden:" mail_body_reminder: "{{count}} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten {{days}} Tagen abgegeben werden:"
mail_subject_wiki_content_added: "Wiki-Seite '{{page}}' hinzugefügt" mail_subject_wiki_content_added: "Wiki-Seite '{{id}}' hinzugefügt"
mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt." mail_body_wiki_content_added: "Die Wiki-Seite '{{id}}' wurde von {{author}} hinzugefügt."
mail_subject_wiki_content_updated: "Wiki-Seite '{{page}}' erfolgreich aktualisiert" mail_subject_wiki_content_updated: "Wiki-Seite '{{id}}' erfolgreich aktualisiert"
mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert." mail_body_wiki_content_updated: "Die Wiki-Seite '{{id}}' wurde von {{author}} aktualisiert."
gui_validation_error: 1 Fehler gui_validation_error: 1 Fehler
gui_validation_error_plural: "{{count}} Fehler" gui_validation_error_plural: "{{count}} Fehler"
......
config/locales/el.yml
View file @ e9efa5b9
...@@ -179,10 +179,10 @@ el: ...@@ -179,10 +179,10 @@ el:
mail_body_account_activation_request: "'Ένας νέος χρήστης ({{value}}) έχει εγγραφεί. Ο λογαριασμός είναι σε στάδιο αναμονής της έγκρισης σας:" mail_body_account_activation_request: "'Ένας νέος χρήστης ({{value}}) έχει εγγραφεί. Ο λογαριασμός είναι σε στάδιο αναμονής της έγκρισης σας:"
mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες {{days}} ημέρες" mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες {{days}} ημέρες"
mail_body_reminder: "{{count}}θέμα(τα) που έχουν ανατεθεί σε σας, με προθεσμία στις επόμενες {{days}} ημέρες:" mail_body_reminder: "{{count}}θέμα(τα) που έχουν ανατεθεί σε σας, με προθεσμία στις επόμενες {{days}} ημέρες:"
mail_subject_wiki_content_added: "'προστέθηκε η σελίδα wiki {{page}}' " mail_subject_wiki_content_added: "'προστέθηκε η σελίδα wiki {{id}}' "
mail_body_wiki_content_added: "Η σελίδα wiki '{{page}}' προστέθηκε από τον {{author}}." mail_body_wiki_content_added: "Η σελίδα wiki '{{id}}' προστέθηκε από τον {{author}}."
mail_subject_wiki_content_updated: "'ενημερώθηκε η σελίδα wiki {{page}}' " mail_subject_wiki_content_updated: "'ενημερώθηκε η σελίδα wiki {{id}}' "
mail_body_wiki_content_updated: "Η σελίδα wiki '{{page}}' ενημερώθηκε από τον {{author}}." mail_body_wiki_content_updated: "Η σελίδα wiki '{{id}}' ενημερώθηκε από τον {{author}}."
gui_validation_error: 1 σφάλμα gui_validation_error: 1 σφάλμα
gui_validation_error_plural: "{{count}} σφάλματα" gui_validation_error_plural: "{{count}} σφάλματα"
......
config/locales/en-GB.yml
View file @ e9efa5b9
...@@ -189,10 +189,10 @@ en-GB: ...@@ -189,10 +189,10 @@ en-GB:
mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
gui_validation_error: 1 error gui_validation_error: 1 error
gui_validation_error_plural: "{{count}} errors" gui_validation_error_plural: "{{count}} errors"
......
config/locales/en.yml
View file @ e9efa5b9
...@@ -193,10 +193,10 @@ en: ...@@ -193,10 +193,10 @@ en:
mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
gui_validation_error: 1 error gui_validation_error: 1 error
gui_validation_error_plural: "{{count}} errors" gui_validation_error_plural: "{{count}} errors"
......
config/locales/es.yml
View file @ e9efa5b9
...@@ -854,12 +854,12 @@ es: ...@@ -854,12 +854,12 @@ es:
text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes
setting_password_min_length: Longitud mínima de la contraseña setting_password_min_length: Longitud mínima de la contraseña
field_group_by: Agrupar resultados por field_group_by: Agrupar resultados por
mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada" mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada"
label_wiki_content_added: Página wiki añadida label_wiki_content_added: Página wiki añadida
mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'." mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'."
mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'." mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'."
label_wiki_content_updated: Página wiki actualizada label_wiki_content_updated: Página wiki actualizada
mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}. mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}.
permission_add_project: Crear proyecto permission_add_project: Crear proyecto
setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
label_view_all_revisions: Ver todas las revisiones label_view_all_revisions: Ver todas las revisiones
......
config/locales/eu.yml
View file @ e9efa5b9
...@@ -188,10 +188,10 @@ eu: ...@@ -188,10 +188,10 @@ eu:
mail_body_account_activation_request: "Erabiltzaile berri bat ({{value}}) erregistratu da. Kontua zure onarpenaren zain dago:" mail_body_account_activation_request: "Erabiltzaile berri bat ({{value}}) erregistratu da. Kontua zure onarpenaren zain dago:"
mail_subject_reminder: "{{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a" mail_subject_reminder: "{{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a"
mail_body_reminder: "Zuri esleituta dauden {{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a:" mail_body_reminder: "Zuri esleituta dauden {{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a:"
mail_subject_wiki_content_added: "'{{page}}' wiki orria gehitu da" mail_subject_wiki_content_added: "'{{id}}' wiki orria gehitu da"
mail_body_wiki_content_added: "{{author}}-(e)k '{{page}}' wiki orria gehitu du." mail_body_wiki_content_added: "{{author}}-(e)k '{{id}}' wiki orria gehitu du."
mail_subject_wiki_content_updated: "'{{page}}' wiki orria eguneratu da" mail_subject_wiki_content_updated: "'{{id}}' wiki orria eguneratu da"
mail_body_wiki_content_updated: "{{author}}-(e)k '{{page}}' wiki orria eguneratu du." mail_body_wiki_content_updated: "{{author}}-(e)k '{{id}}' wiki orria eguneratu du."
gui_validation_error: akats 1 gui_validation_error: akats 1
gui_validation_error_plural: "{{count}} akats" gui_validation_error_plural: "{{count}} akats"
......
config/locales/fi.yml
View file @ e9efa5b9
...@@ -840,12 +840,12 @@ fi: ...@@ -840,12 +840,12 @@ fi:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/fr.yml
View file @ e9efa5b9
...@@ -204,10 +204,10 @@ fr: ...@@ -204,10 +204,10 @@ fr:
mail_body_account_activation_request: "Un nouvel utilisateur ({{value}}) s'est inscrit. Son compte nécessite votre approbation :" mail_body_account_activation_request: "Un nouvel utilisateur ({{value}}) s'est inscrit. Son compte nécessite votre approbation :"
mail_subject_reminder: "{{count}} demande(s) arrivent à échéance ({{days}})" mail_subject_reminder: "{{count}} demande(s) arrivent à échéance ({{days}})"
mail_body_reminder: "{{count}} demande(s) qui vous sont assignées arrivent à échéance dans les {{days}} prochains jours :" mail_body_reminder: "{{count}} demande(s) qui vous sont assignées arrivent à échéance dans les {{days}} prochains jours :"
mail_subject_wiki_content_added: "Page wiki '{{page}}' ajoutée" mail_subject_wiki_content_added: "Page wiki '{{id}}' ajoutée"
mail_body_wiki_content_added: "La page wiki '{{page}}' a été ajoutée par {{author}}." mail_body_wiki_content_added: "La page wiki '{{id}}' a été ajoutée par {{author}}."
mail_subject_wiki_content_updated: "Page wiki '{{page}}' mise à jour" mail_subject_wiki_content_updated: "Page wiki '{{id}}' mise à jour"
mail_body_wiki_content_updated: "La page wiki '{{page}}' a été mise à jour par {{author}}." mail_body_wiki_content_updated: "La page wiki '{{id}}' a été mise à jour par {{author}}."
gui_validation_error: 1 erreur gui_validation_error: 1 erreur
gui_validation_error_plural: "{{count}} erreurs" gui_validation_error_plural: "{{count}} erreurs"
......
config/locales/gl.yml
View file @ e9efa5b9
...@@ -831,12 +831,12 @@ gl: ...@@ -831,12 +831,12 @@ gl:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/he.yml
View file @ e9efa5b9
...@@ -196,10 +196,10 @@ he: ...@@ -196,10 +196,10 @@ he:
mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:"
mail_subject_reminder: "{{count}} נושאים מיועדים להגשה בימים הקרובים ({{days}})" mail_subject_reminder: "{{count}} נושאים מיועדים להגשה בימים הקרובים ({{days}})"
mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:" mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:"
mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף" mail_subject_wiki_content_added: "דף ה־wiki ‏'{{id}}' נוסף"
mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}. mail_body_wiki_content_added: דף ה־wiki ‏'{{id}}' נוסף ע"י {{author}}.
mail_subject_wiki_content_updated: "דף ה־wiki ‏'{{page}}' עודכן" mail_subject_wiki_content_updated: "דף ה־wiki ‏'{{id}}' עודכן"
mail_body_wiki_content_updated: דף ה־wiki ‏'{{page}}' עודכן ע"י {{author}}. mail_body_wiki_content_updated: דף ה־wiki ‏'{{id}}' עודכן ע"י {{author}}.
gui_validation_error: שגיאה 1 gui_validation_error: שגיאה 1
gui_validation_error_plural: "{{count}} שגיאות" gui_validation_error_plural: "{{count}} שגיאות"
......
config/locales/hr.yml
View file @ e9efa5b9
...@@ -184,10 +184,10 @@ hr: ...@@ -184,10 +184,10 @@ hr:
mail_body_account_activation_request: "Novi korisnik ({{value}}) je registriran. Njegov korisnički račun čeka vaše odobrenje:" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registriran. Njegov korisnički račun čeka vaše odobrenje:"
mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih {{days}} dana" mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih {{days}} dana"
mail_body_reminder: "{{count}} vama dodijeljen(ih) predmet(a) dospijeva u sljedećih {{days}} dana:" mail_body_reminder: "{{count}} vama dodijeljen(ih) predmet(a) dospijeva u sljedećih {{days}} dana:"
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
gui_validation_error: 1 pogreška gui_validation_error: 1 pogreška
gui_validation_error_plural: "{{count}} pogrešaka" gui_validation_error_plural: "{{count}} pogrešaka"
......
config/locales/hu.yml
View file @ e9efa5b9
...@@ -838,12 +838,12 @@ ...@@ -838,12 +838,12 @@
text_wiki_page_destroy_children: Minden aloldal és leszármazottjának törlése text_wiki_page_destroy_children: Minden aloldal és leszármazottjának törlése
setting_password_min_length: Minimum jelszó hosszúság setting_password_min_length: Minimum jelszó hosszúság
field_group_by: Szerint csoportosítva field_group_by: Szerint csoportosítva
mail_subject_wiki_content_updated: "'{{page}}' wiki oldal frissítve" mail_subject_wiki_content_updated: "'{{id}}' wiki oldal frissítve"
label_wiki_content_added: Wiki oldal hozzáadva label_wiki_content_added: Wiki oldal hozzáadva
mail_subject_wiki_content_added: "Új wiki oldal: '{{page}}'" mail_subject_wiki_content_added: "Új wiki oldal: '{{id}}'"
mail_body_wiki_content_added: A '{{page}}' wiki oldalt {{author}} hozta létre. mail_body_wiki_content_added: A '{{id}}' wiki oldalt {{author}} hozta létre.
label_wiki_content_updated: Wiki oldal frissítve label_wiki_content_updated: Wiki oldal frissítve
mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette. mail_body_wiki_content_updated: A '{{id}}' wiki oldalt {{author}} frissítette.
permission_add_project: Projekt létrehozása permission_add_project: Projekt létrehozása
setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
label_view_all_revisions: Minden revízió megtekintése label_view_all_revisions: Minden revízió megtekintése
......
config/locales/id.yml
View file @ e9efa5b9
...@@ -181,10 +181,10 @@ id: ...@@ -181,10 +181,10 @@ id:
mail_body_account_activation_request: "Pengguna baru ({{value}}) sudan didaftarkan. Akun tersebut menunggu persetujuan anda:" mail_body_account_activation_request: "Pengguna baru ({{value}}) sudan didaftarkan. Akun tersebut menunggu persetujuan anda:"
mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya ({{days}})" mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya ({{days}})"
mail_body_reminder: "{{count}} masalah yang ditugaskan pada anda harus selesai dalam {{days}} hari kedepan:" mail_body_reminder: "{{count}} masalah yang ditugaskan pada anda harus selesai dalam {{days}} hari kedepan:"
mail_subject_wiki_content_added: "'{{page}}' halaman wiki sudah ditambahkan" mail_subject_wiki_content_added: "'{{id}}' halaman wiki sudah ditambahkan"
mail_body_wiki_content_added: "The '{{page}}' halaman wiki sudah ditambahkan oleh {{author}}." mail_body_wiki_content_added: "The '{{id}}' halaman wiki sudah ditambahkan oleh {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' halaman wiki sudah diperbarui" mail_subject_wiki_content_updated: "'{{id}}' halaman wiki sudah diperbarui"
mail_body_wiki_content_updated: "The '{{page}}' halaman wiki sudah diperbarui oleh {{author}}." mail_body_wiki_content_updated: "The '{{id}}' halaman wiki sudah diperbarui oleh {{author}}."
gui_validation_error: 1 kesalahan gui_validation_error: 1 kesalahan
gui_validation_error_plural: "{{count}} kesalahan" gui_validation_error_plural: "{{count}} kesalahan"
......
config/locales/it.yml
View file @ e9efa5b9
...@@ -819,12 +819,12 @@ it: ...@@ -819,12 +819,12 @@ it:
text_wiki_page_destroy_children: Elimina le pagine figlie e tutta la discendenza text_wiki_page_destroy_children: Elimina le pagine figlie e tutta la discendenza
setting_password_min_length: Lunghezza minima password setting_password_min_length: Lunghezza minima password
field_group_by: Raggruppa risultati per field_group_by: Raggruppa risultati per
mail_subject_wiki_content_updated: "La pagina wiki '{{page}}' è stata aggiornata" mail_subject_wiki_content_updated: "La pagina wiki '{{id}}' è stata aggiornata"
label_wiki_content_added: Aggiunta pagina al wiki label_wiki_content_added: Aggiunta pagina al wiki
mail_subject_wiki_content_added: "La pagina '{{page}}' è stata aggiunta al wiki" mail_subject_wiki_content_added: "La pagina '{{id}}' è stata aggiunta al wiki"
mail_body_wiki_content_added: La pagina '{{page}}' è stata aggiunta al wiki da {{author}}. mail_body_wiki_content_added: La pagina '{{id}}' è stata aggiunta al wiki da {{author}}.
label_wiki_content_updated: Aggiornata pagina wiki label_wiki_content_updated: Aggiornata pagina wiki
mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}. mail_body_wiki_content_updated: La pagina '{{id}}' wiki è stata aggiornata da{{author}}.
permission_add_project: Crea progetto permission_add_project: Crea progetto
setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
label_view_all_revisions: Mostra tutte le revisioni label_view_all_revisions: Mostra tutte le revisioni
......
config/locales/ja.yml
View file @ e9efa5b9
...@@ -218,10 +218,10 @@ ja: ...@@ -218,10 +218,10 @@ ja:
mail_body_account_activation_request: "新しいユーザ {{value}} が登録されました。このアカウントはあなたの承認待ちです：" mail_body_account_activation_request: "新しいユーザ {{value}} が登録されました。このアカウントはあなたの承認待ちです："
mail_subject_reminder: "{{count}}件のチケットの期日が{{days}}日以内に到来します" mail_subject_reminder: "{{count}}件のチケットの期日が{{days}}日以内に到来します"
mail_body_reminder: "{{count}}件の担当チケットの期日が{{days}}日以内に到来します:" mail_body_reminder: "{{count}}件の担当チケットの期日が{{days}}日以内に到来します:"
mail_subject_wiki_content_added: "Wikiページ {{page}} が追加されました" mail_subject_wiki_content_added: "Wikiページ {{id}} が追加されました"
mail_body_wiki_content_added: "{{author}} によってWikiページ {{page}} が追加されました。" mail_body_wiki_content_added: "{{author}} によってWikiページ {{id}} が追加されました。"
mail_subject_wiki_content_updated: "Wikiページ {{page}} が更新されました" mail_subject_wiki_content_updated: "Wikiページ {{id}} が更新されました"
mail_body_wiki_content_updated: "{{author}} によってWikiページ {{page}} が更新されました。" mail_body_wiki_content_updated: "{{author}} によってWikiページ {{id}} が更新されました。"
gui_validation_error: 1件のエラー gui_validation_error: 1件のエラー
gui_validation_error_plural: "{{count}}件のエラー" gui_validation_error_plural: "{{count}}件のエラー"
......
config/locales/ko.yml
View file @ e9efa5b9
...@@ -231,10 +231,10 @@ ko: ...@@ -231,10 +231,10 @@ ko:
mail_body_account_activation_request: "새 사용자({{value}})가 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:" mail_body_account_activation_request: "새 사용자({{value}})가 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:"
mail_body_reminder: "당신이 맡고 있는 일감 {{count}}개의 완료 기한이 {{days}}일 후 입니다." mail_body_reminder: "당신이 맡고 있는 일감 {{count}}개의 완료 기한이 {{days}}일 후 입니다."
mail_subject_reminder: "내일이 만기인 일감 {{count}}개 ({{days}})" mail_subject_reminder: "내일이 만기인 일감 {{count}}개 ({{days}})"
mail_subject_wiki_content_added: "위키페이지 '{{page}}'이(가) 추가되었습니다." mail_subject_wiki_content_added: "위키페이지 '{{id}}'이(가) 추가되었습니다."
mail_subject_wiki_content_updated: "'위키페이지 {{page}}'이(가) 수정되었습니다." mail_subject_wiki_content_updated: "'위키페이지 {{id}}'이(가) 수정되었습니다."
mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 추가하였습니다." mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{id}}'을(를) 추가하였습니다."
mail_body_wiki_content_updated: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 수정하였습니다." mail_body_wiki_content_updated: "{{author}}이(가) 위키페이지 '{{id}}'을(를) 수정하였습니다."
gui_validation_error: 에러 gui_validation_error: 에러
gui_validation_error_plural: "{{count}}개 에러" gui_validation_error_plural: "{{count}}개 에러"
......
config/locales/lt.yml
View file @ e9efa5b9
...@@ -241,10 +241,10 @@ lt: ...@@ -241,10 +241,10 @@ lt:
mail_body_account_activation_request: "Užsiregistravo naujas vartotojas ({{value}}). Jo paskyra laukia jūsų patvirtinimo:" mail_body_account_activation_request: "Užsiregistravo naujas vartotojas ({{value}}). Jo paskyra laukia jūsų patvirtinimo:"
mail_subject_reminder: "{{count}} darbas(ai) po kelių {{days}} dienų" mail_subject_reminder: "{{count}} darbas(ai) po kelių {{days}} dienų"
mail_body_reminder: "{{count}} darbas(ai), kurie yra jums priskirti, baigiasi po {{days}} dienų(os):" mail_body_reminder: "{{count}} darbas(ai), kurie yra jums priskirti, baigiasi po {{days}} dienų(os):"
mail_subject_wiki_content_added: "'{{page}}' pridėtas wiki puslapis" mail_subject_wiki_content_added: "'{{id}}' pridėtas wiki puslapis"
mail_body_wiki_content_added: "The '{{page}}' wiki puslapi pridėjo {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki puslapi pridėjo {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' atnaujintas wiki puslapis" mail_subject_wiki_content_updated: "'{{id}}' atnaujintas wiki puslapis"
mail_body_wiki_content_updated: "The '{{page}}' wiki puslapį atnaujino {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki puslapį atnaujino {{author}}."
gui_validation_error: 1 klaida gui_validation_error: 1 klaida
gui_validation_error_plural: "{{count}} klaidų(os)" gui_validation_error_plural: "{{count}} klaidų(os)"
......
config/locales/lv.yml
View file @ e9efa5b9
...@@ -180,10 +180,10 @@ lv: ...@@ -180,10 +180,10 @@ lv:
mail_body_account_activation_request: "Jauns lietotājs ({{value}}) ir reģistrēts. Lietotāja konts gaida Jūsu apstiprinājumu:" mail_body_account_activation_request: "Jauns lietotājs ({{value}}) ir reģistrēts. Lietotāja konts gaida Jūsu apstiprinājumu:"
mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās {{days}} dienās" mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās {{days}} dienās"
mail_body_reminder: "{{count}} uzdevums(i), kurš(i) ir nozīmēts(i) Jums, sagaidāms(i) tuvākajās {{days}} dienās:" mail_body_reminder: "{{count}} uzdevums(i), kurš(i) ir nozīmēts(i) Jums, sagaidāms(i) tuvākajās {{days}} dienās:"
mail_subject_wiki_content_added: "'{{page}}' Wiki lapa pievienota" mail_subject_wiki_content_added: "'{{id}}' Wiki lapa pievienota"
mail_body_wiki_content_added: "The '{{page}}' Wiki lapu pievienojis {{author}}." mail_body_wiki_content_added: "The '{{id}}' Wiki lapu pievienojis {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' Wiki lapa atjaunota" mail_subject_wiki_content_updated: "'{{id}}' Wiki lapa atjaunota"
mail_body_wiki_content_updated: "The '{{page}}' Wiki lapu atjaunojis {{author}}." mail_body_wiki_content_updated: "The '{{id}}' Wiki lapu atjaunojis {{author}}."
gui_validation_error: 1 kļūda gui_validation_error: 1 kļūda
gui_validation_error_plural: "{{count}} kļūdas" gui_validation_error_plural: "{{count}} kļūdas"
......
config/locales/mk.yml
View file @ e9efa5b9
...@@ -192,10 +192,10 @@ mk: ...@@ -192,10 +192,10 @@ mk:
mail_body_account_activation_request: "Нов корисник ({{value}}) е регистриран. The account is pending your approval:" mail_body_account_activation_request: "Нов корисник ({{value}}) е регистриран. The account is pending your approval:"
mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
gui_validation_error: 1 грешка gui_validation_error: 1 грешка
gui_validation_error_plural: "{{count}} грешки" gui_validation_error_plural: "{{count}} грешки"
......
config/locales/mn.yml
View file @ e9efa5b9
...@@ -184,10 +184,10 @@ mn: ...@@ -184,10 +184,10 @@ mn:
mail_body_account_activation_request: "Шинэ хэрэглэгч ({{value}}) бүртгүүлсэн байна. Таны баталгаажуулахыг хүлээж байна:" mail_body_account_activation_request: "Шинэ хэрэглэгч ({{value}}) бүртгүүлсэн байна. Таны баталгаажуулахыг хүлээж байна:"
mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй ({{days}})" mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй ({{days}})"
mail_body_reminder: "Танд оноогдсон {{count}} асуудлуудыг дараагийн {{days}} өдрүүдэд шийдэх хэрэгтэй:" mail_body_reminder: "Танд оноогдсон {{count}} асуудлуудыг дараагийн {{days}} өдрүүдэд шийдэх хэрэгтэй:"
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}." mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
gui_validation_error: 1 алдаа gui_validation_error: 1 алдаа
gui_validation_error_plural: "{{count}} алдаа" gui_validation_error_plural: "{{count}} алдаа"
......
config/locales/nl.yml
View file @ e9efa5b9
...@@ -797,12 +797,12 @@ nl: ...@@ -797,12 +797,12 @@ nl:
text_wiki_page_destroy_children: Verwijder alle subpagina's en onderliggende pagina's text_wiki_page_destroy_children: Verwijder alle subpagina's en onderliggende pagina's
setting_password_min_length: Minimum wachtwoord lengte setting_password_min_length: Minimum wachtwoord lengte
field_group_by: Groepeer resultaten per field_group_by: Groepeer resultaten per
mail_subject_wiki_content_updated: "'{{page}}' wiki pagina is bijgewerkt" mail_subject_wiki_content_updated: "'{{id}}' wiki pagina is bijgewerkt"
label_wiki_content_added: Wiki pagina toegevoegd label_wiki_content_added: Wiki pagina toegevoegd
mail_subject_wiki_content_added: "'{{page}}' wiki pagina is toegevoegd" mail_subject_wiki_content_added: "'{{id}}' wiki pagina is toegevoegd"
mail_body_wiki_content_added: The '{{page}}' wiki pagina is toegevoegd door {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki pagina is toegevoegd door {{author}}.
label_wiki_content_updated: Wiki pagina bijgewerkt label_wiki_content_updated: Wiki pagina bijgewerkt
mail_body_wiki_content_updated: The '{{page}}' wiki pagina is bijgewerkt door {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki pagina is bijgewerkt door {{author}}.
permission_add_project: Maak project permission_add_project: Maak project
setting_new_project_user_role_id: Rol van gebruiker die een project maakt setting_new_project_user_role_id: Rol van gebruiker die een project maakt
label_view_all_revisions: Bekijk alle revisies label_view_all_revisions: Bekijk alle revisies
......
config/locales/no.yml
View file @ e9efa5b9
...@@ -806,12 +806,12 @@ ...@@ -806,12 +806,12 @@
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/pl.yml
View file @ e9efa5b9
...@@ -835,12 +835,12 @@ pl: ...@@ -835,12 +835,12 @@ pl:
text_wiki_page_destroy_children: Usuń wszystkie podstrony text_wiki_page_destroy_children: Usuń wszystkie podstrony
setting_password_min_length: Minimalna długość hasła setting_password_min_length: Minimalna długość hasła
field_group_by: Grupuj wyniki wg field_group_by: Grupuj wyniki wg
mail_subject_wiki_content_updated: "Strona wiki '{{page}}' została uaktualniona" mail_subject_wiki_content_updated: "Strona wiki '{{id}}' została uaktualniona"
label_wiki_content_added: Dodano stronę wiki label_wiki_content_added: Dodano stronę wiki
mail_subject_wiki_content_added: "Strona wiki '{{page}}' została dodana" mail_subject_wiki_content_added: "Strona wiki '{{id}}' została dodana"
mail_body_wiki_content_added: Strona wiki '{{page}}' została dodana przez {{author}}. mail_body_wiki_content_added: Strona wiki '{{id}}' została dodana przez {{author}}.
label_wiki_content_updated: Uaktualniono stronę wiki label_wiki_content_updated: Uaktualniono stronę wiki
mail_body_wiki_content_updated: Strona wiki '{{page}}' została uaktualniona przez {{author}}. mail_body_wiki_content_updated: Strona wiki '{{id}}' została uaktualniona przez {{author}}.
permission_add_project: Tworzenie projektu permission_add_project: Tworzenie projektu
setting_new_project_user_role_id: Rola nadawana twórcom projektów, którzy nie posiadają uprawnień administatora setting_new_project_user_role_id: Rola nadawana twórcom projektów, którzy nie posiadają uprawnień administatora
label_view_all_revisions: Pokaż wszystkie rewizje label_view_all_revisions: Pokaż wszystkie rewizje
......
config/locales/pt-BR.yml
View file @ e9efa5b9
...@@ -839,12 +839,12 @@ pt-BR: ...@@ -839,12 +839,12 @@ pt-BR:
text_wiki_page_destroy_children: Excluir páginas filhas e todas suas descendentes text_wiki_page_destroy_children: Excluir páginas filhas e todas suas descendentes
setting_password_min_length: Comprimento mínimo para senhas setting_password_min_length: Comprimento mínimo para senhas
field_group_by: Agrupar por field_group_by: Agrupar por
mail_subject_wiki_content_updated: "A página wiki '{{page}}' foi atualizada" mail_subject_wiki_content_updated: "A página wiki '{{id}}' foi atualizada"
label_wiki_content_added: Página wiki adicionada label_wiki_content_added: Página wiki adicionada
mail_subject_wiki_content_added: "A página wiki '{{page}}' foi adicionada" mail_subject_wiki_content_added: "A página wiki '{{id}}' foi adicionada"
mail_body_wiki_content_added: A página wiki '{{page}}' foi adicionada por {{author}}. mail_body_wiki_content_added: A página wiki '{{id}}' foi adicionada por {{author}}.
label_wiki_content_updated: Página wiki atualizada label_wiki_content_updated: Página wiki atualizada
mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}. mail_body_wiki_content_updated: A página wiki '{{id}}' foi atualizada por {{author}}.
permission_add_project: Criar projeto permission_add_project: Criar projeto
setting_new_project_user_role_id: Papel atribuído a um usuário não-administrador que cria um projeto setting_new_project_user_role_id: Papel atribuído a um usuário não-administrador que cria um projeto
label_view_all_revisions: Ver todas as revisões label_view_all_revisions: Ver todas as revisões
......
config/locales/pt.yml
View file @ e9efa5b9
...@@ -823,12 +823,12 @@ pt: ...@@ -823,12 +823,12 @@ pt:
text_wiki_page_destroy_children: Apagar as páginas subordinadas e todos os seus descendentes text_wiki_page_destroy_children: Apagar as páginas subordinadas e todos os seus descendentes
setting_password_min_length: Tamanho mínimo de palavra-chave setting_password_min_length: Tamanho mínimo de palavra-chave
field_group_by: Agrupar resultados por field_group_by: Agrupar resultados por
mail_subject_wiki_content_updated: "A página Wiki '{{page}}' foi actualizada" mail_subject_wiki_content_updated: "A página Wiki '{{id}}' foi actualizada"
label_wiki_content_added: Página Wiki adicionada label_wiki_content_added: Página Wiki adicionada
mail_subject_wiki_content_added: "A página Wiki '{{page}}' foi adicionada" mail_subject_wiki_content_added: "A página Wiki '{{id}}' foi adicionada"
mail_body_wiki_content_added: A página Wiki '{{page}}' foi adicionada por {{author}}. mail_body_wiki_content_added: A página Wiki '{{id}}' foi adicionada por {{author}}.
label_wiki_content_updated: Página Wiki actualizada label_wiki_content_updated: Página Wiki actualizada
mail_body_wiki_content_updated: A página Wiki '{{page}}' foi actualizada por {{author}}. mail_body_wiki_content_updated: A página Wiki '{{id}}' foi actualizada por {{author}}.
permission_add_project: Criar projecto permission_add_project: Criar projecto
setting_new_project_user_role_id: Função atribuída a um utilizador não-administrador que cria um projecto setting_new_project_user_role_id: Função atribuída a um utilizador não-administrador que cria um projecto
label_view_all_revisions: Ver todas as revisões label_view_all_revisions: Ver todas as revisões
......
config/locales/ro.yml
View file @ e9efa5b9
...@@ -808,12 +808,12 @@ ro: ...@@ -808,12 +808,12 @@ ro:
text_wiki_page_destroy_children: Șterge paginile și descendenții text_wiki_page_destroy_children: Șterge paginile și descendenții
setting_password_min_length: Lungime minimă parolă setting_password_min_length: Lungime minimă parolă
field_group_by: Grupează după field_group_by: Grupează după
mail_subject_wiki_content_updated: "Pagina wiki '{{page}}' a fost actualizată" mail_subject_wiki_content_updated: "Pagina wiki '{{id}}' a fost actualizată"
label_wiki_content_added: Adăugat label_wiki_content_added: Adăugat
mail_subject_wiki_content_added: "Pagina wiki '{{page}}' a fost adăugată" mail_subject_wiki_content_added: "Pagina wiki '{{id}}' a fost adăugată"
mail_body_wiki_content_added: Pagina wiki '{{page}}' a fost adăugată de {{author}}. mail_body_wiki_content_added: Pagina wiki '{{id}}' a fost adăugată de {{author}}.
label_wiki_content_updated: Actualizat label_wiki_content_updated: Actualizat
mail_body_wiki_content_updated: Pagina wiki '{{page}}' a fost actualizată de {{author}}. mail_body_wiki_content_updated: Pagina wiki '{{id}}' a fost actualizată de {{author}}.
permission_add_project: Crează proiect permission_add_project: Crează proiect
setting_new_project_user_role_id: Rol atribuit utilizatorului non-admin care crează un proiect. setting_new_project_user_role_id: Rol atribuit utilizatorului non-admin care crează un proiect.
label_view_all_revisions: Arată toate reviziile label_view_all_revisions: Arată toate reviziile
......
config/locales/ru.yml
View file @ e9efa5b9
...@@ -959,12 +959,12 @@ ru: ...@@ -959,12 +959,12 @@ ru:
text_wiki_page_destroy_children: Удалить дочерние страницы и всех их потомков text_wiki_page_destroy_children: Удалить дочерние страницы и всех их потомков
setting_password_min_length: Минимальная длина пароля setting_password_min_length: Минимальная длина пароля
field_group_by: Группировать результаты по field_group_by: Группировать результаты по
mail_subject_wiki_content_updated: "Wiki-страница '{{page}}' была обновлена" mail_subject_wiki_content_updated: "Wiki-страница '{{id}}' была обновлена"
label_wiki_content_added: Добавлена wiki-страница label_wiki_content_added: Добавлена wiki-страница
mail_subject_wiki_content_added: "Wiki-страница '{{page}}' была добавлена" mail_subject_wiki_content_added: "Wiki-страница '{{id}}' была добавлена"
mail_body_wiki_content_added: "{{author}} добавил(а) wiki-страницу '{{page}}'." mail_body_wiki_content_added: "{{author}} добавил(а) wiki-страницу '{{id}}'."
label_wiki_content_updated: Обновлена wiki-страница label_wiki_content_updated: Обновлена wiki-страница
mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{page}}'." mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{id}}'."
permission_add_project: Создание проекта permission_add_project: Создание проекта
setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект
label_view_all_revisions: Показать все ревизии label_view_all_revisions: Показать все ревизии
......
config/locales/sk.yml
View file @ e9efa5b9
...@@ -809,13 +809,13 @@ sk: ...@@ -809,13 +809,13 @@ sk:
text_wiki_page_destroy_children: Vymazať podstránky a všetkých ich potomkov text_wiki_page_destroy_children: Vymazať podstránky a všetkých ich potomkov
setting_password_min_length: Minimálna dĺžka hesla setting_password_min_length: Minimálna dĺžka hesla
field_group_by: Skupinové výsledky podľa field_group_by: Skupinové výsledky podľa
mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka bola aktualizovaná" mail_subject_wiki_content_updated: "'{{id}}' Wiki stránka bola aktualizovaná"
label_wiki_content_added: Wiki stránka pridaná label_wiki_content_added: Wiki stránka pridaná
mail_subject_wiki_content_added: "'{{page}}' Wiki stránka bola pridaná" mail_subject_wiki_content_added: "'{{id}}' Wiki stránka bola pridaná"
mail_body_wiki_content_added: The '{{page}}' Wiki stránka bola pridaná užívateľom {{author}}. mail_body_wiki_content_added: The '{{id}}' Wiki stránka bola pridaná užívateľom {{author}}.
permission_add_project: Vytvorenie projektu permission_add_project: Vytvorenie projektu
label_wiki_content_updated: Wiki stránka aktualizovaná label_wiki_content_updated: Wiki stránka aktualizovaná
mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}. mail_body_wiki_content_updated: Wiki stránka '{{id}}' bola aktualizovaná užívateľom {{author}}.
setting_repositories_encodings: Kódovanie repozitára setting_repositories_encodings: Kódovanie repozitára
setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
label_view_all_revisions: Zobraziť všetkz revízie label_view_all_revisions: Zobraziť všetkz revízie
......
config/locales/sl.yml
View file @ e9efa5b9
...@@ -811,12 +811,12 @@ sl: ...@@ -811,12 +811,12 @@ sl:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/sr-YU.yml
View file @ e9efa5b9
...@@ -192,10 +192,10 @@ sr-YU: ...@@ -192,10 +192,10 @@ sr-YU:
mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:"
mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana" mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana"
mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:" mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:"
mail_subject_wiki_content_added: "Wiki stranica '{{page}}' je dodata" mail_subject_wiki_content_added: "Wiki stranica '{{id}}' je dodata"
mail_body_wiki_content_added: "{{author}} je dodao wiki stranicu '{{page}}'." mail_body_wiki_content_added: "{{author}} je dodao wiki stranicu '{{id}}'."
mail_subject_wiki_content_updated: "Wiki stranica '{{page}}' je ažurirana" mail_subject_wiki_content_updated: "Wiki stranica '{{id}}' je ažurirana"
mail_body_wiki_content_updated: "{{author}} je ažurirao wiki stranicu '{{page}}'." mail_body_wiki_content_updated: "{{author}} je ažurirao wiki stranicu '{{id}}'."
gui_validation_error: jedna greška gui_validation_error: jedna greška
gui_validation_error_plural: "{{count}} grešaka" gui_validation_error_plural: "{{count}} grešaka"
......
config/locales/sr.yml
View file @ e9efa5b9
...@@ -192,10 +192,10 @@ sr: ...@@ -192,10 +192,10 @@ sr:
mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:" mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:"
mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана" mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана"
mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:" mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:"
mail_subject_wiki_content_added: "Wiki страница '{{page}}' је додата" mail_subject_wiki_content_added: "Wiki страница '{{id}}' је додата"
mail_body_wiki_content_added: "{{author}} је додао wiki страницу '{{page}}'." mail_body_wiki_content_added: "{{author}} је додао wiki страницу '{{id}}'."
mail_subject_wiki_content_updated: "Wiki страница '{{page}}' је ажурирана" mail_subject_wiki_content_updated: "Wiki страница '{{id}}' је ажурирана"
mail_body_wiki_content_updated: "{{author}} је ажурирао wiki страницу '{{page}}'." mail_body_wiki_content_updated: "{{author}} је ажурирао wiki страницу '{{id}}'."
gui_validation_error: једна грешка gui_validation_error: једна грешка
gui_validation_error_plural: "{{count}} грешака" gui_validation_error_plural: "{{count}} грешака"
......
config/locales/sv.yml
View file @ e9efa5b9
...@@ -238,10 +238,10 @@ sv: ...@@ -238,10 +238,10 @@ sv:
mail_body_account_activation_request: "En ny användare ({{value}}) har registrerat sig och avvaktar ditt godkännande:" mail_body_account_activation_request: "En ny användare ({{value}}) har registrerat sig och avvaktar ditt godkännande:"
mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande {{days}} dagarna" mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande {{days}} dagarna"
mail_body_reminder: "{{count}} ärende(n) som är tilldelat dig har deadline under de {{days}} dagarna:" mail_body_reminder: "{{count}} ärende(n) som är tilldelat dig har deadline under de {{days}} dagarna:"
mail_subject_wiki_content_added: "'{{page}}' wikisida has lagts till" mail_subject_wiki_content_added: "'{{id}}' wikisida has lagts till"
mail_body_wiki_content_added: The '{{page}}' wikisida has lagts till av {{author}}. mail_body_wiki_content_added: The '{{id}}' wikisida has lagts till av {{author}}.
mail_subject_wiki_content_updated: "'{{page}}' wikisida har uppdaterats" mail_subject_wiki_content_updated: "'{{id}}' wikisida har uppdaterats"
mail_body_wiki_content_updated: The '{{page}}' wikisida har uppdaterats av {{author}}. mail_body_wiki_content_updated: The '{{id}}' wikisida har uppdaterats av {{author}}.
gui_validation_error: 1 fel gui_validation_error: 1 fel
gui_validation_error_plural: "{{count}} fel" gui_validation_error_plural: "{{count}} fel"
......
config/locales/th.yml
View file @ e9efa5b9
...@@ -812,12 +812,12 @@ th: ...@@ -812,12 +812,12 @@ th:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/tr.yml
View file @ e9efa5b9
...@@ -838,12 +838,12 @@ tr: ...@@ -838,12 +838,12 @@ tr:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/uk.yml
View file @ e9efa5b9
...@@ -811,12 +811,12 @@ uk: ...@@ -811,12 +811,12 @@ uk:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/vi.yml
View file @ e9efa5b9
...@@ -870,12 +870,12 @@ vi: ...@@ -870,12 +870,12 @@ vi:
text_wiki_page_destroy_children: Delete child pages and all their descendants text_wiki_page_destroy_children: Delete child pages and all their descendants
setting_password_min_length: Minimum password length setting_password_min_length: Minimum password length
field_group_by: Group results by field_group_by: Group results by
mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
label_wiki_content_added: Wiki page added label_wiki_content_added: Wiki page added
mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
label_wiki_content_updated: Wiki page updated label_wiki_content_updated: Wiki page updated
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
permission_add_project: Create project permission_add_project: Create project
setting_new_project_user_role_id: Role given to a non-admin user who creates a project setting_new_project_user_role_id: Role given to a non-admin user who creates a project
label_view_all_revisions: View all revisions label_view_all_revisions: View all revisions
......
config/locales/zh-TW.yml
View file @ e9efa5b9
...@@ -277,10 +277,10 @@ ...@@ -277,10 +277,10 @@
mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核：" mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核："
mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})" mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})"
mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期：" mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期："
mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增" mail_subject_wiki_content_added: "'{{id}}' wiki 頁面已被新增"
mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。" mail_body_wiki_content_added: "The '{{id}}' wiki 頁面已被 {{author}} 新增。"
mail_subject_wiki_content_updated: "'{{page}}' wiki 頁面已被更新" mail_subject_wiki_content_updated: "'{{id}}' wiki 頁面已被更新"
mail_body_wiki_content_updated: "The '{{page}}' wiki 頁面已被 {{author}} 更新。" mail_body_wiki_content_updated: "The '{{id}}' wiki 頁面已被 {{author}} 更新。"
gui_validation_error: 1 個錯誤 gui_validation_error: 1 個錯誤
gui_validation_error_plural: "{{count}} 個錯誤" gui_validation_error_plural: "{{count}} 個錯誤"
......
config/locales/zh.yml
View file @ e9efa5b9
...@@ -204,10 +204,10 @@ zh: ...@@ -204,10 +204,10 @@ zh:
mail_body_account_activation_request: "新用户（{{value}}）已完成注册，正在等候您的审核：" mail_body_account_activation_request: "新用户（{{value}}）已完成注册，正在等候您的审核："
mail_subject_reminder: "{{count}} 个问题需要尽快解决 ({{days}})" mail_subject_reminder: "{{count}} 个问题需要尽快解决 ({{days}})"
mail_body_reminder: "指派给您的 {{count}} 个问题需要在 {{days}} 天内完成：" mail_body_reminder: "指派给您的 {{count}} 个问题需要在 {{days}} 天内完成："
mail_subject_wiki_content_added: "'{{page}}' wiki页面已添加" mail_subject_wiki_content_added: "'{{id}}' wiki页面已添加"
mail_body_wiki_content_added: "'{{page}}' wiki页面已由 {{author}} 添加。" mail_body_wiki_content_added: "'{{id}}' wiki页面已由 {{author}} 添加。"
mail_subject_wiki_content_updated: "'{{page}}' wiki页面已更新" mail_subject_wiki_content_updated: "'{{id}}' wiki页面已更新"
mail_body_wiki_content_updated: "'{{page}}' wiki页面已由 {{author}} 更新。" mail_body_wiki_content_updated: "'{{id}}' wiki页面已由 {{author}} 更新。"
gui_validation_error: 1 个错误 gui_validation_error: 1 个错误
gui_validation_error_plural: "{{count}} 个错误" gui_validation_error_plural: "{{count}} 个错误"
......
config/routes.rb
View file @ e9efa5b9
...@@ -32,21 +32,21 @@ ActionController::Routing::Routes.draw do |map| ...@@ -32,21 +32,21 @@ ActionController::Routing::Routes.draw do |map|
wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export' wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
wiki_views.connect 'projects/:project_id/wiki/index', :action => 'index' wiki_views.connect 'projects/:project_id/wiki/index', :action => 'index'
wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index' wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'show', :page => nil wiki_views.connect 'projects/:project_id/wiki/:id', :action => 'show', :id => nil
wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit' wiki_views.connect 'projects/:project_id/wiki/:id/edit', :action => 'edit'
wiki_views.connect 'projects/:project_id/wiki/:page/rename', :action => 'rename' wiki_views.connect 'projects/:project_id/wiki/:id/rename', :action => 'rename'
wiki_views.connect 'projects/:project_id/wiki/:page/history', :action => 'history' wiki_views.connect 'projects/:project_id/wiki/:id/history', :action => 'history'
wiki_views.connect 'projects/:project_id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff' wiki_views.connect 'projects/:project_id/wiki/:id/diff/:version/vs/:version_from', :action => 'diff'
wiki_views.connect 'projects/:project_id/wiki/:page/annotate/:version', :action => 'annotate' wiki_views.connect 'projects/:project_id/wiki/:id/annotate/:version', :action => 'annotate'
end end
wiki_routes.connect 'projects/:project_id/wiki/:page/:action', wiki_routes.connect 'projects/:project_id/wiki/:id/:action',
:action => /rename|preview|protect|add_attachment/, :action => /rename|preview|protect|add_attachment/,
:conditions => {:method => :post} :conditions => {:method => :post}
wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post} wiki_routes.connect 'projects/:project_id/wiki/:id/edit', :action => 'update', :conditions => {:method => :post}
wiki_routes.connect 'projects/:project_id/wiki/:page', :action => 'destroy', :conditions => {:method => :delete} wiki_routes.connect 'projects/:project_id/wiki/:id', :action => 'destroy', :conditions => {:method => :delete}
end end
map.with_options :controller => 'messages' do |messages_routes| map.with_options :controller => 'messages' do |messages_routes|
......
lib/redmine.rb
View file @ e9efa5b9
...@@ -195,7 +195,7 @@ Redmine::MenuManager.map :project_menu do |menu| ...@@ -195,7 +195,7 @@ Redmine::MenuManager.map :project_menu do |menu|
menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
menu.push :wiki, { :controller => 'wiki', :action => 'show', :page => nil }, :param => :project_id, menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
:if => Proc.new { |p| p.wiki && !p.wiki.new_record? } :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
:if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
......
test/functional/wiki_controller_test.rb
View file @ e9efa5b9
This diff is collapsed.
test/integration/routing_test.rb
View file @ e9efa5b9
...@@ -312,23 +312,23 @@ class RoutingTest < ActionController::IntegrationTest ...@@ -312,23 +312,23 @@ class RoutingTest < ActionController::IntegrationTest
context "wiki (singular, project's pages)" do context "wiki (singular, project's pages)" do
should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567' should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567'
should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :page => 'lalala' should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :id => 'lalala'
should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :page => 'my_page' should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :id => 'my_page'
should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :page => 'CookBook_documentation' should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :id => 'CookBook_documentation'
should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1' should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2', :version_from => '1'
should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :page => 'CookBook_documentation', :version => '2' should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida' should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567' should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567'
should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567' should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567' should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page' should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation' should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :id => 'CookBook_documentation'
should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida' should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida' should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :id => 'ladida'
should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida' should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :id => 'ladida'
should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida' should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :id => 'ladida'
end end
context "wikis (plural, admin setup)" do context "wikis (plural, admin setup)" do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment