easy_translatable 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/translatable/active_record/translate.rb +10 -7
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 24dd6ed75daac199e2f66afe8609f54e2b153df2
|
4
|
+
data.tar.gz: e960559e31b5c762cc21fa962f9b87f32285b890
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d2b70a8e93c091b1a42742193b3181e6bcdcfcf560d97e7810bb584b87edcd05e978a2abd9f368423fcd2fc60626dda05a2caae0bd290b486058be8e7aa3ae36
|
7
|
+
data.tar.gz: aa7113cb02d2f22788d701fefbedd0f37375d983c136bb65194c912c01e34a6fd5b5d71fa6e34f2055b2823cc038cb1af8338331d39a64c3f0d6251c89796c50
|
@@ -4,7 +4,7 @@ module Translatable
|
|
4
4
|
def translate(lang, *attr_names)
|
5
5
|
|
6
6
|
model = self.table_name
|
7
|
-
if Translatable::Config.list.has_key?
|
7
|
+
if Translatable::Config.list.has_key?(model) and self.column_names.include?('group_id')
|
8
8
|
|
9
9
|
if attr_names.length == 0
|
10
10
|
to_translate = Translatable::Config.list[model]
|
@@ -48,14 +48,17 @@ module Translatable
|
|
48
48
|
select_values = self.scoped.select_values.map { |one|
|
49
49
|
if one.is_a?(String)
|
50
50
|
one.split(',').map(&:lstrip).map(&:rstrip)
|
51
|
-
|
52
|
-
one
|
51
|
+
elsif one.is_a?(Symbol)
|
52
|
+
one.to_s
|
53
53
|
end
|
54
54
|
}.flatten
|
55
|
-
select_values.
|
56
|
-
|
57
|
-
|
58
|
-
|
55
|
+
p "select_values : #{select_values.reject{ |value| !value.is_a?(String) || !value.split('.').last == '*' && !value.split('.').last == attr }.inspect}"
|
56
|
+
is_present = select_values.reject{ |value| !value.is_a?(String) || !value.split('.').last == '*' && !value.split('.').last == attr }
|
57
|
+
if is_present.nil?
|
58
|
+
false
|
59
|
+
else
|
60
|
+
is_present.length > 0
|
61
|
+
end
|
59
62
|
else
|
60
63
|
true
|
61
64
|
end
|