From bb65ce61ed29542a0515bba5247d291bf527d4cd Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Sat, 6 May 2023 17:21:50 -0400
Subject: [PATCH] Sync up easy_time.jinja with upstream project

---
 custom_templates/easy_time.jinja | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/custom_templates/easy_time.jinja b/custom_templates/easy_time.jinja
index 179b41c..ec1cf73 100644
--- a/custom_templates/easy_time.jinja
+++ b/custom_templates/easy_time.jinja
@@ -669,6 +669,12 @@
 
 {% set _default_values = _durations.keys() | list %}
 
+{%- macro _catchup(n) %}
+{%- for i in range(n) %}
+-
+{%- endfor %}
+{%- endmacro %}
+
 {%- macro _get_language_time_format(override, language) %}
 {%- set lang_fmat = languages.get(language, {}).get('time', {}).get('format', _bad_value) %}
 {%- set fmat = _time_formats.get(override, _default_time_format) if override in _time_formats.keys() else _time_formats.get(lang_fmat, _default_time_format) %}
@@ -876,6 +882,28 @@
 {%- endif %}
 {%- endmacro %}
 
+{%- macro easy_time_between(t1, t2, attr1=None, attr2=None, language=default_language, utc1=False, utc2=False, max_period='year') %}
+{%- set values = _default_values[_default_values.index(max_period):] if max_period in _default_values else _default_values %}
+{%- set seconds = _time_between(_delta_seconds, t1, attr1, utc1, t2, attr2, utc2) | float | abs %}
+{{- _just_time(seconds, language, values, True) }}
+{%- endmacro %}
+
+{%- macro big_time_between(t1, t2, attr1=None, attr2=None, language=default_language, utc1=False, utc2=False, max_period='year') %}
+{%- set values = _default_values[_default_values.index(max_period):] if max_period in _default_values else _default_values %}
+{%- set seconds = _time_between(_delta_seconds, t1, attr1, utc1, t2, attr2, utc2) | float | abs %}
+{{- _just_time(seconds, language, values, False) }}
+{%- endmacro %}
+
+{%- macro custom_time_between(t1, t2, values='', attr1=None, attr2=None, language=default_language, utc1=False, utc2=False, max_period='year') %}
+{%- set values = values.replace(' ','').split(',') | list if values is string else [] %}
+{%- set seconds = _time_between(_delta_seconds, t1, attr1, utc1, t2, attr2, utc2) | float | abs %}
+{{- _just_time(seconds, language, values, False) }}
+{%- endmacro %}
+
+{%- macro time_between(t1, t2, attr1=None, attr2=None, utc1=False, utc2=False) %}
+{{- _time_between(_delta_timedelta, t1, attr1, utc1, t2, attr2, utc2) }}
+{%- endmacro %}
+
 {# macro to generate a friendly relative time phrase #}
 {%- macro _relative_time(input, attribute, language, values, biggest, utc)  %}
 {%- set uptime = _to_datetime(input, attribute, utc) | as_datetime %}
@@ -1133,4 +1161,4 @@
     {%- endif %}
   {%- endif %}
 {%- endif %}
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}