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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,7 @@ class Phrase::Backend::PhraseService
12
12
 
13
13
  def translate(*args)
14
14
  key = lookup_normalized_key(*args)
15
- if Phrase.disabled? or key_is_blacklisted?(key[:key])
15
+ if Phrase.disabled? or key_is_blacklisted?(key[:key]) or (args.last.is_a?(Hash) and args.last[:resolve] == false)
16
16
  I18n.translate_without_phrase(*args)
17
17
  else
18
18
  phrase_delegate_for(key[:key], *args)
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'phrase/api'
4
4
 
5
- class Phrase::Delegate
5
+ class Phrase::Delegate < String
6
6
  attr_accessor :key, :display_key, :options, :api_client, :fallback_keys
7
7
 
8
8
  def initialize(key, options={})
@@ -12,6 +12,7 @@ class Phrase::Delegate
12
12
 
13
13
  extract_fallback_keys
14
14
  identify_key_to_display if @fallback_keys.any?
15
+ super(decorated_key_name)
15
16
  end
16
17
 
17
18
  def to_s
data/phrase.gemspec CHANGED
@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "phrase"
7
- s.version = "0.2.0.beta.7"
7
+ s.version = "0.2.0.beta.8"
8
8
  s.platform = Gem::Platform::RUBY
9
9
  s.authors = ["Dynport GmbH"]
10
10
  s.email = ["info@phraseapp.com"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phrase
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0.beta.7
4
+ version: 0.2.0.beta.8
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-02 00:00:00.000000000 Z
12
+ date: 2012-07-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &70347496325440 !ruby/object:Gem::Requirement
16
+ requirement: &70300432260120 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70347496325440
24
+ version_requirements: *70300432260120
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: addressable
27
- requirement: &70347496324800 !ruby/object:Gem::Requirement
27
+ requirement: &70300432259400 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 2.2.8
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70347496324800
35
+ version_requirements: *70300432259400
36
36
  description: phrase allows you to edit translations inline, on the page itself. More
37
37
  information at phraseapp.com
38
38
  email: