From 3a76564894bffb3555973d55f45af393e80c8d6c Mon Sep 17 00:00:00 2001
From: Marcin Szewczyk <marcin.szewczyk@wodny.org>
Date: Fri, 28 Nov 2014 16:45:29 +0100
Subject: [PATCH] redmine/localizable: v0.2.1 to fix UTF-8 problems

---
 .../plugins/localizable/app/views/settings/_localizable.html.erb  | 8 ++++----
 redmine/vendor/plugins/localizable/init.rb                        | 2 +-
 redmine/vendor/plugins/localizable/lib/localizable.rb             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/redmine/vendor/plugins/localizable/app/views/settings/_localizable.html.erb b/redmine/vendor/plugins/localizable/app/views/settings/_localizable.html.erb
index aee99d9..3c3a8f1 100644
--- a/redmine/vendor/plugins/localizable/app/views/settings/_localizable.html.erb
+++ b/redmine/vendor/plugins/localizable/app/views/settings/_localizable.html.erb
@@ -77,8 +77,8 @@
   <tbody>
   <%- @settings["locales"][element[:name]] = {} if @settings["locales"][element[:name]].nil? -%>
   <%- element[:objects].each do |object| -%>
-    <%- if type != object.type.to_s -%>
-    <%- type = object.type.to_s -%>
+    <%- if type != object.class.to_s -%>
+    <%- type = object.class.to_s -%>
     <tr>
       <td colspan="<%= @settings["locales_to_translate"].size + 1 %>">
         <b><em><%= l(type_labels[object.type.to_s.gsub(/CustomField/, "")]) %></em></b>
@@ -92,8 +92,8 @@
       </td>
       <%- @settings["locales_to_translate"].each do |locale| -%>
       <td align="left">
-        <input name="settings[locales][<%= element[:name] %>][<%= object.id %>][<%= locale %>]"
-               value="<%= @settings["locales"][element[:name]][object.id.to_s][locale] %>" />
+        <input name="settings[locales][<%= element[:name] %>][<%= object.id %>][<%= locale.to_s.force_encoding("UTF-8") %>]"
+               value="<%= @settings["locales"][element[:name]][object.id.to_s][locale].to_s.force_encoding("UTF-8") %>" />
       </td>
       <%- end -%>
     </tr>
diff --git a/redmine/vendor/plugins/localizable/init.rb b/redmine/vendor/plugins/localizable/init.rb
index 24432a0..a3a3e59 100644
--- a/redmine/vendor/plugins/localizable/init.rb
+++ b/redmine/vendor/plugins/localizable/init.rb
@@ -27,7 +27,7 @@ Redmine::Plugin.register :localizable do
   author "Emilio González Montaña"
   author_url "http://ociotec.com"
   description "This is a plugin for Redmine that is used to show strings (issue types, issue statuses, enumerations, ...) in serveral languages"
-  version "0.2.0"
+  version "0.2.1"
   requires_redmine :version_or_higher => "0.9.0"
   
   settings :default => {"default_language" => "en",
diff --git a/redmine/vendor/plugins/localizable/lib/localizable.rb b/redmine/vendor/plugins/localizable/lib/localizable.rb
index 5cd3d85..9e3627a 100644
--- a/redmine/vendor/plugins/localizable/lib/localizable.rb
+++ b/redmine/vendor/plugins/localizable/lib/localizable.rb
@@ -7,7 +7,7 @@ module Localizable
         unless Setting["plugin_localizable"]["locales"][type].nil?
           unless Setting["plugin_localizable"]["locales"][type][id.to_s].nil?
             unless Setting["plugin_localizable"]["locales"][type][id.to_s][User.current.language.to_s].blank?
-              value = Setting["plugin_localizable"]["locales"][type][id.to_s][User.current.language.to_s]
+              value = Setting["plugin_localizable"]["locales"][type][id.to_s][User.current.language.to_s].to_s.force_encoding("UTF-8")
             end
           end
         end
-- 
2.1.1