diff --git a/app/models/server/evolution.rb b/app/models/server/evolution.rb index 83a65f846..9cdf9e68f 100644 --- a/app/models/server/evolution.rb +++ b/app/models/server/evolution.rb @@ -31,6 +31,10 @@ def best_localization_for(language) localization_for(language) || original_localization end + def days_left + (released_at - Date.current).to_i + end + def to_s original_localization.to_s end diff --git a/app/views/admin/application/components/_evolutions.html.erb b/app/views/admin/application/components/_evolutions.html.erb index 729a8e3eb..2352b13d5 100644 --- a/app/views/admin/application/components/_evolutions.html.erb +++ b/app/views/admin/application/components/_evolutions.html.erb @@ -11,9 +11,10 @@ Server::Evolution.planned.each do |evolution|
- <%= l evolution.released_at, format: "%d·%m" %> + <%= t('evolutions.countdown', days: evolution.days_left) %>
+ <%= t('evolutions.release') %> <%= l evolution.released_at, format: :full %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2fb8008ed..f1d994707 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -430,7 +430,9 @@ en: pending: Pending export: Export (xlsx) evolutions: + countdown: T-%{days} listen: Listen on + release: Release date false: No file_hint_with_formats: "%{formats} files only. %{filesize} max." file_hint_without_formats: "%{filesize} max" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index c5213a9c5..99fb7c636 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -429,7 +429,9 @@ fr: finished_with_errors: Traité avec des erreurs pending: En cours de traitement evolutions: + countdown: J-%{days} listen: Écouter sur + release: Sortie le export: Exporter (xlsx) false: Non file_hint_with_formats: "Fichiers %{formats} uniquement. %{filesize} max."