i18n_screwdriver 6.0 → 7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb8ed962112d953a9faf5f4150d3f213710179d
-  data.tar.gz: 6d3e1a2a3f0258d4a5c49796ab800c002fbf60a5
+  metadata.gz: 7797459c92084f08967a9f8a3f0cc77595ab3cd6
+  data.tar.gz: 468500d604d04697ae70dfe7bd7055b83f149a10
 SHA512:
-  metadata.gz: 434aef9acfceefb716e73afe39ce90ab2e78c24a3a56c17ab6aa25756419eec475ef3117d8d9adddb280f405c20cb53daace89337c17312c84f2b8f88d4d05c4
-  data.tar.gz: a417c66dc9ef6213436057c82fb7e639233c2cde4e9e6242e12446359916eac80fd3489ae5457f2cc0fb02bd0f246bdc023e8c61322154fd81c8e528dea864d1
+  metadata.gz: aea5b4f61054641698e466644cfb5d504e88929791c068528643c2b857b009bda12cd35ccddae164ab2bc377f23f4d2a9982ee45f5d3588d0ad06741fddfca78
+  data.tar.gz: 979fed750a96ab6dcbe408c8bc9346bc98d27ff4fcbbc8deeec6f1b28f1fd02108c8a3ced26ef6c85ba6246e1eea65e92b88ebce8526c72b13b945e96d3b2228

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i18n_screwdriver (6.0)
+    i18n_screwdriver (7.0)
       rails (>= 3.0.0)
 
 GEM

data/README.rdoc

@@ -30,6 +30,8 @@ Starting with version 6.0 you can also use symbols as keys
 
   _(:my_long_text)
 
+Starting with version 7.0 we added namespaces. A translation in the form of _("User|Name") will use the full string as a key but only display the part after the pipe, so "Name". This is useful if you want to have text translated differently according to the context in some languages but have it the same in the source language. For example "User|Name" (in German "Benutzername") and "Account|Name" (in German "Accountname").
+
 Variable interpolation works as for normal strings
 
   _("Hello %{name}!") % {name: "Liah"}

data/lib/i18n_screwdriver/translation.rb

@@ -3,7 +3,7 @@ module I18nScrewdriver
     attr_accessor :text, :options
 
     def self.new(text, options = {}, &block)
-      translation = super(options[:raw] ? text : I18n.translate(I18nScrewdriver.for_key(text), options))
+      translation = super(options[:raw] ? text : I18nScrewdriver.translate(text, options))
       translation.text = text
       translation.options = options
 

data/lib/i18n_screwdriver/version.rb

@@ -1,3 +1,3 @@
 module I18nScrewdriver
-  VERSION = "6.0"
+  VERSION = "7.0"
 end

data/lib/i18n_screwdriver.rb

@@ -8,7 +8,7 @@ module I18nScrewdriver
     File.join("config", "locales", "application.#{locale}.yml")
   end
 
-  def self.for_key(string)
+  def self.generate_key(string)
     string = string.strip
     (string =~ /^:[a-z][a-z0-9_]*$/) ? string : Digest::MD5.hexdigest(string)
   end
@@ -90,8 +90,8 @@ module I18nScrewdriver
       texts.concat(grab_texts_to_be_translated(input))
       symbols.concat(grab_symbols_to_be_translated(input))
     end
-    translations = Hash[texts.uniq.map{ |text| [for_key(text), text] }]
-    translations.merge(Hash[symbols.uniq.map{ |symbol| [for_key(symbol), ""] }])
+    translations = Hash[texts.uniq.map{ |text| [generate_key(text), extract_text(text)] }]
+    translations.merge(Hash[symbols.uniq.map{ |symbol| [generate_key(symbol), ""] }])
   end
 
   def self.default_locale
@@ -129,4 +129,13 @@ module I18nScrewdriver
       hash.each{ |k, v| new_hash[k.to_s] = v.to_s }
     end
   end
+
+  def self.translate(string, options = {})
+    I18n.translate(generate_key(string), options)
+  end
+
+  def self.extract_text(string)
+    namespace, text = string.split("|", 2)
+    text ? text : namespace
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_screwdriver
 version: !ruby/object:Gem::Version
-  version: '6.0'
+  version: '7.0'
 platform: ruby
 authors:
 - Tobias Miesel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec