diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
13 files changed, 36 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index a4b727f4..614488a6 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -40,7 +40,7 @@ services: | |||
40 | class: Graby\Graby | 40 | class: Graby\Graby |
41 | arguments: | 41 | arguments: |
42 | - | 42 | - |
43 | error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." | 43 | error_message: '%wallabag_core.fetching_error_message%' |
44 | http_client: | 44 | http_client: |
45 | user_agents: | 45 | user_agents: |
46 | 'lifehacker.com': 'PHP/5.2' | 46 | 'lifehacker.com': 'PHP/5.2' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index bb23b5fe..714ced14 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | # delete_confirm: Are you sure? | 445 | # delete_confirm: Are you sure? |
446 | # back_to_list: Back to list | 446 | # back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index d1df8669..57e49f84 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | delete_confirm: Bist du sicher? | 445 | delete_confirm: Bist du sicher? |
446 | back_to_list: Zurück zur Liste | 446 | back_to_list: Zurück zur Liste |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 4a8934b8..4a59c75e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | delete_confirm: Are you sure? | 445 | delete_confirm: Are you sure? |
446 | back_to_list: Back to list | 446 | back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 29f0676e..1b1e0cb1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | # delete_confirm: Are you sure? | 445 | # delete_confirm: Are you sure? |
446 | # back_to_list: Back to list | 446 | # back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 074ab7a8..41dc8acf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -444,6 +444,9 @@ user: | |||
444 | # delete_confirm: Are you sure? | 444 | # delete_confirm: Are you sure? |
445 | # back_to_list: Back to list | 445 | # back_to_list: Back to list |
446 | 446 | ||
447 | error: | ||
448 | # page_title: An error occurred | ||
449 | |||
447 | flashes: | 450 | flashes: |
448 | config: | 451 | config: |
449 | notice: | 452 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 55453b6c..7fb9681d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -365,7 +365,7 @@ import: | |||
365 | how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne." | 365 | how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne." |
366 | instapaper: | 366 | instapaper: |
367 | page_title: 'Import > Instapaper' | 367 | page_title: 'Import > Instapaper' |
368 | description: 'Sur la page des paramètres (`https://www.instapaper.com/user<https://www.instapaper.com/user>`_), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").' | 368 | description: 'Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").' |
369 | how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l'importer." | 369 | how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l'importer." |
370 | 370 | ||
371 | developer: | 371 | developer: |
@@ -445,6 +445,9 @@ user: | |||
445 | delete_confirm: Êtes-vous sûr? | 445 | delete_confirm: Êtes-vous sûr? |
446 | back_to_list: Revenir à la liste | 446 | back_to_list: Revenir à la liste |
447 | 447 | ||
448 | error: | ||
449 | page_title: Une erreur est survenue | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 67205c6d..b279ae40 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | # delete_confirm: Are you sure? | 445 | # delete_confirm: Are you sure? |
446 | # back_to_list: Back to list | 446 | # back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 25e5f05a..a4659620 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | # delete_confirm: Are you sure? | 445 | # delete_confirm: Are you sure? |
446 | # back_to_list: Back to list | 446 | # back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 392f9c19..798b39c2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | delete_confirm: Jesteś pewien? | 445 | delete_confirm: Jesteś pewien? |
446 | back_to_list: Powrót do listy | 446 | back_to_list: Powrót do listy |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 152d5020..21f27e08 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -445,6 +445,9 @@ user: | |||
445 | # delete_confirm: Are you sure? | 445 | # delete_confirm: Are you sure? |
446 | # back_to_list: Back to list | 446 | # back_to_list: Back to list |
447 | 447 | ||
448 | error: | ||
449 | # page_title: An error occurred | ||
450 | |||
448 | flashes: | 451 | flashes: |
449 | config: | 452 | config: |
450 | notice: | 453 | notice: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index a2eca59b..f137ec99 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -444,6 +444,9 @@ user: | |||
444 | # delete_confirm: Are you sure? | 444 | # delete_confirm: Are you sure? |
445 | # back_to_list: Back to list | 445 | # back_to_list: Back to list |
446 | 446 | ||
447 | error: | ||
448 | # page_title: An error occurred | ||
449 | |||
447 | flashes: | 450 | flashes: |
448 | config: | 451 | config: |
449 | notice: | 452 | notice: |
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 804adb36..f77264c6 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 | |||
@@ -39,7 +39,7 @@ | |||
39 | <meta name="twitter:image" content="{{ picturePath }}" /> | 39 | <meta name="twitter:image" content="{{ picturePath }}" /> |
40 | <meta name="twitter:site" content="@wallabagapp" /> | 40 | <meta name="twitter:site" content="@wallabagapp" /> |
41 | <meta name="twitter:title" content="{{ entry.title | raw }}" /> | 41 | <meta name="twitter:title" content="{{ entry.title | raw }}" /> |
42 | <meta name="twitter:description" content="{{ entry.title | raw }}" /> | 42 | <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" /> |
43 | </head> | 43 | </head> |
44 | <body> | 44 | <body> |
45 | <header> | 45 | <header> |