aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig8
8 files changed, 14 insertions, 9 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 6574e587..5229ac73 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -159,6 +159,7 @@ config:
159 # and: 'One rule AND another' 159 # and: 'One rule AND another'
160 # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' 160 # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
161 # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' 161 # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
162
162entry: 163entry:
163 page_titles: 164 page_titles:
164 # unread: 'Unread entries' 165 # unread: 'Unread entries'
@@ -244,7 +245,7 @@ entry:
244 url_label: 'Url' 245 url_label: 'Url'
245 save_label: 'Gem' 246 save_label: 'Gem'
246 public: 247 public:
247 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
248 confirm: 249 confirm:
249 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
250 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 49e9eab3..aa1cd1a9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Save' 246 save_label: 'Save'
247 public: 247 public:
248 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Are you sure you want to remove that article?" 250 delete: "Are you sure you want to remove that article?"
251 delete_tag: "Are you sure you want to remove that tag from that article?" 251 delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 15460ef7..57e6c029 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'نشانی' 245 url_label: 'نشانی'
246 save_label: 'ذخیره' 246 save_label: 'ذخیره'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
251 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 0d9fda5f..6eac4c36 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: "Adresse" 245 url_label: "Adresse"
246 save_label: "Enregistrer" 246 save_label: "Enregistrer"
247 public: 247 public:
248 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" 248 shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Voulez-vous vraiment supprimer cet article ?" 250 delete: "Voulez-vous vraiment supprimer cet article ?"
251 delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?" 251 delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 669a1aa3..73081ca5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Salva' 246 save_label: 'Salva'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Vuoi veramente rimuovere quell'articolo?" 250 delete: "Vuoi veramente rimuovere quell'articolo?"
251 delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?" 251 delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c663b23e..f16504ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Salvează' 246 save_label: 'Salvează'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
251 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index e0e752e0..90a140cd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -243,7 +243,7 @@ entry:
243 url_label: 'Url' 243 url_label: 'Url'
244 save_label: 'Kaydet' 244 save_label: 'Kaydet'
245 public: 245 public:
246 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 246 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
247 confirm: 247 confirm:
248 # delete: "Are you sure you want to remove that article?" 248 # delete: "Are you sure you want to remove that article?"
249 # delete_tag: "Are you sure you want to remove that tag from that article?" 249 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 623cf1c4..3828c296 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -24,7 +24,7 @@
24 24
25 article { 25 article {
26 margin: 0 auto; 26 margin: 0 auto;
27 width: 600px; 27 width: 900px;
28 } 28 }
29 </style> 29 </style>
30 <meta property="og:title" content="{{ entry.title|e|raw }}" /> 30 <meta property="og:title" content="{{ entry.title|e|raw }}" />
@@ -45,7 +45,11 @@
45 <header> 45 <header>
46 <h1>{{ entry.title|e|raw }}</h1> 46 <h1>{{ entry.title|e|raw }}</h1>
47 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> 47 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
48 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div> 48 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div>
49
50 {% if entry.previewPicture is not null %}
51 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div>
52 {% endif %}
49 </header> 53 </header>
50 <article> 54 <article>
51 {{ entry.content | raw }} 55 {{ entry.content | raw }}