i18n_date_range 2.0.0 → 2.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +118 -116
  3. data/README.md +1 -0
  4. data/lib/i18n_date_range/i18n_date_range_generator.rb +7 -6
  5. data/lib/i18n_date_range/i18n_date_range_helper.rb +2 -1
  6. data/lib/i18n_date_range/version.rb +1 -1
  7. metadata +3 -4
  8. data/.DS_Store +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4b5b37d47192e7ed082d17c10cb9e633b3267699985ceb4a9d5f23914d477f16
4
- data.tar.gz: ab2eacf2fe9807d9e305f52c626a40352d2a445e0872c03ffe403b80aa84a884
3
+ metadata.gz: 45ae5dfe748a63b919691eaf67872eb8f8775ff20a5eecec82f779f22b1cec25
4
+ data.tar.gz: 8460d8348f8261c65da25181dd194024eb6c80cb2eca5798ff8b334fd110068e
5
5
  SHA512:
6
- metadata.gz: 3a2ac59f09a6ac60221430eb270505b886beb3fd13cb335f7da7b174b7d283a8cf899d232572428048e903757958889bd442ca2f2eb8246dbaaf9915e7ceee0d
7
- data.tar.gz: cbb79ad4ca1cac1a7058c9909e394ea6bc11424d1487798350275c53a706e7bfd771ef3ccf2bb9e8ae413ad99f16886bc8d0e9e1de301e70d1dd3e89b8e04a4f
6
+ metadata.gz: '0415788951bc1dc174ed4e113a1b7ca769b9d6b91d42d203bf118d8e3e7619266e7d39824529315a6a9b6ca1fafcb806066e9c6d80dadb5712a1dbcd0e097258'
7
+ data.tar.gz: 07ac181766dade2105b1251973d21aeef3beb8b573944bff934bf5489541112a2560b42c0493f1857df57473a15d4e32dee7cecea42630ffef1ea51a4f4eb8e8
data/Gemfile.lock CHANGED
@@ -1,77 +1,78 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- i18n_date_range (1.0.3)
4
+ i18n_date_range (2.1.1)
5
5
  rails
6
6
  rails-i18n
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actioncable (7.1.1)
12
- actionpack (= 7.1.1)
13
- activesupport (= 7.1.1)
11
+ actioncable (7.1.3.3)
12
+ actionpack (= 7.1.3.3)
13
+ activesupport (= 7.1.3.3)
14
14
  nio4r (~> 2.0)
15
15
  websocket-driver (>= 0.6.1)
16
16
  zeitwerk (~> 2.6)
17
- actionmailbox (7.1.1)
18
- actionpack (= 7.1.1)
19
- activejob (= 7.1.1)
20
- activerecord (= 7.1.1)
21
- activestorage (= 7.1.1)
22
- activesupport (= 7.1.1)
17
+ actionmailbox (7.1.3.3)
18
+ actionpack (= 7.1.3.3)
19
+ activejob (= 7.1.3.3)
20
+ activerecord (= 7.1.3.3)
21
+ activestorage (= 7.1.3.3)
22
+ activesupport (= 7.1.3.3)
23
23
  mail (>= 2.7.1)
24
24
  net-imap
25
25
  net-pop
26
26
  net-smtp
27
- actionmailer (7.1.1)
28
- actionpack (= 7.1.1)
29
- actionview (= 7.1.1)
30
- activejob (= 7.1.1)
31
- activesupport (= 7.1.1)
27
+ actionmailer (7.1.3.3)
28
+ actionpack (= 7.1.3.3)
29
+ actionview (= 7.1.3.3)
30
+ activejob (= 7.1.3.3)
31
+ activesupport (= 7.1.3.3)
32
32
  mail (~> 2.5, >= 2.5.4)
33
33
  net-imap
34
34
  net-pop
35
35
  net-smtp
36
36
  rails-dom-testing (~> 2.2)
37
- actionpack (7.1.1)
38
- actionview (= 7.1.1)
39
- activesupport (= 7.1.1)
37
+ actionpack (7.1.3.3)
38
+ actionview (= 7.1.3.3)
39
+ activesupport (= 7.1.3.3)
40
40
  nokogiri (>= 1.8.5)
41
+ racc
41
42
  rack (>= 2.2.4)
