diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-07 09:05:18 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-07 09:05:18 +0200 |
commit | f0d52417fbcb3427065ec3b0b8cf33f12f368f8c (patch) | |
tree | f949652ecfda673a2bec416d3eec751815402bb8 /src | |
parent | 9d127b3b9365c73bc393bc303545f24c159cee31 (diff) | |
download | wallabag-f0d52417fbcb3427065ec3b0b8cf33f12f368f8c.tar.gz wallabag-f0d52417fbcb3427065ec3b0b8cf33f12f368f8c.tar.zst wallabag-f0d52417fbcb3427065ec3b0b8cf33f12f368f8c.zip |
Added OpenGraph support for public articles
Fix #2289
Diffstat (limited to 'src')
12 files changed, 31 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 40644ff5..15d0c025 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 130ab2cd..4db49b2f 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 91abe162..cf3aedae 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 25d2f3a2..0b8fe398 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 b02ffea0..fcdd29bb 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 598205b0..26f5a338 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 c58c929f..6cc98b90 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 8f06434d..4ef1be38 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 7f28e648..46cb1c12 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 4e0e454c..8b5179b0 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='https://www.wallabag.org'>wallabag</a>" | ||
211 | 213 | ||
212 | about: | 214 | about: |
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 02b3aae6..5e49c921 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='https://www.wallabag.org'>wallabag</a>" | ||
210 | 212 | ||
211 | about: | 213 | about: |
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..bf44ced7 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|raw }}</div> | ||
35 | </header> | 42 | </header> |
36 | <article> | 43 | <article> |
37 | {{ entry.content | raw }} | 44 | {{ entry.content | raw }} |