actionview 4.1.10.rc2 → 4.1.10.rc3

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.

Potentially problematic release.

This version of actionview might be problematic. Click here for more details.

Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/action_view/gem_version.rb +1 -1
  3. data/lib/action_view/helpers/translation_helper.rb +5 -1
  4. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6a9be6f8ef85d3356ed7d95a3487eabc76772bfd
4
- data.tar.gz: a1d39a4510d90f80e30cf6c99d39c9547969352d
3
+ metadata.gz: d34571193bd2be122a6bbc15993bbfab25b51b36
4
+ data.tar.gz: f8d13ff1ff863c5e9cda17e39df104add86855d1
5
5
  SHA512:
6
- metadata.gz: dca5211b80265d41acc088f8ad6725cf03d5202e28ef9e2605ae46121002271735394681cae3b44c7f89f242f5d38f938d0392d7324b1848bdc01edacf46e476
7
- data.tar.gz: 42b7a0beb96f7088cb21059b28e7d444a71628f67fa088a7ea8f0ac845278f989670cc50531aee12032b357d23dbb4b1cece3359d83f05de8b48c8ec6201bc1a
6
+ metadata.gz: 878797148433f43fa9538b5f85c8b229eb5416a56fb21956a7c46273e0620f95f355fb1340c6a8789e1a93f5311067ec5c71c14bced5831e2bb5af49b3cfb4f3
7
+ data.tar.gz: 86034a18fd9e6d26ffb762f570e7b5b049c9edb90d5ea0ed361db518260ad4daee84b982b1f367dcc83b71ed5c4b3855a266c1a2522afdfb379537f20c8ea0c2
data/lib/action_view/gem_version.rb CHANGED
@@ -8,7 +8,7 @@ module ActionView
8
8
  MAJOR = 4
9
9
  MINOR = 1
10
10
  TINY = 10
11
- PRE = "rc2"
11
+ PRE = "rc3"
12
12
 
13
13
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
14
14
  end
data/lib/action_view/helpers/translation_helper.rb CHANGED
@@ -36,8 +36,12 @@ module ActionView
36
36
  # you know what kind of output to expect when you call translate in a template.
37
37
  def translate(key, options = {})
38
38
  options = options.dup
39
+ has_default = options.has_key?(:default)
39
40
  remaining_defaults = Array(options.delete(:default))
40
- options[:default] = remaining_defaults.shift if remaining_defaults.first.kind_of? String
41
+
42
+ if has_default && !remaining_defaults.first.kind_of?(Symbol)
43
+ options[:default] = remaining_defaults.shift
44
+ end
41
45
 
42
46
  # If the user has explicitly decided to NOT raise errors, pass that option to I18n.
43
47
  # 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.1.10.rc2
4
+ version: 4.1.10.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-25 00:00:00.000000000 Z
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.1.10.rc2
19
+ version: 4.1.10.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.1.10.rc2
26
+ version: 4.1.10.rc3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: builder
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 4.1.10.rc2
61
+ version: 4.1.10.rc3
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 4.1.10.rc2
68
+ version: 4.1.10.rc3
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: activemodel
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 4.1.10.rc2
75
+ version: 4.1.10.rc3
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 4.1.10.rc2
82
+ version: 4.1.10.rc3
83
83
  description: Simple, battle-tested conventions and helpers for building web pages.
84
84
  email: david@loudthinking.com
85
85
  executables: []