42
43
  rack-session (>= 1.0.1)
43
44
  rack-test (>= 0.6.3)
44
45
  rails-dom-testing (~> 2.2)
45
46
  rails-html-sanitizer (~> 1.6)
46
- actiontext (7.1.1)
47
- actionpack (= 7.1.1)
48
- activerecord (= 7.1.1)
49
- activestorage (= 7.1.1)
50
- activesupport (= 7.1.1)
47
+ actiontext (7.1.3.3)
48
+ actionpack (= 7.1.3.3)
49
+ activerecord (= 7.1.3.3)
50
+ activestorage (= 7.1.3.3)
51
+ activesupport (= 7.1.3.3)
51
52
  globalid (>= 0.6.0)
52
53
  nokogiri (>= 1.8.5)
53
- actionview (7.1.1)
54
- activesupport (= 7.1.1)
54
+ actionview (7.1.3.3)
55
+ activesupport (= 7.1.3.3)
55
56
  builder (~> 3.1)
56
57
  erubi (~> 1.11)
57
58
  rails-dom-testing (~> 2.2)
58
59
  rails-html-sanitizer (~> 1.6)
59
- activejob (7.1.1)
60
- activesupport (= 7.1.1)
60
+ activejob (7.1.3.3)
61
+ activesupport (= 7.1.3.3)
61
62
  globalid (>= 0.3.6)
62
- activemodel (7.1.1)
63
- activesupport (= 7.1.1)
64
- activerecord (7.1.1)
65
- activemodel (= 7.1.1)
66
- activesupport (= 7.1.1)
63
+ activemodel (7.1.3.3)
64
+ activesupport (= 7.1.3.3)
65
+ activerecord (7.1.3.3)
66
+ activemodel (= 7.1.3.3)
67
+ activesupport (= 7.1.3.3)
67
68
  timeout (>= 0.4.0)
68
- activestorage (7.1.1)
69
- actionpack (= 7.1.1)
70
- activejob (= 7.1.1)
71
- activerecord (= 7.1.1)
72
- activesupport (= 7.1.1)
69
+ activestorage (7.1.3.3)
70
+ actionpack (= 7.1.3.3)
71
+ activejob (= 7.1.3.3)
72
+ activerecord (= 7.1.3.3)
73
+ activesupport (= 7.1.3.3)
73
74
  marcel (~> 1.0)
74
- activesupport (7.1.1)
75
+ activesupport (7.1.3.3)
75
76
  base64
76
77
  bigdecimal
77
78
  concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -82,32 +83,31 @@ GEM
82
83
  mutex_m
83
84
  tzinfo (~> 2.0)
84
85
  ast (2.4.2)
85
- base64 (0.1.1)
86
- bigdecimal (3.1.4)
86
+ base64 (0.2.0)
87
+ bigdecimal (3.1.8)
87
88
  builder (3.2.4)
88
- combustion (1.3.7)
89
+ combustion (1.4.0)
89
90
  activesupport (>= 3.0.0)
90
91
  railties (>= 3.0.0)
91
92
  thor (>= 0.14.6)
92
- concurrent-ruby (1.2.2)
93
+ concurrent-ruby (1.2.3)
93
94
  connection_pool (2.4.1)
94
95
  crass (1.0.6)
95
- date (3.3.3)
96
- diff-lcs (1.5.0)
97
- drb (2.1.1)
98
- ruby2_keywords
96
+ date (3.3.4)
97
+ diff-lcs (1.5.1)
98
+ drb (2.2.1)
99
99
  erubi (1.12.0)
100
100
  globalid (1.2.1)
101
101
  activesupport (>= 6.1)
102
- i18n (1.14.1)
102
+ i18n (1.14.5)
103
103
  concurrent-ruby (~> 1.0)
104
- io-console (0.6.0)
105
- irb (1.8.3)
106
- rdoc
107
- reline (>= 0.3.8)
108
- json (2.6.3)
104
+ io-console (0.7.2)
105
+ irb (1.13.1)
106
+ rdoc (>= 4.0.0)
107
+ reline (>= 0.4.2)
108
+ json (2.7.2)
109
109
  language_server-protocol (3.17.0.3)
