edtf-humanize 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0bdc76c57a55ce4f9ec22d75d2247609840b769d52662c252d7dc43dc0926ac
-  data.tar.gz: a4c90eeb17b1e05335498c6aa7bb58b8696fb1238feb5700ba4f6098ab498f97
+  metadata.gz: 1d37dd3663889a9bcaa2a00392525eca76c61691705591c6c50f0ee8eacf9d8f
+  data.tar.gz: de92c0782ba2cfa57b62d55a214ede47c8a6fa152cc14b7d38f6bde0c4bfc66b
 SHA512:
-  metadata.gz: fee2ccf6b710d1f52e1e842b837052fe9efe8c274ddf2fe33a494462c801b6220dd878269a9befc8b719cad2baa3f46f7ea239923d8ca091b542368bd5c5176b
-  data.tar.gz: 92f100dd9dd8865c7ee2e42dd711787b05a00adc959287afb394f3ac67a182a9142a4d5f1af43bf0e402eb7047935c7a64425e92501b8d1df3ac88c795842424
+  metadata.gz: 47f4afa9029965ed3a620067218a4594559717f6eeae2ae42c5fe4ba985c6eae9d6be81fd06a150deabf8997c9d5fb10564d4915c0f725c3e0743c636df407cd
+  data.tar.gz: 3180b6b54cc2b9011cfdef70259a4196721cc6894d0eab0258962020b0918e8bcfa2dc8b6744b6ba6f2f90f3f6a065039f214e39075490700597a70a6f3d372d

data/config/locales/de.edtf.yml

@@ -25,7 +25,6 @@ de:
       interval_prefix_month: ""
       interval_prefix_year: ""
       interval_connector_approximate: " - "
-      interval_connector_open: " - "
       interval_connector_day: " - "
       interval_connector_month: " - "
       interval_connector_year: " - "
@@ -46,8 +45,15 @@ de:
       set_later_prefix_inclusive: "nach "
       set_two_dates_connector_exclusive: " oder "
       set_two_dates_connector_inclusive: " eund "
+      uncertain_date_prefix: ""
       uncertain_date_suffix: " ?"
       unknown: "Datum unbekannt"
+      unknown_start_interval_with_day: "unbekanntes Datum bis %{date}"
+      unknown_start_interval_with_month: "unbekanntes Datum bis %{date}"
+      unknown_start_interval_with_year: "unbekanntes Datum bis %{date}"
+      unknown_end_interval_with_day: "%{date} bis unbekanntes Datum"
+      unknown_end_interval_with_month: "%{date} bis unbekanntes Datum"
+      unknown_end_interval_with_year: "%{date} bis unbekanntes Datum"
       unspecified_digit_substitute: "x"
     formats:
       day_precision_strftime_format: "%-d. %B %Y"

data/config/locales/en.edtf.yml

@@ -15,7 +15,6 @@ en:
       interval_prefix_year: ""
       interval_connector_approximate: " to "
       interval_connector_day: " to "
-      interval_connector_open: " to "
       interval_connector_month: " to "
       interval_connector_year: " to "
       interval_unspecified_suffix: "s"
@@ -35,8 +34,15 @@ en:
       set_later_prefix_inclusive: 'on and after '
       set_two_dates_connector_exclusive: " or "
       set_two_dates_connector_inclusive: " and "
+      uncertain_date_prefix: ""
       uncertain_date_suffix: "?"
       unknown: 'unknown'
+      unknown_start_interval_with_day: "unknown date to %{date}"
+      unknown_start_interval_with_month: "unknown date to %{date}"
+      unknown_start_interval_with_year: "unknown date to %{date}"
+      unknown_end_interval_with_day: "%{date} to unknown date"
+      unknown_end_interval_with_month: "%{date} to unknown date"
+      unknown_end_interval_with_year: "%{date} to unknown date"
       unspecified_digit_substitute: "x"
     formats:
       day_precision_strftime_format: "%B %-d, %Y"

data/config/locales/fr.edtf.yml

@@ -25,7 +25,6 @@ fr:
       interval_prefix_month: "De "
       interval_prefix_year: "De "
       interval_connector_approximate: " à "
-      interval_connector_open: " à "
       interval_connector_day: " au "
       interval_connector_month: " à "
       interval_connector_year: " à "
@@ -46,8 +45,15 @@ fr:
       set_later_prefix_inclusive: 'Le et après '
       set_two_dates_connector_exclusive: " ou "
       set_two_dates_connector_inclusive: " et "
+      uncertain_date_prefix: ""
       uncertain_date_suffix: "?"
       unknown: 'Inconnue'
+      unknown_start_interval_with_day: "date inconnue au %{date}"
+      unknown_start_interval_with_month: "date inconnue jusqu'en %{date}"
+      unknown_start_interval_with_year: "date inconnue jusqu'en %{date}"
+      unknown_end_interval_with_day: "%{date} à date inconnue"
+      unknown_end_interval_with_month: "%{date} à date inconnue"
+      unknown_end_interval_with_year: "%{date} à date inconnue"
       unspecified_digit_substitute: "x"
     formats:
       day_precision_strftime_format: "%-d %B %Y"

data/config/locales/it.edtf.yml

@@ -25,7 +25,6 @@ it:
       interval_prefix_month: ""
       interval_prefix_year: ""
       interval_connector_approximate: " - "
-      interval_connector_open: " - "
       interval_connector_day: " - "
       interval_connector_month: " - "
       interval_connector_year: " - "
@@ -46,8 +45,15 @@ it:
       set_later_prefix_inclusive: "dopo "
       set_two_dates_connector_exclusive: " o "
       set_two_dates_connector_inclusive: " e "
