scm: attachment: remove "to_utf8" methods from helpers (#2371)
It is confusing that same name methods are in several helpers. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7871 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -7,7 +7,11 @@
|
||||
<% if diff.diff_type == 'sbs' -%>
|
||||
<table class="filecontent">
|
||||
<thead>
|
||||
<tr><th colspan="4" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
|
||||
<tr>
|
||||
<th colspan="4" class="filename">
|
||||
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% table_file.each_line do |spacing, line| -%>
|
||||
@@ -19,11 +23,11 @@
|
||||
<tr>
|
||||
<th class="line-num"><%= line.nb_line_left %></th>
|
||||
<td class="line-code <%= line.type_diff_left %>">
|
||||
<pre><%=to_utf8 line.html_line_left %></pre>
|
||||
<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left) %></pre>
|
||||
</td>
|
||||
<th class="line-num"><%= line.nb_line_right %></th>
|
||||
<td class="line-code <%= line.type_diff_right %>">
|
||||
<pre><%=to_utf8 line.html_line_right %></pre>
|
||||
<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right) %></pre>
|
||||
</td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
@@ -33,7 +37,11 @@
|
||||
<% else -%>
|
||||
<table class="filecontent">
|
||||
<thead>
|
||||
<tr><th colspan="3" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
|
||||
<tr>
|
||||
<th colspan="3" class="filename">
|
||||
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% table_file.each_line do |spacing, line| %>
|
||||
@@ -46,7 +54,7 @@
|
||||
<th class="line-num"><%= line.nb_line_left %></th>
|
||||
<th class="line-num"><%= line.nb_line_right %></th>
|
||||
<td class="line-code <%= line.type_diff %>">
|
||||
<pre><%=to_utf8 line.html_line %></pre>
|
||||
<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line) %></pre>
|
||||
</td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
|
||||
Reference in New Issue
Block a user