110
- loofah (2.21.4)
110
+ loofah (2.22.0)
111
111
  crass (~> 1.0.2)
112
112
  nokogiri (>= 1.12.0)
113
113
  mail (2.8.1)
@@ -115,30 +115,30 @@ GEM
115
115
  net-imap
116
116
  net-pop
117
117
  net-smtp
118
- marcel (1.0.2)
118
+ marcel (1.0.4)
119
119
  mini_mime (1.1.5)
120
- minitest (5.20.0)
121
- mutex_m (0.1.2)
122
- net-imap (0.3.7)
120
+ minitest (5.23.1)
121
+ mutex_m (0.2.0)
122
+ net-imap (0.4.11)
123
123
  date
124
124
  net-protocol
125
125
  net-pop (0.1.2)
126
126
  net-protocol
127
- net-protocol (0.2.1)
127
+ net-protocol (0.2.2)
128
128
  timeout
129
- net-smtp (0.4.0)
129
+ net-smtp (0.5.0)
130
130
  net-protocol
131
- nio4r (2.5.9)
132
- nokogiri (1.15.4-x86_64-darwin)
131
+ nio4r (2.7.3)
132
+ nokogiri (1.16.5-x86_64-darwin)
133
133
  racc (~> 1.4)
134
- parallel (1.23.0)
135
- parser (3.2.2.4)
134
+ parallel (1.24.0)
135
+ parser (3.3.1.0)
136
136
  ast (~> 2.4.1)
137
137
  racc
138
- psych (5.1.1.1)
138
+ psych (5.1.2)
139
139
  stringio
140
- racc (1.7.1)
141
- rack (3.0.8)
140
+ racc (1.8.0)
141
+ rack (3.0.11)
142
142
  rack-session (2.0.0)
143
143
  rack (>= 3.0.0)
144
144
  rack-test (2.1.0)
@@ -146,20 +146,20 @@ GEM
146
146
  rackup (2.1.0)
147
147
  rack (>= 3)
148
148
  webrick (~> 1.8)
149
- rails (7.1.1)
150
- actioncable (= 7.1.1)
151
- actionmailbox (= 7.1.1)
152
- actionmailer (= 7.1.1)
153
- actionpack (= 7.1.1)
154
- actiontext (= 7.1.1)
155
- actionview (= 7.1.1)
156
- activejob (= 7.1.1)
157
- activemodel (= 7.1.1)
158
- activerecord (= 7.1.1)
159
- activestorage (= 7.1.1)
160
- activesupport (= 7.1.1)
149
+ rails (7.1.3.3)
150
+ actioncable (= 7.1.3.3)
151
+ actionmailbox (= 7.1.3.3)
152
+ actionmailer (= 7.1.3.3)
153
+ actionpack (= 7.1.3.3)
154
+ actiontext (= 7.1.3.3)
155
+ actionview (= 7.1.3.3)
156
+ activejob (= 7.1.3.3)
157
+ activemodel (= 7.1.3.3)
158
+ activerecord (= 7.1.3.3)
159
+ activestorage (= 7.1.3.3)
160
+ activesupport (= 7.1.3.3)
161
161
  bundler (>= 1.15.0)
162
- railties (= 7.1.1)
162
+ railties (= 7.1.3.3)
163
163
  rails-dom-testing (2.2.0)
164
164
  activesupport (>= 5.0.0)
165
165
  minitest
@@ -167,68 +167,70 @@ GEM
167
167
  rails-html-sanitizer (1.6.0)
168
168
  loofah (~> 2.21)
169
169
  nokogiri (~> 1.14)
170
- rails-i18n (7.0.8)
170
+ rails-i18n (7.0.9)
171
171
  i18n (>= 0.7, < 2)
172
172
  railties (>= 6.0.0, < 8)
173
- railties (7.1.1)
174
- actionpack (= 7.1.1)
175
- activesupport (= 7.1.1)
173
+ railties (7.1.3.3)
174
+ actionpack (= 7.1.3.3)
175
+ activesupport (= 7.1.3.3)
176
176
  irb
177
177
  rackup (>= 1.0.0)
178
178
  rake (>= 12.2)
179
179
  thor (~> 1.0, >= 1.2.2)
180
180
  zeitwerk (~> 2.6)
