meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-04 22:59:47 +00:00
Code Issues Releases Wiki Activity

User label_revision instead of label_version for wiki edits (#26575).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@17509 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-09-23 13:55:40 +00:00
parent c9640667d1
commit b085b2fce1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/wiki/diff.html.erb
View File

@ -10,12 +10,12 @@
"#{l(:label_version)} #{@diff.content_to.version}" %>
<p>
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
<%= l(:label_revision) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
<em>(<%= @diff.content_from.author ?
@diff.content_from.author.name : l(:label_user_anonymous)
%>, <%= format_time(@diff.content_from.updated_on) %>)</em>
&#8594;
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
<%= l(:label_revision) %> <%= link_to @diff.content_to.version, :action => 'show',
:id => @page.title, :project_id => @page.project,
:version => @diff.content_to.version
%>/<%= @page.content.version %>

4
app/views/wiki/show.html.erb
View File

@ -21,13 +21,13 @@
<% unless @content.current_version? %>
<%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)],
[l(:label_history), history_project_wiki_page_path(@page.project, @page.title)],
"#{l(:label_version)} #{@content.version}" %>
"#{l(:label_revision)} #{@content.version}" %>
<p>
<%= link_to(("\xc2\xab " + l(:label_previous)),
:action => 'show', :id => @page.title, :project_id => @page.project,
:version => @content.previous.version) + " - " if @content.previous %>
<%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
<%= "#{l(:label_revision)} #{@content.version}/#{@page.content.version}" %>
<%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
:id => @page.title, :project_id => @page.project,
:version => @content.version) + ')'.html_safe if @content.previous %> -