diff --git a/app/views/digests/markdown.html.haml b/app/views/digests/markdown.html.haml
index a19e9f57..3dc2c8df 100644
--- a/app/views/digests/markdown.html.haml
+++ b/app/views/digests/markdown.html.haml
@@ -1,31 +1,25 @@
- title = t '.title', week: @week.cweek, year: @week.year
- description = capture_haml do
- = t '.week', begin: @week.beginning_of_week.day, end: @week.end_of_week.day,
- month: t('date.month_names')[@week.month], year: @week.year,
- count: @events.count
+ = t '.week', count: @events.count
\
- @events.group_by { |evt| evt.start_time.to_date }.sort.each do |day, evts|
- * #{t('date.day_names')[day.wday].capitalize}:
+ * #{l day, format: :long}
- evts.each do |event|
\ * [**#{event.city}**] [#{event.title}](#{event_url event})
- second_part = capture_haml do
= title
\=====
- = t '.short_week', begin: @week.beginning_of_week.day,
- end: @week.end_of_week.day, month: t('date.month_names')[@week.month],
- year: @week.year, count: @events.count
- @events.sort_by(&:start_time).each do |event|
- @event = event
- \## [#{event.city}] [#{event.title}](#{event_url event})
- = display_date
- = [@event.place_name, event.full_address].compact.join ', '
+ \## [#{event.city}] [#{event.title}](#{event_url event}) - #{display_date}
- strip_tags(@event.description).split(/\r\n/).reject { |p| p.blank? }[0..2].each do |p|
- > #{p}
+ = p
\
+ * #{[@event.place_name, event.full_address].compact.join ', '}
* #{Event.human_attribute_name :url}: #{link_to @event.url, @event.url}
* #{Event.human_attribute_name :tags}:
#{@event.tags.split.collect { |tag| "[#{tag}](#{tag_url tag})" }.join ', '}
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index d47e938b..3c84da72 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -283,8 +283,7 @@ description."
digests:
markdown:
title: Agenda du Libre for week %{week} of the year %{year}
- week: Week from %{begin} to %{end} %{month} %{year}. %{count} events.
- short_week: Week from %{begin} to %{end} %{month} %{year}. %{count} events.
+ week: Week of %{count} events.
devise:
sessions:
diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml
index 7975b4d5..197bfc14 100644
--- a/config/locales/views/fr.yml
+++ b/config/locales/views/fr.yml
@@ -285,7 +285,7 @@ description plus complète."
digests:
markdown:
title: Agenda du Libre pour la semaine %{week} de l'année %{year}
- week: Calendrier web, regroupant des évènements liés au Libre (logiciel, salon, atelier, install party, conférence) en France, annoncés par leurs organisateurs. Voici un récapitulatif de la semaine à venir, du %{begin} au %{end} %{month} %{year}. Le détail de chacun de ces %{count} événements est en seconde partie de dépêche.
+ week: Calendrier web, regroupant des évènements liés au Libre (logiciel, salon, atelier, install party, conférence) en France, annoncés par leurs organisateurs. Voici un récapitulatif de la semaine à venir. Le détail de chacun de ces %{count} événements est en seconde partie de dépêche.
short_week: Semaine du %{begin} au %{end} %{month} %{year}. %{count} événements.
devise: