Skip to content

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

Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string' 

Conflicts:
	app/helpers/repositories_helper.rb
parents 30e81bed 552cd8dc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
app/helpers/repositories_helper.rb
View file @ 4d48a6b6
...@@ -99,7 +99,7 @@ module RepositoriesHelper ...@@ -99,7 +99,7 @@ module RepositoriesHelper
:path => path_param, :path => path_param,
:rev => @changeset.identifier) unless c.action == 'D' :rev => @changeset.identifier) unless c.action == 'D'
text << " - #{h(c.revision)}" unless c.revision.blank? text << " - #{h(c.revision)}" unless c.revision.blank?
text << ' (' + link_to('diff', :controller => 'repositories', text << ' (' + link_to(l(:label_diff), :controller => 'repositories',
:action => 'diff', :action => 'diff',
:id => @project, :id => @project,
:path => path_param, :path => path_param,
......
app/views/wiki/show.rhtml
View file @ 4d48a6b6
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<p> <p>
<%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %> <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :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', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> - <%= '(' + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
<%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %> <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
<%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %> <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
<br /> <br />
......
config/locales/en.yml
View file @ 4d48a6b6
...@@ -678,6 +678,7 @@ en: ...@@ -678,6 +678,7 @@ en:
label_statistics: Statistics label_statistics: Statistics
label_commits_per_month: Commits per month label_commits_per_month: Commits per month
label_commits_per_author: Commits per author label_commits_per_author: Commits per author
label_diff: diff
label_view_diff: View differences label_view_diff: View differences
label_diff_inline: inline label_diff_inline: inline
label_diff_side_by_side: side by side label_diff_side_by_side: side by side
......
config/locales/fr.yml
View file @ 4d48a6b6
...@@ -672,6 +672,7 @@ fr: ...@@ -672,6 +672,7 @@ fr:
label_statistics: Statistiques label_statistics: Statistiques
label_commits_per_month: Commits par mois label_commits_per_month: Commits par mois
label_commits_per_author: Commits par auteur label_commits_per_author: Commits par auteur
label_diff: diff
label_view_diff: Voir les différences label_view_diff: Voir les différences
label_diff_inline: en ligne label_diff_inline: en ligne
label_diff_side_by_side: côte à côte label_diff_side_by_side: côte à côte
......
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