dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641)

Browse Source 
fix that diff outputs become ??? in some non ASCII words.

Contributed by Filou Centrinov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11551 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2013-03-07 21:03:55 +00:00
parent 0e92038047
commit a4b6928a26
5 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/common/_diff.html.erb
+5 -5
View File
@@ -10,7 +10,7 @@
<thead>
<tr>
<th colspan="4" class="filename">
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
<%= table_file.file_name %>
</th>
</tr>
</thead>
@@ -24,11 +24,11 @@
<tr>
<th class="line-num"><%= line.nb_line_left %></th>
<td class="line-code <%= line.type_diff_left %>">
<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
<pre><%= line.html_line_left.html_safe %></pre>
</td>
<th class="line-num"><%= line.nb_line_right %></th>
<td class="line-code <%= line.type_diff_right %>">
<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
<pre><%= line.html_line_right.html_safe %></pre>
</td>
</tr>
<% end -%>
@@ -40,7 +40,7 @@
<thead>
<tr>
<th colspan="3" class="filename">
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
<%= table_file.file_name %>
</th>
</tr>
</thead>
@@ -55,7 +55,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><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
<pre><%= line.html_line.html_safe %></pre>
</td>
</tr>
<% end -%>