jekyll-timeago 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6690dd05a4827a44c3299e6ab3ff0f9dc008379
-  data.tar.gz: cd2d422eaa587d037a5fc71717201c2f1e2b3018
+  metadata.gz: 9157c15480bb342a742abfdc196b96222086a4bd
+  data.tar.gz: fa1791b4fc65d3a7e7ae0d9c4f2b58f0823d0a53
 SHA512:
-  metadata.gz: c0e78eff967fed89807fe9a2c2d64c0f6278a19ca069f5320c6198e1dafee198087e2cdbf53c05f8884b0652634116295d48b345dfa9d40800b93563d453d026
-  data.tar.gz: 8228448f9792aa740956386bcad762465eb799375a24fffc0dae8a2698ac8082eabc7317d84d41ca15096eee50e889a3fe9efe81cf386e96e886f0935dada702
+  metadata.gz: 056d1d1518bc15ed5a72fc67c7786fcc26fa2071ff85c9a08e5cb96a67516429a9dcdb06484d6d2f996bb7e1f32a21b93357a7eeb52bb7c603954963e6eea829
+  data.tar.gz: c55deb51bb798c490d524d6a9e88a567cb262f9048b968e210b28f65a9ffb20fe3ae95c3262d916e201d3b78cf35cd3554a8ee2d2c10af738e04988c26617856

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/README.md

@@ -182,7 +182,7 @@ end
 
 ### Configuration
 
-In your `_config.yml` file:
+In your `_config.yml` file, you can customize the following options:
 
 ```yaml
 jekyll_timeago:

data/jekyll-timeago.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mini_i18n", '~> 0.3.1'
+  spec.add_dependency "mini_i18n", '~> 0.4.0'
 
   spec.add_development_dependency "jekyll", ">= 1.5"
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/jekyll-timeago/core.rb

@@ -46,8 +46,8 @@ module Jekyll
         (1..MAX_DEPTH_LEVEL).include?(depth) ? depth : DEFAULT_DEPTH_LEVEL
       end
 
-      def t(key)
-        MiniI18n.translate(key, @options)
+      def t(key, options = {})
+        MiniI18n.translate(key, @options.merge(options))
       end
 
       # Days passed to time ago sentence
@@ -80,14 +80,9 @@ module Jekyll
         days       = DAYS_PER[time_range]
         num_elems  = (days_passed / days).to_i
 
-        range_type = if num_elems == 1
-          t(time_range[0...-1]) # singularize key
-        else
-          t(time_range)
-        end
+        current_slots << t(time_range, count: num_elems)
 
-        current_slots << "#{num_elems} #{range_type}"
-        pending_days  = days_passed - (num_elems * days)
+        pending_days = days_passed - (num_elems * days)
         build_time_ago_slots(pending_days, depth - 1, current_slots)
       end
 
@@ -110,7 +105,7 @@ module Jekyll
         if slots.length == 1
           slots[0]
         else
-          "#{slots[0...-1].join(', ')} #{t(:and)} #{slots[-1]}"
+          "#{slots[0...-1].join(t(:words_connector))} #{t(:last_word_connector)} #{slots[-1]}"
         end
       end
     end

data/lib/jekyll-timeago/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Timeago
-    VERSION = "0.10.1"
+    VERSION = "0.11.0"
   end
 end

data/lib/locales/en.yml

@@ -2,16 +2,21 @@ en:
   today: 'today'
   yesterday: 'yesterday'
   tomorrow: 'tomorrow'
-  and: 'and'
+  last_word_connector: 'and'
+  words_connector: ', '
   suffix: 'ago'
   prefix: ''
   suffix_future: ''
   prefix_future: 'in'
-  years: 'years'
-  year: 'year'
-  months: 'months'
-  month: 'month'
-  weeks: 'weeks'
-  week: 'week'
-  days: 'days'
-  day: 'day'
+  years:
+    one: '1 year'
+    many: "%{count} years"
+  months:
+    one: '1 month'
+    many: '%{count} months'
+  weeks:
+    one: '1 week'
+    many: '%{count} weeks'
+  days:
+    one: '1 day'
+    many: '%{count} days'

data/lib/locales/es.yml

@@ -2,16 +2,21 @@ es:
   today: 'hoy'
   yesterday: 'ayer'
   tomorrow: 'mañana'
-  and: 'y'
+  last_word_connector: 'y'
+  words_connector: ', '
   suffix: ''
   prefix: 'hace'
   suffix_future: ''
   prefix_future: 'en'
-  years: 'años'
-  year: 'año'
-  months: 'meses'
-  month: 'mes'
-  weeks: 'semanas'
-  week: 'semana'
-  days: 'días'
-  day: 'día'
+  years:
+    one: '1 año'
+    many: "%{count} años"
+  months:
+    one: '1 mes'
+    many: '%{count} meses'
+  weeks:
+    one: '1 semana'
+    many: '%{count} semanas'
+  days:
+    one: '1 día'
+    many: '%{count} días'

data/lib/locales/fr.yml

@@ -2,16 +2,21 @@ fr:
   today: "aujourd'hui"
   yesterday: 'hier'
   tomorrow: 'demain'
-  and: 'et'
+  last_word_connector: 'et'
+  words_connector: ', '
   suffix: ''
   prefix: 'il y a environ'
   suffix_future: ''
   prefix_future: 'dans'
-  years: 'années'
-  year: 'année'
-  months: 'mois'
-  month: 'mois'
-  weeks: 'semaines'
-  week: 'semaine'
-  days: 'jours'
-  day: 'jour'
+  years:
+    one: '1 année'
+    many: "%{count} années"
+  months:
+    one: '1 mois'
+    many: '%{count} mois'
+  weeks:
+    one: '1 semaine'
+    many: '%{count} semaines'
+  days:
+    one: '1 jour'
+    many: '%{count} jours'

data/lib/locales/it.yml

@@ -2,16 +2,21 @@ it:
   today: 'oggi'
   yesterday: 'ieri'
   tomorrow: 'domani'
-  and: 'e'
+  last_word_connector: 'e'
+  words_connector: ', '
   suffix: 'fa'
   prefix: ''
   suffix_future: ''
   prefix_future: 'fra'
-  years: 'anni'
-  year: 'anno'
-  months: 'mesi'
-  month: 'mese'
-  weeks: 'settimane'
-  week: 'settimana'
-  days: 'giorni'
-  day: 'giorno'
+  years:
+    one: '1 anno'
+    many: "%{count} anni"
+  months:
+    one: '1 mese'
+    many: '%{count} mesi'
+  weeks:
+    one: '1 settimana'
+    many: '%{count} settimane'
+  days:
+    one: '1 giorno'
+    many: '%{count} giorni'

data/lib/locales/pt.yml

@@ -2,16 +2,21 @@ pt:
   today: 'hoje'
   yesterday: 'ontem'
   tomorrow: 'amanhã'
-  and: 'e'
+  last_word_connector: 'e'
+  words_connector: ', '
   suffix: 'atrás'
   prefix: ''
   suffix_future: ''
   prefix_future: 'em'
-  years: 'anos'
-  year: 'ano'
-  months: 'meses'
-  month: 'mês'
-  weeks: 'semanas'
-  week: 'semanas'
-  days: 'dias'
-  day: 'dia'
+  years:
+    one: '1 ano'
+    many: "%{count} anos"
+  months:
+    one: '1 mês'
+    many: '%{count} meses'
+  weeks:
+    one: '1 semana'
+    many: '%{count} semanas'
+  days:
+    one: '1 dia'
+    many: '%{count} dias'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-timeago
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A date helper to compute distance of dates in words.