181
181
  rainbow (3.1.1)
182
- rake (13.1.0)
183
- rdoc (6.5.0)
182
+ rake (13.2.1)
183
+ rdoc (6.7.0)
184
184
  psych (>= 4.0.0)
185
- regexp_parser (2.8.2)
186
- reline (0.3.9)
185
+ regexp_parser (2.9.2)
186
+ reline (0.5.7)
187
187
  io-console (~> 0.5)
188
- rexml (3.2.6)
189
- rspec (3.12.0)
190
- rspec-core (~> 3.12.0)
191
- rspec-expectations (~> 3.12.0)
192
- rspec-mocks (~> 3.12.0)
193
- rspec-core (3.12.2)
194
- rspec-support (~> 3.12.0)
195
- rspec-expectations (3.12.3)
188
+ rexml (3.2.8)
189
+ strscan (>= 3.0.9)
190
+ rspec (3.13.0)
191
+ rspec-core (~> 3.13.0)
192
+ rspec-expectations (~> 3.13.0)
193
+ rspec-mocks (~> 3.13.0)
194
+ rspec-core (3.13.0)
195
+ rspec-support (~> 3.13.0)
196
+ rspec-expectations (3.13.0)
196
197
  diff-lcs (>= 1.2.0, < 2.0)
197
- rspec-support (~> 3.12.0)
198
- rspec-mocks (3.12.6)
198
+ rspec-support (~> 3.13.0)
199
+ rspec-mocks (3.13.1)
199
200
  diff-lcs (>= 1.2.0, < 2.0)
200
- rspec-support (~> 3.12.0)
201
- rspec-rails (6.0.3)
201
+ rspec-support (~> 3.13.0)
202
+ rspec-rails (6.1.2)
202
203
  actionpack (>= 6.1)
203
204
  activesupport (>= 6.1)
204
205
  railties (>= 6.1)
205
- rspec-core (~> 3.12)
206
- rspec-expectations (~> 3.12)
207
- rspec-mocks (~> 3.12)
208
- rspec-support (~> 3.12)
209
- rspec-support (3.12.1)
210
- rubocop (1.57.2)
206
+ rspec-core (~> 3.13)
207
+ rspec-expectations (~> 3.13)
208
+ rspec-mocks (~> 3.13)
209
+ rspec-support (~> 3.13)
210
+ rspec-support (3.13.1)
211
+ rubocop (1.64.0)
211
212
  json (~> 2.3)
212
213
  language_server-protocol (>= 3.17.0)
213
214
  parallel (~> 1.10)
214
- parser (>= 3.2.2.4)
215
+ parser (>= 3.3.0.2)
215
216
  rainbow (>= 2.2.2, < 4.0)
216
217
  regexp_parser (>= 1.8, < 3.0)
217
218
  rexml (>= 3.2.5, < 4.0)
218
- rubocop-ast (>= 1.28.1, < 2.0)
219
+ rubocop-ast (>= 1.31.1, < 2.0)
219
220
  ruby-progressbar (~> 1.7)
220
221
  unicode-display_width (>= 2.4.0, < 3.0)
221
- rubocop-ast (1.30.0)
222
- parser (>= 3.2.1.0)
223
- rubocop-rails (2.22.1)
222
+ rubocop-ast (1.31.3)
223
+ parser (>= 3.3.1.0)
224
+ rubocop-rails (2.25.0)
224
225
  activesupport (>= 4.2.0)
225
226
  rack (>= 1.1)
226
227
  rubocop (>= 1.33.0, < 2.0)
228
+ rubocop-ast (>= 1.31.1, < 2.0)
227
229
  ruby-progressbar (1.13.0)
228
- ruby2_keywords (0.0.5)
229
- stringio (3.0.8)
230
- thor (1.3.0)
231
- timeout (0.4.0)
230
+ stringio (3.1.0)
231
+ strscan (3.1.0)
232
+ thor (1.3.1)
233
+ timeout (0.4.1)
232
234
  tzinfo (2.0.6)
233
235
  concurrent-ruby (~> 1.0)
234
236
  unicode-display_width (2.5.0)
@@ -236,7 +238,7 @@ GEM
236
238
  websocket-driver (0.7.6)
237
239
  websocket-extensions (>= 0.1.0)
