diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-23 13:55:40 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-23 13:55:40 +0000 |
| commit | b085b2fce1e244aae43a300578f0d002fbf224da (patch) | |
| tree | c255236ef58858f16e9b01ef673e4ec37cca1d97 /app | |
| parent | c9640667d13cb8f37a94858acac68c0e6174107d (diff) | |
| download | redmine-b085b2fce1e244aae43a300578f0d002fbf224da.tar.gz redmine-b085b2fce1e244aae43a300578f0d002fbf224da.zip | |
User label_revision instead of label_version for wiki edits (#26575).
git-svn-id: http://svn.redmine.org/redmine/trunk@17509 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/wiki/diff.html.erb | 4 | ||||
| -rw-r--r-- | app/views/wiki/show.html.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb index 335e581f8..2482242fb 100644 --- a/app/views/wiki/diff.html.erb +++ b/app/views/wiki/diff.html.erb @@ -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> → -<%= 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 %> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 8dd106818..caa35eb08 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -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 %> - |