diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-10-11 14:12:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-11 14:12:49 +0200 |
commit | f44a927530476eaf903525481e5e8114c3b017b8 (patch) | |
tree | f0a84fcda966c3fdc75a0a441a41b7b74e11dde4 /src | |
parent | d8dc7372ab3d8ac4c5d5546e5c5e00bf4bf2d862 (diff) | |
parent | 9dd67fa3420c6cfaf7bdae182ca3433c7f636187 (diff) | |
download | wallabag-f44a927530476eaf903525481e5e8114c3b017b8.tar.gz wallabag-f44a927530476eaf903525481e5e8114c3b017b8.tar.zst wallabag-f44a927530476eaf903525481e5e8114c3b017b8.zip |
Merge pull request #3372 from wallabag/translate-export-page
Translated first page of exported article
Diffstat (limited to 'src')
14 files changed, 47 insertions, 8 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 838b9734..830798b8 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php | |||
@@ -8,6 +8,7 @@ use JMS\Serializer\SerializerBuilder; | |||
8 | use PHPePub\Core\EPub; | 8 | use PHPePub\Core\EPub; |
9 | use PHPePub\Core\Structure\OPF\DublinCore; | 9 | use PHPePub\Core\Structure\OPF\DublinCore; |
10 | use Symfony\Component\HttpFoundation\Response; | 10 | use Symfony\Component\HttpFoundation\Response; |
11 | use Symfony\Component\Translation\TranslatorInterface; | ||
11 | use Wallabag\CoreBundle\Entity\Entry; | 12 | use Wallabag\CoreBundle\Entity\Entry; |
12 | 13 | ||
13 | /** | 14 | /** |
@@ -17,21 +18,20 @@ class EntriesExport | |||
17 | { | 18 | { |
18 | private $wallabagUrl; | 19 | private $wallabagUrl; |
19 | private $logoPath; | 20 | private $logoPath; |
21 | private $translator; | ||
20 | private $title = ''; | 22 | private $title = ''; |
21 | private $entries = []; | 23 | private $entries = []; |
22 | private $author = 'wallabag'; | 24 | private $author = 'wallabag'; |
23 | private $language = ''; | 25 | private $language = ''; |
24 | private $footerTemplate = '<div style="text-align:center;"> | ||
25 | <p>Produced by wallabag with %EXPORT_METHOD%</p> | ||
26 | <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p> | ||
27 | </div>'; | ||
28 | 26 | ||
29 | /** | 27 | /** |
30 | * @param string $wallabagUrl Wallabag instance url | 28 | * @param TranslatorInterface $translator Translator service |
31 | * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE | 29 | * @param string $wallabagUrl Wallabag instance url |
30 | * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE | ||
32 | */ | 31 | */ |
33 | public function __construct($wallabagUrl, $logoPath) | 32 | public function __construct(TranslatorInterface $translator, $wallabagUrl, $logoPath) |
34 | { | 33 | { |
34 | $this->translator = $translator; | ||
35 | $this->wallabagUrl = $wallabagUrl; | 35 | $this->wallabagUrl = $wallabagUrl; |
36 | $this->logoPath = $logoPath; | 36 | $this->logoPath = $logoPath; |
37 | } | 37 | } |
@@ -451,7 +451,9 @@ class EntriesExport | |||
451 | */ | 451 | */ |
452 | private function getExportInformation($type) | 452 | private function getExportInformation($type) |
453 | { | 453 | { |
454 | $info = str_replace('%EXPORT_METHOD%', $type, $this->footerTemplate); | 454 | $info = $this->translator->trans('export.footer_template', [ |
455 | '%method%' => $type, | ||
456 | ]); | ||
455 | 457 | ||
456 | if ('tcpdf' === $type) { | 458 | if ('tcpdf' === $type) { |
457 | return str_replace('%IMAGE%', '<img src="' . $this->logoPath . '" />', $info); | 459 | return str_replace('%IMAGE%', '<img src="' . $this->logoPath . '" />', $info); |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index e09b0f18..caef2c8d 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -132,6 +132,7 @@ services: | |||
132 | wallabag_core.helper.entries_export: | 132 | wallabag_core.helper.entries_export: |
133 | class: Wallabag\CoreBundle\Helper\EntriesExport | 133 | class: Wallabag\CoreBundle\Helper\EntriesExport |
134 | arguments: | 134 | arguments: |
135 | - "@translator" | ||
135 | - '%domain_name%' | 136 | - '%domain_name%' |
136 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png | 137 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png |
137 | 138 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5e5bbde2..d0a38f7e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | # add: 'Add' | 397 | # add: 'Add' |
398 | # placeholder: 'You can add several tags, separated by a comma.' | 398 | # placeholder: 'You can add several tags, separated by a comma.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | # page_title: 'Import' | 404 | # page_title: 'Import' |
402 | # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' | 405 | # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 360bf571..158762a9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Hinzufügen' | 397 | add: 'Hinzufügen' |
398 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' | 398 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' |
399 | 399 | ||
400 | export: | ||
401 | footer_template: '<div style="text-align:center;"><p>Generiert von wallabag mit Hilfe von %method%</p><p>Bitte öffne <a href="https://github.com/wallabag/wallabag/issues">ein Ticket</a> wenn du ein Problem mit der Darstellung von diesem E-Book auf deinem Gerät hast.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Importieren' | 404 | page_title: 'Importieren' |
402 | page_description: 'Willkommen beim wallabag-Importer. Wähle deinen vorherigen Service aus, von dem du die Daten migrieren willst.' | 405 | page_description: 'Willkommen beim wallabag-Importer. Wähle deinen vorherigen Service aus, von dem du die Daten migrieren willst.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index f41a7c85..de3e11fe 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Add' | 397 | add: 'Add' |
398 | placeholder: 'You can add several tags, separated by a comma.' | 398 | placeholder: 'You can add several tags, separated by a comma.' |
399 | 399 | ||
400 | export: | ||
401 | footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Import' | 404 | page_title: 'Import' |
402 | page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.' | 405 | page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index ea4d84ba..6dfc1525 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Añadir' | 397 | add: 'Añadir' |
398 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' | 398 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Importar' | 404 | page_title: 'Importar' |
402 | page_description: 'Bienvenido a la herramienta de importación de wallabag. Seleccione el servicio desde el que desea migrar.' | 405 | page_description: 'Bienvenido a la herramienta de importación de wallabag. Seleccione el servicio desde el que desea migrar.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 11047e83..ffc48933 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | # add: 'Add' | 397 | # add: 'Add' |
398 | # placeholder: 'You can add several tags, separated by a comma.' | 398 | # placeholder: 'You can add several tags, separated by a comma.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'درونریزی' | 404 | page_title: 'درونریزی' |
402 | page_description: 'به درونریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که میخواهید از آن مهاجرت کنید انتخاب کنید.' | 405 | page_description: 'به درونریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که میخواهید از آن مهاجرت کنید انتخاب کنید.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 246add86..c9d95e2b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: "Ajouter" | 397 | add: "Ajouter" |
398 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." | 398 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." |
399 | 399 | ||
400 | export: | ||
401 | footer_template: '<div style="text-align:center;"><p>Généré par wallabag with %method%</p><p>Merci d''ouvrir <a href="https://github.com/wallabag/wallabag/issues">un ticket</a> si vous rencontrez des soucis d''affichage avec ce document sur votre support.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: "Importer" | 404 | page_title: "Importer" |
402 | page_description: "Bienvenue dans l’outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." | 405 | page_description: "Bienvenue dans l’outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 0de8bed7..c53266ca 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Aggiungi' | 397 | add: 'Aggiungi' |
398 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' | 398 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Importa' | 404 | page_title: 'Importa' |
402 | page_description: "Benvenuto nell'importatore di wallabag. Seleziona il servizio da cui vuoi trasferire i contenuti." | 405 | page_description: "Benvenuto nell'importatore di wallabag. Seleziona il servizio da cui vuoi trasferire i contenuti." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 455d47d1..3ae64c49 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Ajustar' | 397 | add: 'Ajustar' |
398 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." | 398 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Importar' | 404 | page_title: 'Importar' |
402 | page_description: "Benvenguda sus l'aisina de migracion de wallabag. Causissètz çai-jos lo servici dempuèi lo qual volètz migrar." | 405 | page_description: "Benvenguda sus l'aisina de migracion de wallabag. Causissètz çai-jos lo servici dempuèi lo qual volètz migrar." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index c8e6cf6c..70e15c70 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | add: 'Dodaj' | 397 | add: 'Dodaj' |
398 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' | 398 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Import' | 404 | page_title: 'Import' |
402 | page_description: 'Witaj w importerze Wallabag. Wybierz swoją poprzednią usługę, z której chcesz migrować.' | 405 | page_description: 'Witaj w importerze Wallabag. Wybierz swoją poprzednią usługę, z której chcesz migrować.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 5c1ae058..9b3fea6b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | # add: 'Add' | 397 | # add: 'Add' |
398 | # placeholder: 'You can add several tags, separated by a comma.' | 398 | # placeholder: 'You can add several tags, separated by a comma.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | page_title: 'Importar' | 404 | page_title: 'Importar' |
402 | page_description: 'Bem-vindo ao importador do wallabag. Por favo selecione o serviço do qual deseja migrar.' | 405 | page_description: 'Bem-vindo ao importador do wallabag. Por favo selecione o serviço do qual deseja migrar.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 0d6f5f8e..673ca183 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -397,6 +397,9 @@ tag: | |||
397 | # add: 'Add' | 397 | # add: 'Add' |
398 | # placeholder: 'You can add several tags, separated by a comma.' | 398 | # placeholder: 'You can add several tags, separated by a comma.' |
399 | 399 | ||
400 | # export: | ||
401 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
402 | |||
400 | import: | 403 | import: |
401 | # page_title: 'Import' | 404 | # page_title: 'Import' |
402 | # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' | 405 | # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 87b5e200..563bc50b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -395,6 +395,9 @@ tag: | |||
395 | # add: 'Add' | 395 | # add: 'Add' |
396 | # placeholder: 'You can add several tags, separated by a comma.' | 396 | # placeholder: 'You can add several tags, separated by a comma.' |
397 | 397 | ||
398 | # export: | ||
399 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | ||
400 | |||
398 | import: | 401 | import: |
399 | page_title: 'İçe Aktar' | 402 | page_title: 'İçe Aktar' |
400 | page_description: 'wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin.' | 403 | page_description: 'wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin.' |