238
240
  websocket-extensions (0.1.5)
239
- zeitwerk (2.6.12)
241
+ zeitwerk (2.6.14)
240
242
 
241
243
  PLATFORMS
242
244
  x86_64-darwin-20
@@ -255,4 +257,4 @@ DEPENDENCIES
255
257
  rubocop-rails
256
258
 
257
259
  BUNDLED WITH
258
- 2.4.21
260
+ 2.4.22
data/README.md CHANGED
@@ -10,6 +10,7 @@ Add this line to your application's Gemfile:
10
10
  ```ruby
11
11
  gem 'i18n_date_range'
12
12
  ```
13
+
13
14
  And then execute:
14
15
 
15
16
  $ bundle install
data/lib/i18n_date_range/i18n_date_range_generator.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Computing range to choose the correct form
4
4
  class I18nDateRangeGenerator
5
- attr_reader :from_date, :to_date, :format, :layout
5
+ attr_reader :from_date, :to_date, :format, :layout, :locale
6
6
 
7
7
  KIND_NO_END = :no_end
8
8
  KIND_SAME_DAY = :same_day
@@ -11,11 +11,12 @@ class I18nDateRangeGenerator
11
11
  KIND_OTHER = :other
12
12
 
13
13
  # "format" can be :short or :long. "layout" can be :one_line or :two_lines
14
- def initialize(from_date, to_date = nil, format: :short, layout: :one_line)
14
+ def initialize(from_date, to_date = nil, format: :short, layout: :one_line, locale: I18n.locale)
15
15
  @from_date = from_date
16
16
  @to_date = to_date
17
17
  @format = format
18
18
  @layout = layout
19
+ @locale = locale
19
20
  end
20
21
 
21
22
  def to_s
@@ -54,19 +55,19 @@ class I18nDateRangeGenerator
54
55
  end
55
56
 
56
57
  def from_sentence
57
- I18n.t("#{composite_key}.from.sentence")
58
+ I18n.t("#{composite_key}.from.sentence", locale: locale)
58
59
  end
59
60
 
60
61
  def from_upcase_first
61
- I18n.t("#{composite_key}.from.upcase_first")
62
+ I18n.t("#{composite_key}.from.upcase_first", locale: locale)
62
63
  end
63
64
 
64
65
  def to_sentence
65
- I18n.t("#{composite_key}.to.sentence")
66
+ I18n.t("#{composite_key}.to.sentence", locale: locale)
66
67
  end
67
68
 
68
69
  def to_upcase_first
69
- I18n.t("#{composite_key}.to.upcase_first")
70
+ I18n.t("#{composite_key}.to.upcase_first", locale: locale)
70
71
  end
71
72
 
72
73
  def from_formatted
data/lib/i18n_date_range/i18n_date_range_helper.rb CHANGED
@@ -7,7 +7,8 @@
7
7
  module I18nDateRangeHelper
8
8
 
9
9
  def date_range_i18n(from_date, to_date = nil, **options)
10
- generator = I18nDateRangeGenerator.new(from_date, to_date, **options.slice(:format, :layout))
10
+ generator_options = options.slice(:format, :layout, :locale)
11
+ generator = I18nDateRangeGenerator.new(from_date, to_date, **generator_options)
11
12
  generator.to_s.html_safe
12
13
  end
13
14
 
data/lib/i18n_date_range/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module I18nDateRange
4
- VERSION = "2.0.0"
4
+ VERSION = "2.1.1"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: i18n_date_range
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - pabois
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2023-11-02 00:00:00.000000000 Z
12
+ date: 2024-05-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -145,7 +145,6 @@ executables: []
145
145
  extensions: []
146
146
  extra_rdoc_files: []
147
147
  files:
148
- - ".DS_Store"
149
148
  - ".rspec"
150
149
  - ".rubocop.yml"
151
150
  - CHANGELOG.md
@@ -187,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
187
186
  - !ruby/object:Gem::Version
188
187
  version: '0'
189
188
  requirements: []
190
- rubygems_version: 3.1.4
189
+ rubygems_version: 3.4.10
191
190
  signing_key:
192
191
  specification_version: 4
193
192
  summary: Add helper to display a date range
data/.DS_Store DELETED
Binary file