phrase 0.2.0.beta.7 → 0.2.0.beta.8

data/lib/phrase/backend/phrase_service.rb

@@ -12,7 +12,7 @@ class Phrase::Backend::PhraseService
   
   def translate(*args)
     key = lookup_normalized_key(*args)
-    if Phrase.disabled? or key_is_blacklisted?(key[:key])
+    if Phrase.disabled? or key_is_blacklisted?(key[:key]) or (args.last.is_a?(Hash) and args.last[:resolve] == false)
       I18n.translate_without_phrase(*args)
     else
       phrase_delegate_for(key[:key], *args)

data/lib/phrase/delegate.rb

@@ -2,7 +2,7 @@
 
 require 'phrase/api'
 
-class Phrase::Delegate
+class Phrase::Delegate < String
   attr_accessor :key, :display_key, :options, :api_client, :fallback_keys
   
   def initialize(key, options={})
@@ -12,6 +12,7 @@ class Phrase::Delegate
     
     extract_fallback_keys
     identify_key_to_display if @fallback_keys.any?
+    super(decorated_key_name)
   end
   
   def to_s

data/phrase.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.2.0.beta.7"
+  s.version = "0.2.0.beta.8"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.7
+  version: 0.2.0.beta.8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70347496325440 !ruby/object:Gem::Requirement
+  requirement: &70300432260120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70347496325440
+  version_requirements: *70300432260120
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70347496324800 !ruby/object:Gem::Requirement
+  requirement: &70300432259400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70347496324800
+  version_requirements: *70300432259400
 description: phrase allows you to edit translations inline, on the page itself. More
   information at phraseapp.com
 email: