i18n_action_mailer 0.2.1 → 0.2.2

data/History.txt

@@ -0,0 +1,4 @@
+= 0.2.2
+* Short hand notation (larspind http://github.com/mataki/i18n_action_mailer/pull/1)
+= 0.2.1
+* Released on rubygems.org

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.description = "ActionMailer to use the I18n library without affecting the controllers language"
     gemspec.email = "matsumura.aki@gmail.com"
     gemspec.homepage = "http://github.com/mataki/i18n_action_mailer"
-    gemspec.authors = ["Akihiro Matsumura", "Bert Goethals"]
+    gemspec.authors = ["Akihiro Matsumura", "Bert Goethals", "Lars Pind"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/i18n_action_mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_action_mailer}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akihiro Matsumura", "Bert Goethals"]
-  s.date = %q{2010-08-10}
+  s.authors = ["Akihiro Matsumura", "Bert Goethals", "Lars Pind"]
+  s.date = %q{2010-09-21}
   s.description = %q{ActionMailer to use the I18n library without affecting the controllers language}
   s.email = %q{matsumura.aki@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "History.txt",
      "MIT-LICENSE",
      "README",
      "Rakefile",

data/lib/i18n_action_mailer.rb

@@ -3,12 +3,31 @@ module I18nActionMailer
   def self.included(base)
     base.send :include, I18nActionMailer::InstanceMethods
     base.send :alias_method_chain, :render_message, :i18n
-    base.helper_method :locale, :t, :translate, :l, :localize
+    base.helper_method :locale, :l, :localize
+    base.helper do
+      def translate(key, options = {})
+        I18n.translate(scope_key_by_partial(key), options.merge!(:raise => true, :locale => self.locale))
+      end
+      alias_method :t, :translate
+
+      private
+        def scope_key_by_partial(key)
+          if key.to_s.first == "."
+            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
+          end
+        end
+    end
   end
 
   module InstanceMethods
     def translate(key, options = {})
-      I18n.translate(key, options.merge(:locale => self.locale))
+      I18n.translate(scope_key_by_partial(key), options.merge(:raise => true, :locale => self.locale))
     end
     alias_method :t, :translate
 
@@ -29,6 +48,16 @@ module I18nActionMailer
       method_name = "#{method_name}_#{locale}" if locale and !Dir["#{template_path}/#{method_name}_#{locale}*"].empty?
       render_message_without_i18n(method_name, body)
     end
+    
+    private
+      def scope_key_by_partial(key)
+        if key.to_s.first == "."   
+          mailer_scope = self.class.mailer_name.gsub('/', '.')
+          mailer_scope + "." + action_name + key.to_s
+        else
+          key
+        end
+      end      
   end
 
 end

metadata

@@ -5,17 +5,18 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Akihiro Matsumura
 - Bert Goethals
+- Lars Pind
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +09:00
+date: 2010-09-21 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +30,7 @@ extra_rdoc_files:
 - README
 files: 
 - .gitignore
+- History.txt
 - MIT-LICENSE
 - README
 - Rakefile