i18n_screwdriver 2.0.1 → 2.1.0

data/README.rdoc

@@ -26,6 +26,15 @@ In your views, helpers and controllers use the convenient underscore helper meth
 
   _("your translation")
 
+Variable interpolation works as for normal strings
+
+  _("Hello %{name}!") % {name: "Liah"}
+
+For awesome support for links inside translations you can use this syntax, which uses the normal rails view/ route helpers internally
+
+  _("Please <<click here>> for more details or visit <<this link>> to continue."){ [@item, "http://continue.com"] }
+  _("Open this <<fancy link>> in new window or visit <<this link>> to continue."){ [[@item, target: "_blank"], "http://continue.com"] }
+
 When you are done you have 2 helper rake tasks. The first one scans all your views, controllers and
 helpers for translations. It removes unused translation strings and creates an application.<lang>.yml file
 for each of your I18n.available_locales.

data/lib/i18n_screwdriver.rb

@@ -1,5 +1,6 @@
 require "i18n_screwdriver/version"
 require "i18n_screwdriver/translation"
+require "i18n_screwdriver/translation_helper"
 require "i18n_screwdriver/rails"
 
 module I18nScrewdriver

data/lib/i18n_screwdriver/rails.rb

@@ -1,3 +1,4 @@
 require 'rails'
 require 'i18n_screwdriver/rails/engine'
+require "i18n_screwdriver/translation"
 

data/lib/i18n_screwdriver/translation.rb

@@ -1,10 +1,30 @@
 module I18nScrewdriver
-  module Translation
-    def _(text, options = {})
-      I18n.translate(I18nScrewdriver.for_key(text), options)
+  class Translation < ActiveSupport::SafeBuffer
+    def self.new(text, options = {}, &block)
+      super(I18n.translate(I18nScrewdriver.for_key(text), options)).tap do |translation|
+        translation.linkify(block.binding, *block.call) if block
+      end
+    end
+
+    def linkify(binding, *urls)
+      context = binding ? eval('self', binding) : self
+      keep_html_safety do
+        gsub!(/<<.+?>>/).each_with_index do |text, index|
+          context.instance_eval do
+            link_to text[2..-3], *urls[index]
+          end
+        end
+      end
+    end
+
+    private
+
+    def keep_html_safety
+      html_safe = @html_safe
+      yield
+      @html_safe = html_safe
+      self
     end
   end
 end
 
-Object.send(:include, I18nScrewdriver::Translation)
-

data/lib/i18n_screwdriver/translation_helper.rb

@@ -0,0 +1,10 @@
+module I18nScrewdriver
+  module TranslationHelper
+    def _(text, options = {}, &block)
+      Translation.new(text, options, &block)
+    end
+  end
+end
+
+Object.send(:include, I18nScrewdriver::TranslationHelper)
+

data/lib/i18n_screwdriver/version.rb

@@ -1,4 +1,4 @@
 module I18nScrewdriver
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_screwdriver
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,6 +62,7 @@ files:
 - lib/i18n_screwdriver/rails.rb
 - lib/i18n_screwdriver/rails/engine.rb
 - lib/i18n_screwdriver/translation.rb
+- lib/i18n_screwdriver/translation_helper.rb
 - lib/i18n_screwdriver/version.rb
 - lib/tasks/i18n.rake
 homepage: https://github.com/agileapplications/i18n_screwdriver
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -12614887009527273
+      hash: -2643611881432222959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -12614887009527273
+      hash: -2643611881432222959
 requirements: []
 rubyforge_project: i18n_screwdriver
 rubygems_version: 1.8.24