12_generate_custom_csv_file #58

Open
philipp wants to merge 59 commits from 12_generate_custom_csv_file into develop
8 changed files with 20 additions and 2 deletions
Showing only changes of commit 075f3cfa1a - Show all commits

View file

@ -4,7 +4,7 @@ module ApplicationHelper
include PathHelper
def format_time(time = Time.now)
I18n.l(time, format: '%d.%m.%Y %H:%M') unless time.nil?
I18n.l(time, format: :foodsoft_datetime) unless time.nil?
end
def format_date(time = Time.now)

View file

@ -0,0 +1 @@
Time::DATE_FORMATS[:foodsoft_datetime] = "%d.%m.%Y %H:%M"

View file

@ -1876,3 +1876,6 @@ de:
title: Arbeitsgruppen
update:
notice: Arbeitsgruppe wurde aktualisiert
time:
formats:
foodsoft_datetime: "%d.%m.%Y %H:%M"

View file

@ -1903,3 +1903,6 @@ en:
title: Workgroups
update:
notice: Workgroup was updated
time:
formats:
foodsoft_datetime: "%Y-%m-%d %H:%M"

View file

@ -1618,3 +1618,6 @@ es:
title: Grupos de trabajo
update:
notice: El grupo de trabajo se actualizó.
time:
formats:
foodsoft_datetime: "%d/%b/%Y %H:%M"

View file

@ -1375,3 +1375,6 @@ fr:
title: Équipes
update:
notice: L'équipe a été mise à jour
time:
formats:
foodsoft_datetime: "%d/%m/%Y %H:%M"

View file

@ -1868,3 +1868,6 @@ nl:
title: Werkgroepen
update:
notice: Werkgroep is bijgewerkt
time:
formats:
foodsoft_datetime: "%d-%m-%Y %H:%M"

View file

@ -1903,4 +1903,6 @@ tr:
title: Çalışma Grupları
update:
notice: Çalışma grubu güncellendi.
time:
formats:
foodsoft_datetime: "%d.%b.%Y %H:%M"