aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2020-04-06 19:58:33 +0200
committerGitHub <noreply@github.com>2020-04-06 19:58:33 +0200
commitb283ee0d6d98b28623805ae00c669c1cdf638b91 (patch)
tree4c9169b1828e50f684d7ed040bd9e12bd55cbf81
parent4d3478ec5306be248149e4f12c16cc112d5cb11b (diff)
parent0bddd348473b0d6ef6884c1e8b0c7533f601b2b1 (diff)
downloadwallabag-b283ee0d6d98b28623805ae00c669c1cdf638b91.tar.gz
wallabag-b283ee0d6d98b28623805ae00c669c1cdf638b91.tar.zst
wallabag-b283ee0d6d98b28623805ae00c669c1cdf638b91.zip
Merge pull request #4315 from wallabag/add-published-date-epub
Added publication date on epub export
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml1
17 files changed, 23 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index f981ee50..1318602e 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -196,10 +196,17 @@ class EntriesExport
196 $authors = implode(',', $publishedBy); 196 $authors = implode(',', $publishedBy);
197 } 197 }
198 198
199 $publishedAt = $entry->getPublishedAt();
200 $publishedDate = $this->translator->trans('export.unknown');
201 if (!empty($publishedAt)) {
202 $publishedDate = $entry->getPublishedAt()->format('Y-m-d');
203 }
204
199 $titlepage = $content_start . 205 $titlepage = $content_start .
200 '<h1>' . $entry->getTitle() . '</h1>' . 206 '<h1>' . $entry->getTitle() . '</h1>' .
201 '<dl>' . 207 '<dl>' .
202 '<dt>' . $this->translator->trans('entry.view.published_by') . '</dt><dd>' . $authors . '</dd>' . 208 '<dt>' . $this->translator->trans('entry.view.published_by') . '</dt><dd>' . $authors . '</dd>' .
209 '<dt>' . $this->translator->trans('entry.metadata.published_on') . '</dt><dd>' . $publishedDate . '</dd>' .
203 '<dt>' . $this->translator->trans('entry.metadata.reading_time') . '</dt><dd>' . $this->translator->trans('entry.metadata.reading_time_minutes_short', ['%readingTime%' => $entry->getReadingTime()]) . '</dd>' . 210 '<dt>' . $this->translator->trans('entry.metadata.reading_time') . '</dt><dd>' . $this->translator->trans('entry.metadata.reading_time_minutes_short', ['%readingTime%' => $entry->getReadingTime()]) . '</dd>' .
204 '<dt>' . $this->translator->trans('entry.metadata.added_on') . '</dt><dd>' . $entry->getCreatedAt()->format('Y-m-d') . '</dd>' . 211 '<dt>' . $this->translator->trans('entry.metadata.added_on') . '</dt><dd>' . $entry->getCreatedAt()->format('Y-m-d') . '</dd>' .
205 '<dt>' . $this->translator->trans('entry.metadata.address') . '</dt><dd><a href="' . $entry->getUrl() . '">' . $entry->getUrl() . '</a></dd>' . 212 '<dt>' . $this->translator->trans('entry.metadata.address') . '</dt><dd><a href="' . $entry->getUrl() . '">' . $entry->getUrl() . '</a></dd>' .
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 47de066f..53b60c72 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Om' 291 page_title: 'Om'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 50e67d47..b9694be8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Über' 291 page_title: 'Über'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 27585f77..e8b1ea15 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% min" 285 reading_time_minutes_short: "%readingTime% min"
286 address: "Address" 286 address: "Address"
287 added_on: "Added on" 287 added_on: "Added on"
288 published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'About' 291 page_title: 'About'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 2cf67176..6fd44f8e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% min" 285 reading_time_minutes_short: "%readingTime% min"
286 address: "Dirección" 286 address: "Dirección"
287 added_on: "Añadido el" 287 added_on: "Añadido el"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Acerca de' 291 page_title: 'Acerca de'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index c1fb74d3..627923b0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'درباره' 291 page_title: 'درباره'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 2b8bb092..542dc25c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% min" 285 reading_time_minutes_short: "%readingTime% min"
286 address: "Adresse" 286 address: "Adresse"
287 added_on: "Ajouté le" 287 added_on: "Ajouté le"
288 published_on: "Publié le"
288 289
289about: 290about:
290 page_title: "À propos" 291 page_title: "À propos"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 8cee3e52..5d017a40 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'A proposito' 291 page_title: 'A proposito'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
index 9125a5d1..9de8c571 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% 分" 285 reading_time_minutes_short: "%readingTime% 分"
286 address: "アドレス" 286 address: "アドレス"
287 added_on: "追加日" 287 added_on: "追加日"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'アプリについて' 291 page_title: 'アプリについて'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 052582ab..e0fb1933 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% min" 285 reading_time_minutes_short: "%readingTime% min"
286 address: "Adreça" 286 address: "Adreça"
287 added_on: "Ajustat a" 287 added_on: "Ajustat a"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'A prepaus' 291 page_title: 'A prepaus'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 93e8f852..dfaf9e89 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'O nas' 291 page_title: 'O nas'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 7159569e..8908c0cc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% min" 285 reading_time_minutes_short: "%readingTime% min"
286 address: "Endereço" 286 address: "Endereço"
287 added_on: "Adicionado o" 287 added_on: "Adicionado o"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Sobre' 291 page_title: 'Sobre'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index f671da8d..b269578a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Despre' 291 page_title: 'Despre'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 7d45df1c..648bbc80 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'О' 291 page_title: 'О'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 03f8fa9a..4de87adc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'เกี่ยวกับ' 291 page_title: 'เกี่ยวกับ'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 05cfbbfc..9afa648c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -285,6 +285,7 @@ entry:
285 # reading_time_minutes_short: "%readingTime% min" 285 # reading_time_minutes_short: "%readingTime% min"
286 # address: "Address" 286 # address: "Address"
287 # added_on: "Added on" 287 # added_on: "Added on"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: 'Hakkımızda' 291 page_title: 'Hakkımızda'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
index 21f2f9a7..a34e3852 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
@@ -285,6 +285,7 @@ entry:
285 reading_time_minutes_short: "%readingTime% 分钟" 285 reading_time_minutes_short: "%readingTime% 分钟"
286 address: "地址" 286 address: "地址"
287 added_on: "添加于" 287 added_on: "添加于"
288 # published_on: "Published on"
288 289
289about: 290about:
290 page_title: '关于' 291 page_title: '关于'