lolita-translation 0.2.7 → 0.2.8

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.7
1
+ 0.2.8
@@ -104,8 +104,8 @@ module Lolita
104
104
  if options[:reader]
105
105
  attrs.each do |name|
106
106
  send :define_method, name do
107
- unless I18n.default_locale == I18n.locale
108
- translation = self.translation(I18n.locale)
107
+ unless ::I18n.default_locale == ::I18n.locale
108
+ translation = self.translation(::I18n.locale)
109
109
  if translation.nil?
110
110
  if has_translations_options[:fallback]
111
111
  (self[name].nil? || self[name].blank?) ? has_translations_options[:nil] : self[name].set_origins(self,name)
@@ -147,7 +147,7 @@ module Lolita
147
147
  class << self
148
148
 
149
149
  def find_with_translations(*args,&block)
150
- unless I18n.locale == I18n.default_locale
150
+ unless ::I18n.locale == ::I18n.default_locale
151
151
  if args && args[0].kind_of?(Hash)
152
152
  args[0][:include] ||=[]
153
153
  args[0][:include] << :translations
@@ -325,7 +325,7 @@ module Lolita
325
325
  # a.in(:en).title
326
326
  # => "EN title"
327
327
  def in locale
328
- locale.to_sym == I18n.default_locale ? self : find_translation(locale)
328
+ locale.to_sym == ::I18n.default_locale ? self : find_translation(locale)
329
329
  end
330
330
 
331
331
  def find_or_build_translation(*args)
@@ -339,21 +339,21 @@ module Lolita
339
339
  end
340
340
 
341
341
  def all_translations
342
- t = I18n.available_locales.map do |locale|
342
+ t = ::I18n.available_locales.map do |locale|
343
343
  [locale, find_or_build_translation(locale)]
344
344
  end
345
345
  ActiveSupport::OrderedHash[t]
346
346
  end
347
347
 
348
348
  def has_translation?(locale)
349
- return true if locale == I18n.default_locale
349
+ return true if locale == ::I18n.default_locale
350
350
  find_translation(locale).present?
351
351
  end
352
352
 
353
353
  # if object is new, then nested slaves ar built for all available locales
354
354
  def build_nested_translations
355
- if (I18n.available_locales.size - 1) > self.translations.size
356
- I18n.available_locales.clone.delete_if{|l| l == I18n.default_locale}.each do |l|
355
+ if (::I18n.available_locales.size - 1) > self.translations.size
356
+ ::I18n.available_locales.clone.delete_if{|l| l == ::I18n.default_locale}.each do |l|
357
357
  options = {:locale => l.to_s}
358
358
  self_adapter = Lolita::DBI::Base.create(self.class)
359
359
  options[self_adapter.reflect_on_association(:translations).klass.master_id] = self.id unless self.new_record?
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "lolita-translation"
8
- s.version = "0.2.7"
8
+ s.version = "0.2.8"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["ITHouse", "Gatis Tomsons", "Arturs Meisters"]
12
- s.date = "2011-10-05"
12
+ s.date = "2011-10-06"
13
13
  s.description = "Translates models in Lolita"
14
14
  s.email = "support@ithouse.lv"
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lolita-translation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7
4
+ version: 0.2.8
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,11 +11,11 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2011-10-05 00:00:00.000000000Z
14
+ date: 2011-10-06 00:00:00.000000000Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
18
- requirement: &79686440 !ruby/object:Gem::Requirement
18
+ requirement: &79749180 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ~>
@@ -23,10 +23,10 @@ dependencies:
23
23
  version: 3.1.0
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *79686440
26
+ version_requirements: *79749180
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: lolita
29
- requirement: &79686070 !ruby/object:Gem::Requirement
29
+ requirement: &79630630 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: 3.2.0.rc.3
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *79686070
37
+ version_requirements: *79630630
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: shoulda
40
- requirement: &79685760 !ruby/object:Gem::Requirement
40
+ requirement: &79629870 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '0'
46
46
  type: :development
47
47
  prerelease: false
48
- version_requirements: *79685760
48
+ version_requirements: *79629870
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: bundler
51
- requirement: &79569120 !ruby/object:Gem::Requirement
51
+ requirement: &79629390 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ~>
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: 1.0.0
57
57
  type: :development
58
58
  prerelease: false
59
- version_requirements: *79569120
59
+ version_requirements: *79629390
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: jeweler
62
- requirement: &79568270 !ruby/object:Gem::Requirement
62
+ requirement: &79628780 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ~>
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: 1.5.2
68
68
  type: :development
69
69
  prerelease: false
70
- version_requirements: *79568270
70
+ version_requirements: *79628780
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rcov
73
- requirement: &79567950 !ruby/object:Gem::Requirement
73
+ requirement: &79628320 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ! '>='
@@ -78,7 +78,7 @@ dependencies:
78
78
  version: '0'
79
79
  type: :development
80
80
  prerelease: false
81
- version_requirements: *79567950
81
+ version_requirements: *79628320
82
82
  description: Translates models in Lolita
83
83
  email: support@ithouse.lv
84
84
  executables: []
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
128
128
  version: '0'
129
129
  segments:
130
130
  - 0
131
- hash: -823012079
131
+ hash: -690226979
132
132
  required_rubygems_version: !ruby/object:Gem::Requirement
133
133
  none: false
134
134
  requirements: