actionview 4.2.1.rc2 → 4.2.1.rc3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of actionview might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/action_view/gem_version.rb +1 -1
- data/lib/action_view/helpers/translation_helper.rb +5 -1
- metadata +8 -8
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: edcbf3a2de21bd1748b2c9e04335e02818a72471
|
|
4
|
+
data.tar.gz: 9ab51b016d942a7f9fd2171160452a96fe7bce21
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e7cf2a4f02d14915d07bb57f619257282a28337209be2a33ed3ba427779361841123167e289aa3cd59b1aeb4351fa20c06f91ded8b738746399c08d8ebc09c20
|
|
7
|
+
data.tar.gz: 316680d6df56e2371f05f53313a4a00b42f0298689487be77e6735446c3fd35d14b9a4d00551102c09c079c5ae6374d422c975afb6393866ca4a616bb4f1215b
|
|
@@ -37,8 +37,12 @@ module ActionView
|
|
|
37
37
|
# you know what kind of output to expect when you call translate in a template.
|
|
38
38
|
def translate(key, options = {})
|
|
39
39
|
options = options.dup
|
|
40
|
+
has_default = options.has_key?(:default)
|
|
40
41
|
remaining_defaults = Array(options.delete(:default))
|
|
41
|
-
|
|
42
|
+
|
|
43
|
+
if has_default && !remaining_defaults.first.kind_of?(Symbol)
|
|
44
|
+
options[:default] = remaining_defaults.shift
|
|
45
|
+
end
|
|
42
46
|
|
|
43
47
|
# If the user has explicitly decided to NOT raise errors, pass that option to I18n.
|
|
44
48
|
# Otherwise, tell I18n to raise an exception, which we rescue further in this method.
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: actionview
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.2.1.
|
|
4
|
+
version: 4.2.1.rc3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- David Heinemeier Hansson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-02
|
|
11
|
+
date: 2015-03-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 4.2.1.
|
|
19
|
+
version: 4.2.1.rc3
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 4.2.1.
|
|
26
|
+
version: 4.2.1.rc3
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: builder
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -98,28 +98,28 @@ dependencies:
|
|
|
98
98
|
requirements:
|
|
99
99
|
- - '='
|
|
100
100
|
- !ruby/object:Gem::Version
|
|
101
|
-
version: 4.2.1.
|
|
101
|
+
version: 4.2.1.rc3
|
|
102
102
|
type: :development
|
|
103
103
|
prerelease: false
|
|
104
104
|
version_requirements: !ruby/object:Gem::Requirement
|
|
105
105
|
requirements:
|
|
106
106
|
- - '='
|
|
107
107
|
- !ruby/object:Gem::Version
|
|
108
|
-
version: 4.2.1.
|
|
108
|
+
version: 4.2.1.rc3
|
|
109
109
|
- !ruby/object:Gem::Dependency
|
|
110
110
|
name: activemodel
|
|
111
111
|
requirement: !ruby/object:Gem::Requirement
|
|
112
112
|
requirements:
|
|
113
113
|
- - '='
|
|
114
114
|
- !ruby/object:Gem::Version
|
|
115
|
-
version: 4.2.1.
|
|
115
|
+
version: 4.2.1.rc3
|
|
116
116
|
type: :development
|
|
117
117
|
prerelease: false
|
|
118
118
|
version_requirements: !ruby/object:Gem::Requirement
|
|
119
119
|
requirements:
|
|
120
120
|
- - '='
|
|
121
121
|
- !ruby/object:Gem::Version
|
|
122
|
-
version: 4.2.1.
|
|
122
|
+
version: 4.2.1.rc3
|
|
123
123
|
description: Simple, battle-tested conventions and helpers for building web pages.
|
|
124
124
|
email: david@loudthinking.com
|
|
125
125
|
executables: []
|