Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-03-02 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xxx] adding exceptions for instant parsing

Browse Source 
adding @time hint to duration parse exception text
changing duration formatting to be able to handle negative durations
This commit is contained in:
Sheldan
2026-02-15 22:46:21 +01:00
parent de7ec74033
commit 516762c7ed
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
abstracto-modules/core/src/main/resources/default/builtins/duration_formatting.ftl
View File

@@ -1 +1,4 @@
<#if days gt 1><#include "duration_days"><#elseif days = 1><#include "duration_day"></#if> <#if hours gt 1><#include "duration_hours"><#elseif hours = 1><#include "duration_hour"></#if> <#if minutes gt 1><#include "duration_minutes"><#elseif minutes = 1><#include "duration_minute"></#if> <#if seconds gt 1 || (seconds = 0 && days = 0 && hours = 0 && minutes = 0)><#include "duration_seconds"><#elseif seconds = 1><#include "duration_second"></#if> <#function fits value>
<#return value != 1 && value != 0>
</#function>
<#if fits(days)><#include "duration_days"><#elseif days = 1 || days = -1><#include "duration_day"></#if> <#if fits(hours)><#include "duration_hours"><#elseif hours = 1 || hours = -1><#include "duration_hour"></#if> <#if fits(minutes)><#include "duration_minutes"><#elseif minutes = 1 || minutes = -1><#include "duration_minute"></#if> <#if fits(seconds) || (seconds = 0 && days = 0 && hours = 0 && minutes = 0)><#include "duration_seconds"><#elseif seconds = 1 || seconds = -1><#include "duration_second"></#if>

2
abstracto-modules/core/src/main/resources/default/exceptions/instant_invalid_time_format_exception.ftl Normal file
View File

@@ -0,0 +1,2 @@
<#assign invalidFormat=model.invalidFormat>
<#include "instant_invalid_time_format_exception_text">

3
translations/core/src/main/resources/default/exception/duration_invalid_time_format_exception_text.ftl
View File

@@ -1 +1,2 @@
Invalid time format: ${invalidFormat}. Valid formats are ${validFormats}. Beware to not use a space between the number and the unit. Invalid time format: ${invalidFormat}. Valid formats are ${validFormats}. Do not use a space between the number and the unit.
Alternatively, you can use `@time: <duration description>` to define a duration.

1
translations/core/src/main/resources/default/exception/instant_invalid_time_format_exception_text.ftl Normal file
View File

@@ -0,0 +1 @@
Invalid format for timestamp. Either use epoch seconds (see [here](https://www.unixtimestamp.com/)) or use `@time: <time>`.