Merge pull request #2839 from Elberet/smf2-import

Fix pretty_text translation helper again, this time for real

lib/pretty_text.rb

@@ -8,16 +8,15 @@ module PrettyText
   class Helpers
 
     def t(key, opts)
-      str = I18n.t("js." + key, opts)
+      key = "js." + key
-      if opts
+      unless opts
-        # TODO: server localisation has no parity with client should be fixed
+        return I18n.t(key)
-        str = str.dup
+      else
-        opts.each do |k,v|
+        str = I18n.t(key, Hash[opts.entries].symbolize_keys).dup
-          str.gsub!("{{#{k}}}", v)
+        opts.each {|k,v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
+        return str
       end
     end
-      str
-    end
 
     # function here are available to v8
     def avatar_template(username)