+      uncertain_date_prefix: ""
       uncertain_date_suffix: " ?"
       unknown: "data sconosciuta"
+      unknown_start_interval_with_day: "data sconosciuta a %{date}"
+      unknown_start_interval_with_month: "data sconosciuta a %{date}"
+      unknown_start_interval_with_year: "data sconosciuta a %{date}"
+      unknown_end_interval_with_day: "%{date} a data sconosciuta"
+      unknown_end_interval_with_month: "%{date} a data sconosciuta"
+      unknown_end_interval_with_year: "%{date} a data sconosciuta"
       unspecified_digit_substitute: "x"
     formats:
       day_precision_strftime_format: "%-d %B %Y"

data/lib/edtf/humanize/language/default/formats.rb

@@ -10,7 +10,7 @@ module Edtf
           private
 
           def date_format(date)
-            "#{apply_if_unspecified_year(date)}#{apply_if_uncertain(date)}"
+            "#{apply_prefix_if_uncertain(date)}#{apply_if_unspecified_year(date)}#{apply_suffix_if_uncertain(date)}"
           end
 
           def date_precision(date)
@@ -85,12 +85,19 @@ module Edtf
           end
 
           # '1990?' => 1990?
-          def apply_if_uncertain(date)
+          def apply_suffix_if_uncertain(date)
             return '' unless date.respond_to?(:uncertain?) && date.uncertain?
 
             I18n.t('edtf.terms.uncertain_date_suffix', default: '?')
           end
 
+          # '1990?' => ?1990
+          def apply_prefix_if_uncertain(date)
+            return '' unless date.respond_to?(:uncertain?) && date.uncertain?
+
+            I18n.t('edtf.terms.uncertain_date_prefix', default: '')
+          end
+
           # '198u' => 198x
           def apply_if_unspecified_year(date)
             display = date_precision(date)

data/lib/edtf/humanize/language/default/interval.rb

@@ -12,6 +12,8 @@ module Edtf
           def humanizer(date)
             if date.from == :open || date.to == :open
               open_interval(date)
+            elsif date.from == :unknown || date.to == :unknown
+              unknown_interval(date)
             else
               "#{interval_prefix(date)}" \
                 "#{formatted_date(date.from)}" \
@@ -68,6 +70,52 @@ module Edtf
             end
           end
 
+          def unknown_interval(date)
+            if date.from == :unknown
+              unknown_start_interval(formatted_date: formatted_date(date.to),
+                                     precision: date.to.precision)
+            elsif date.to == :unknown
+              unknown_end_interval(formatted_date: formatted_date(date.from),
+                                   precision: date.from.precision)
+            end
+          end
+
+          # unknown/1980 => unknown year to 1980
+          def unknown_start_interval(formatted_date:, precision:)
+            case precision
+            when :year
+              I18n.t('edtf.terms.unknown_start_interval_with_year',
+                     date: formatted_date,
+                     default: "unknown date to #{formatted_date}")
+            when :month
+              I18n.t('edtf.terms.unknown_start_interval_with_month',
+                     date: formatted_date,
+                     default: "unknown date to #{formatted_date}")
+            when :day
+              I18n.t('edtf.terms.unknown_start_interval_with_day',
+                     date: formatted_date,
+                     default: "unknown date to #{formatted_date}")
+            end
+          end
+
+          # 1980/unknown => 1980 to unknown year
+          def unknown_end_interval(formatted_date:, precision:)
+            case precision
+            when :year
+              I18n.t('edtf.terms.unknown_end_interval_with_year',
+                     date: formatted_date,
+                     default: "#{formatted_date} to unknown date")
+            when :month
+              I18n.t('edtf.terms.unknown_end_interval_with_month',
+                     date: formatted_date,
+                     default: "#{formatted_date} to unknown date")
+            when :day
+              I18n.t('edtf.terms.unknown_end_interval_with_day',
+                     date: formatted_date,
+                     default: "#{formatted_date} to unknown date")
+            end
+          end
+
           def formatted_date(date)
             "#{apply_prefix_if_approximate(date)}" \
               "#{date_format(date)}" \
@@ -86,8 +134,6 @@ module Edtf
           end
 
           def interval_connector(date)
-            return interval_connector_open if date.to == :open
-
             return interval_connector_approx if date.to.approximate.day ||
                                                 date.to.approximate.month ||
                                                 date.to.approximate.year
@@ -95,10 +141,6 @@ module Edtf
             interval_connector_other(date)
           end
 
-          def interval_connector_open
-            I18n.t('edtf.terms.interval_connector_open')
-          end
-
           def interval_connector_approx
             I18n.t('edtf.terms.interval_connector_approximate',
                    default: ' to ')

data/lib/edtf/humanize/language/default/season.rb

@@ -10,10 +10,11 @@ module Edtf
           extend self
 
           def humanizer(date)
-            "#{apply_prefix_if_approximate(date)}" \
+            "#{apply_prefix_if_uncertain(date)}" \
+              "#{apply_prefix_if_approximate(date)}" \
               "#{translate_season(date.season)} #{date.year}" \
               "#{apply_suffix_if_approximate(date)}" \
-              "#{apply_if_uncertain(date)}"
+              "#{apply_suffix_if_uncertain(date)}"
           end
 
           private

data/lib/edtf/humanize/version.rb

@@ -2,6 +2,6 @@
 
 module Edtf
   module Humanize
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edtf-humanize
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Cory Lown
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: This gem adds a humanize method to EDTF dates.