Merge pull request #3471 from cvergne/fix-rssdate

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / views / themes / common / Entry / entries.xml.twig

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 12e8c79fd73c0d8a7555f313275a03e2a5705a10..25d09ec31a6612afce666243e7129d67cd20e0eb 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
     <channel>
-        <title>wallabag — {{type}} feed</title>
-        <link>{{ url(type) }}</link>
+        <title>wallabag - {{ type }} feed</title>
+        <link>{{ url_html }}</link>
         <link rel="self" href="{{ app.request.uri }}"/>
         {% if entries.hasPreviousPage -%}
             <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/>
@@ -11,9 +11,9 @@
             <link rel="next" href="{{ url }}?page={{ entries.nextPage }}"/>
         {% endif -%}
         <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/>
-        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
+        <pubDate>{{ "now"|date(constant('DATE_RSS')) }}</pubDate>
         <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
+        <description>wallabag {{ type }} elements</description>
 
         {% for entry in entries %}
 
@@ -22,7 +22,7 @@
                 <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
                 <link>{{ entry.url }}</link>
                 <guid>{{ entry.url }}</guid>
-                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
+                <pubDate>{{ entry.createdAt|date(constant('DATE_RSS')) }}</pubDate>
                 <description>
                     <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
                 </description>