diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-03-07 08:31:58 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-03-07 08:31:58 +0000 |
| commit | b19a6d06d91252611571d2d045326daf58a3fb10 (patch) | |
| tree | 881375296e5967f27f9e1bde567a10c05802447a /app/views/common | |
| parent | 8e92ffc191354f15775165762efbbf882f9056a3 (diff) | |
| download | redmine-b19a6d06d91252611571d2d045326daf58a3fb10.tar.gz redmine-b19a6d06d91252611571d2d045326daf58a3fb10.zip | |
move utf8 encoding from view to UnifiedDiff (#12641)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11545 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
| -rw-r--r-- | app/views/common/_diff.html.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb index 94434fe86..0d30bedd2 100644 --- a/app/views/common/_diff.html.erb +++ b/app/views/common/_diff.html.erb @@ -10,7 +10,7 @@ <thead> <tr> <th colspan="4" class="filename"> - <%= 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"> - <%= 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 -%> |