translation_helper.rb in actionpack-3.1.0.beta1

- old
+ new

@@ -3,11 +3,11 @@
 
 module I18n
   class ExceptionHandler
     include Module.new {
       def call(exception, locale, key, options)
-        exception.is_a?(MissingTranslationData) && options[:rescue_format] == :html ? super.html_safe : super
+        exception.is_a?(MissingTranslation) ? super.html_safe : super
       end
     }
   end
 end
 
@@ -15,20 +15,20 @@
   # = Action View Translation Helpers
   module Helpers
     module TranslationHelper
       # Delegates to I18n#translate but also performs three additional functions.
       #
-      # First, it'll pass the :rescue_format => :html option to I18n so that any caught
-      # MissingTranslationData exceptions will be turned into inline spans that
+      # First, it'll pass the :rescue_format => :html option to I18n so that any
+      # thrown MissingTranslation messages will be turned into inline spans that
       #
       #   * have a "translation-missing" class set,
       #   * contain the missing key as a title attribute and
       #   * a titleized version of the last key segment as a text.
       #
       # E.g. the value returned for a missing translation key :"blog.post.title" will be
       # <span class="translation_missing" title="translation missing: blog.post.title">Title</span>.
-      # This way your views will display rather reasonableful strings but it will still
+      # This way your views will display rather reasonable strings but it will still
       # be easy to spot missing translations.
       #
       # Second, it'll scope the key by the current partial if the key starts
       # with a period. So if you call <tt>translate(".foo")</tt> from the
       # <tt>people/index.html.erb</tt> template, you'll actually be calling
@@ -43,22 +43,15 @@
       # a safe HTML string that won't be escaped by other HTML helper methods. This
       # naming convention helps to identify translations that include HTML tags so that
       # you know what kind of output to expect when you call translate in a template.
       def translate(key, options = {})
         options.merge!(:rescue_format => :html) unless options.key?(:rescue_format)
-        if html_safe_translation_key?(key)
-          html_safe_options = options.dup
-          options.except(*I18n::RESERVED_KEYS).each do |name, value|
-            unless name == :count && value.is_a?(Numeric)
-              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
-            end
-          end
-          translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
-
-          translation.respond_to?(:html_safe) ? translation.html_safe : translation
+        translation = I18n.translate(scope_key_by_partial(key), options)
+        if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)
+          translation.html_safe
         else
-          I18n.translate(scope_key_by_partial(key), options)
+          translation
         end
       end
       alias :t :translate
 
       # Delegates to I18n.localize with no additional functionality.
@@ -68,11 +61,11 @@
       alias :l :localize
 
       private
         def scope_key_by_partial(key)
           if key.to_s.first == "."
-            if @_virtual_path
-              @_virtual_path.gsub(%r{/_?}, ".") + key.to_s
+            if @virtual_path
+              @virtual_path.gsub(%r{/_?}, ".") + key.to_s
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end
           else
             key