aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-10-07 14:30:46 +0200
committerGitHub <noreply@github.com>2016-10-07 14:30:46 +0200
commitc8d2dcdafe95c7986bb9fdaa7998417a014bf6fa (patch)
tree1b9f358afc7483095323eca874bc1adf7aaea2ff
parentbf71a734f64a911549e188a5c69ac8e08eec896e (diff)
parent21d82c3c5d211ee3e30cf71d2de3ebac0d63da54 (diff)
downloadwallabag-c8d2dcdafe95c7986bb9fdaa7998417a014bf6fa.tar.gz
wallabag-c8d2dcdafe95c7986bb9fdaa7998417a014bf6fa.tar.zst
wallabag-c8d2dcdafe95c7986bb9fdaa7998417a014bf6fa.zip
Merge pull request #2383 from wallabag/add-info-publich-articles
Added OpenGraph support for public articles
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.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.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml4
-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.twig9
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php5
13 files changed, 35 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index b04b9512..2652a102 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 # is_public_label: 'Public' 209 # is_public_label: 'Public'
210 save_label: 'Gem' 210 save_label: 'Gem'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'Om' 215 page_title: 'Om'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 6ea3f5c5..e0f29b61 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'URL' 208 url_label: 'URL'
209 is_public_label: 'Öffentlich' 209 is_public_label: 'Öffentlich'
210 save_label: 'Speichern' 210 save_label: 'Speichern'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'Über' 215 page_title: 'Über'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 38631e24..b8e98112 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 is_public_label: 'Public' 209 is_public_label: 'Public'
210 save_label: 'Save' 210 save_label: 'Save'
211 public:
212 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'About' 215 page_title: 'About'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index a1fc34ef..70633bd7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 is_public_label: 'Es Público' 209 is_public_label: 'Es Público'
210 save_label: 'Guardar' 210 save_label: 'Guardar'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'Acerca de' 215 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 740302c5..074ab7a8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'نشانی' 208 url_label: 'نشانی'
209 is_public_label: 'عمومی' 209 is_public_label: 'عمومی'
210 save_label: 'ذخیره' 210 save_label: 'ذخیره'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'درباره' 215 page_title: 'درباره'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index ad4fc99f..6d85a5ae 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 is_public_label: 'Public' 209 is_public_label: 'Public'
210 save_label: 'Enregistrer' 210 save_label: 'Enregistrer'
211 public:
212 shared_by_wallabag: "Cet article a été partagé par <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'À propos' 215 page_title: 'À propos'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index e0bd9d8b..15f7e774 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 is_public_label: 'Pubblico' 209 is_public_label: 'Pubblico'
210 save_label: 'Salva' 210 save_label: 'Salva'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'About' 215 page_title: 'About'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index b26bed87..1d10be2a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 is_public_label: 'Public' 209 is_public_label: 'Public'
210 save_label: 'Enregistrar' 210 save_label: 'Enregistrar'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'A prepaus' 215 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 285d73e5..9791a3b2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Adres URL' 208 url_label: 'Adres URL'
209 is_public_label: 'Publiczny' 209 is_public_label: 'Publiczny'
210 save_label: 'Zapisz' 210 save_label: 'Zapisz'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'O nas' 215 page_title: 'O nas'
@@ -284,7 +286,7 @@ quickstart:
284 import: 'Skonfigurować import' 286 import: 'Skonfigurować import'
285 first_steps: 287 first_steps:
286 title: 'Pierwsze kroki' 288 title: 'Pierwsze kroki'
287 description: "Teraz wallabag jest poprawnie skonfigurowany, więc czas zarchiwizować Internet. Klinknij w prawym górnym rogu na znak +, aby dodać link" 289 description: "Teraz wallabag jest poprawnie skonfigurowany, więc czas zarchiwizować Internet. Klinknij w prawym górnym rogu na znak +, aby dodać link"
288 new_article: 'Zapisz swój pierwszy artukuł' 290 new_article: 'Zapisz swój pierwszy artukuł'
289 unread_articles: 'I sklasyfikuj go!' 291 unread_articles: 'I sklasyfikuj go!'
290 migrate: 292 migrate:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index fba6f998..2b1d4f6d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -208,6 +208,8 @@ entry:
208 url_label: 'Url' 208 url_label: 'Url'
209 # is_public_label: 'Public' 209 # is_public_label: 'Public'
210 save_label: 'Salvează' 210 save_label: 'Salvează'
211 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
211 213
212about: 214about:
213 page_title: 'Despre' 215 page_title: 'Despre'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 1694e212..8cfc245a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -207,6 +207,8 @@ entry:
207 url_label: 'Url' 207 url_label: 'Url'
208 is_public_label: 'Herkes tarafından erişime açık olsun mu?' 208 is_public_label: 'Herkes tarafından erişime açık olsun mu?'
209 save_label: 'Kaydet' 209 save_label: 'Kaydet'
210 public:
211 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
210 212
211about: 213about:
212 page_title: 'Hakkımızda' 214 page_title: 'Hakkımızda'
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 b82b3d3d..36c49e04 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
@@ -27,11 +27,18 @@
27 width: 600px; 27 width: 600px;
28 } 28 }
29 </style> 29 </style>
30 <meta property="og:title" content="{{ entry.title | raw }}" />
31 <meta property="og:type" content="article" />
32 <meta property="og:url" content="{{ app.request.uri }}" />
33 {% if entry.previewPicture is not null %}
34 <meta property="og:image" content="{{ entry.previewPicture }}" />
35 {% endif %}
30 </head> 36 </head>
31 <body> 37 <body>
32 <header> 38 <header>
33 <h1>{{ entry.title | raw }}</h1> 39 <h1>{{ entry.title | raw }}</h1>
34 <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span> 40 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
41 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div>
35 </header> 42 </header>
36 <article> 43 <article>
37 {{ entry.content | raw }} 44 {{ entry.content | raw }}
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index c40e10a5..03267e76 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -753,7 +753,7 @@ class EntryControllerTest extends WallabagCoreTestCase
753 $this->assertCount(2, $crawler->filter('div[class=entry]')); 753 $this->assertCount(2, $crawler->filter('div[class=entry]'));
754 } 754 }
755 755
756 public function testCache() 756 public function testShareEntryPublicly()
757 { 757 {
758 $this->logInAs('admin'); 758 $this->logInAs('admin');
759 $client = $this->getClient(); 759 $client = $this->getClient();
@@ -778,6 +778,9 @@ class EntryControllerTest extends WallabagCoreTestCase
778 $this->assertContains('public', $client->getResponse()->headers->get('cache-control')); 778 $this->assertContains('public', $client->getResponse()->headers->get('cache-control'));
779 $this->assertContains('s-maxage=25200', $client->getResponse()->headers->get('cache-control')); 779 $this->assertContains('s-maxage=25200', $client->getResponse()->headers->get('cache-control'));
780 $this->assertNotContains('no-cache', $client->getResponse()->headers->get('cache-control')); 780 $this->assertNotContains('no-cache', $client->getResponse()->headers->get('cache-control'));
781 $this->assertContains('og:title', $client->getResponse()->getContent());
782 $this->assertContains('og:type', $client->getResponse()->getContent());
783 $this->assertContains('og:url', $client->getResponse()->getContent());
781 784
782 // sharing is now disabled 785 // sharing is now disabled
783 $client->getContainer()->get('craue_config')->set('share_public', 0); 786 $client->getContainer()->get('craue_config')->set('share_public', 0);