diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
17 files changed, 99 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 85306276..a27dd210 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -181,6 +181,7 @@ services: | |||
181 | 181 | ||
182 | wallabag_core.exception_controller: | 182 | wallabag_core.exception_controller: |
183 | class: Wallabag\CoreBundle\Controller\ExceptionController | 183 | class: Wallabag\CoreBundle\Controller\ExceptionController |
184 | public: true | ||
184 | arguments: | 185 | arguments: |
185 | - '@twig' | 186 | - '@twig' |
186 | - '%kernel.debug%' | 187 | - '%kernel.debug%' |
@@ -218,3 +219,31 @@ services: | |||
218 | arguments: | 219 | arguments: |
219 | - "%wallabag_core.site_credentials.encryption_key_path%" | 220 | - "%wallabag_core.site_credentials.encryption_key_path%" |
220 | - "@logger" | 221 | - "@logger" |
222 | |||
223 | wallabag_core.command.clean_duplicates: | ||
224 | class: Wallabag\CoreBundle\Command\CleanDuplicatesCommand | ||
225 | tags: ['console.command'] | ||
226 | |||
227 | wallabag_core.command.export: | ||
228 | class: Wallabag\CoreBundle\Command\ExportCommand | ||
229 | tags: ['console.command'] | ||
230 | |||
231 | wallabag_core.command.install: | ||
232 | class: Wallabag\CoreBundle\Command\InstallCommand | ||
233 | tags: ['console.command'] | ||
234 | |||
235 | wallabag_core.command.list_user: | ||
236 | class: Wallabag\CoreBundle\Command\ListUserCommand | ||
237 | tags: ['console.command'] | ||
238 | |||
239 | wallabag_core.command.reload_entry: | ||
240 | class: Wallabag\CoreBundle\Command\ReloadEntryCommand | ||
241 | tags: ['console.command'] | ||
242 | |||
243 | wallabag_core.command.show_user: | ||
244 | class: Wallabag\CoreBundle\Command\ShowUserCommand | ||
245 | tags: ['console.command'] | ||
246 | |||
247 | wallabag_core.command.tag_all: | ||
248 | class: Wallabag\CoreBundle\Command\TagAllCommand | ||
249 | tags: ['console.command'] | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 97eb874d..4cf69916 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | # add: 'Add' | 405 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 406 | # placeholder: 'You can add several tags, separated by a comma.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | # tag_added: 'Tag added' | 595 | # tag_added: 'Tag added' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | # failed: 'Import failed, please try again.' | 599 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 0cf3b138..10981788 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Hinzufügen' | 405 | add: 'Hinzufügen' |
406 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' | 406 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | export: | 410 | export: |
409 | 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>' | 411 | 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Tag hinzugefügt' | 595 | tag_added: 'Tag hinzugefügt' |
596 | #tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' | 599 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 6085be14..95e10faf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Add' | 405 | add: 'Add' |
406 | placeholder: 'You can add several tags, separated by a comma.' | 406 | placeholder: 'You can add several tags, separated by a comma.' |
407 | rename: | ||
408 | placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | export: | 410 | export: |
409 | 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>' | 411 | 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Tag added' | 595 | tag_added: 'Tag added' |
596 | tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Import failed, please try again.' | 599 | failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index f2a8fb89..c95bee5b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Añadir' | 405 | add: 'Añadir' |
406 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' | 406 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Etiqueta añadida' | 595 | tag_added: 'Etiqueta añadida' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Importación fallida, por favor, inténtelo de nuevo.' | 599 | failed: 'Importación fallida, por favor, inténtelo de nuevo.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index a5cbd7ec..4fde53dd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | # add: 'Add' | 405 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 406 | # placeholder: 'You can add several tags, separated by a comma.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'برچسب افزوده شد' | 595 | tag_added: 'برچسب افزوده شد' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' | 599 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index a36d84ae..edf3ac35 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: "Ajouter" | 405 | add: "Ajouter" |
406 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." | 406 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." |
407 | rename: | ||
408 | placeholder: 'Vous pouvez changer le nom de votre tag.' | ||
407 | 409 | ||
408 | export: | 410 | export: |
409 | 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>' | 411 | 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: "Tag ajouté" | 595 | tag_added: "Tag ajouté" |
596 | tag_renamed: "Tag renommé" | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: "L’import a échoué, veuillez ré-essayer" | 599 | failed: "L’import a échoué, veuillez ré-essayer" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 1649c0e4..f178ddbf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Aggiungi' | 405 | add: 'Aggiungi' |
406 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' | 406 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Etichetta aggiunta' | 595 | tag_added: 'Etichetta aggiunta' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Importazione fallita, riprova.' | 599 | failed: 'Importazione fallita, riprova.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index e2298f1f..a1220f52 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Ajustar' | 405 | add: 'Ajustar' |
406 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." | 406 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | export: | 410 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Produch per wallabag amb %method%</p><p>Mercés de dobrir <a href="https://github.com/wallabag/wallabag/issues">una sollicitacion</a> s’avètz de problèmas amb l’afichatge d’aqueste E-Book sus vòstre periferic.</p></div>' | 411 | footer_template: '<div style="text-align:center;"><p>Produch per wallabag amb %method%</p><p>Mercés de dobrir <a href="https://github.com/wallabag/wallabag/issues">una sollicitacion</a> s’avètz de problèmas amb l’afichatge d’aqueste E-Book sus vòstre periferic.</p></div>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Etiqueta ajustada' | 595 | tag_added: 'Etiqueta ajustada' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: "L'importacion a fracassat, mercés de tornar ensajar." | 599 | failed: "L'importacion a fracassat, mercés de tornar ensajar." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index a5712733..b6f7faf7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | add: 'Dodaj' | 405 | add: 'Dodaj' |
406 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' | 406 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' |
407 | rename: | ||
408 | placeholder: 'Możesz zaktualizować nazwę taga.' | ||
407 | 409 | ||
408 | export: | 410 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Stworzone przez wallabag z %method%</p><p>Proszę zgłoś <a href="https://github.com/wallabag/wallabag/issues">sprawę</a>, jeżeli masz problem z wyświetleniem tego e-booka na swoim urządzeniu.</p></div>' | 411 | footer_template: '<div style="text-align:center;"><p>Stworzone przez wallabag z %method%</p><p>Proszę zgłoś <a href="https://github.com/wallabag/wallabag/issues">sprawę</a>, jeżeli masz problem z wyświetleniem tego e-booka na swoim urządzeniu.</p></div>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Tag dodany' | 595 | tag_added: 'Tag dodany' |
596 | tag_renamed: 'Nazwa taga zmieniona' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Nieudany import, prosimy spróbować ponownie.' | 599 | failed: 'Nieudany import, prosimy spróbować ponownie.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 1ccf49e1..78df254f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | # add: 'Add' | 405 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 406 | # placeholder: 'You can add several tags, separated by a comma.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'Tag adicionada' | 595 | tag_added: 'Tag adicionada' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | failed: 'Importação falhou, por favor tente novamente.' | 599 | failed: 'Importação falhou, por favor tente novamente.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 6c0e18e1..8312ca15 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -404,6 +404,8 @@ tag: | |||
404 | new: | 404 | new: |
405 | # add: 'Add' | 405 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 406 | # placeholder: 'You can add several tags, separated by a comma.' |
407 | rename: | ||
408 | # placeholder: 'You can update tag name.' | ||
407 | 409 | ||
408 | # export: | 410 | # export: |
409 | # 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>' | 411 | # 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>' |
@@ -591,6 +593,7 @@ flashes: | |||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | # tag_added: 'Tag added' | 595 | # tag_added: 'Tag added' |
596 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 597 | import: |
595 | notice: | 598 | notice: |
596 | # failed: 'Import failed, please try again.' | 599 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 48753b55..f14aad12 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -392,6 +392,8 @@ tag: | |||
392 | new: | 392 | new: |
393 | add: 'Добавить' | 393 | add: 'Добавить' |
394 | placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.' | 394 | placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.' |
395 | rename: | ||
396 | # placeholder: 'You can update tag name.' | ||
395 | 397 | ||
396 | # export: | 398 | # export: |
397 | # 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>' | 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>' |
@@ -556,6 +558,7 @@ flashes: | |||
556 | tag: | 558 | tag: |
557 | notice: | 559 | notice: |
558 | tag_added: 'Тег добавлен' | 560 | tag_added: 'Тег добавлен' |
561 | # tag_renamed: 'Tag renamed' | ||
559 | import: | 562 | import: |
560 | notice: | 563 | notice: |
561 | failed: 'Во время импорта произошла ошибка, повторите попытку.' | 564 | failed: 'Во время импорта произошла ошибка, повторите попытку.' |
@@ -573,4 +576,4 @@ flashes: | |||
573 | notice: | 576 | notice: |
574 | added: 'Пользователь "%username%" добавлен' | 577 | added: 'Пользователь "%username%" добавлен' |
575 | updated: 'Пользователь "%username%" обновлен' | 578 | updated: 'Пользователь "%username%" обновлен' |
576 | deleted: 'Пользователь "%username%" удален' \ No newline at end of file | 579 | deleted: 'Пользователь "%username%" удален' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 5524b1f1..7dbb1399 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -402,6 +402,8 @@ tag: | |||
402 | new: | 402 | new: |
403 | add: 'เพิ่ม' | 403 | add: 'เพิ่ม' |
404 | placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma' | 404 | placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma' |
405 | rename: | ||
406 | # placeholder: 'You can update tag name.' | ||
405 | 407 | ||
406 | export: | 408 | export: |
407 | footer_template: '<div style="text-align:center;"><p>ผลิตโดย wallabag กับ %method%</p><p>ให้ทำการเปิด <a href="https://github.com/wallabag/wallabag/issues">ฉบับนี้</a> ถ้าคุณมีข้อบกพร่องif you have trouble with the display of this E-Book on your device.</p></div>' | 409 | footer_template: '<div style="text-align:center;"><p>ผลิตโดย wallabag กับ %method%</p><p>ให้ทำการเปิด <a href="https://github.com/wallabag/wallabag/issues">ฉบับนี้</a> ถ้าคุณมีข้อบกพร่องif you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -589,6 +591,7 @@ flashes: | |||
589 | tag: | 591 | tag: |
590 | notice: | 592 | notice: |
591 | tag_added: 'แท็กที่เพิ่ม' | 593 | tag_added: 'แท็กที่เพิ่ม' |
594 | # tag_renamed: 'Tag renamed' | ||
592 | import: | 595 | import: |
593 | notice: | 596 | notice: |
594 | failed: 'นำข้อมูลเข้าล้มเหลว, ลองใหม่อีกครั้ง' | 597 | failed: 'นำข้อมูลเข้าล้มเหลว, ลองใหม่อีกครั้ง' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index e2156d47..b4bc04d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -402,6 +402,8 @@ tag: | |||
402 | new: | 402 | new: |
403 | # add: 'Add' | 403 | # add: 'Add' |
404 | # placeholder: 'You can add several tags, separated by a comma.' | 404 | # placeholder: 'You can add several tags, separated by a comma.' |
405 | rename: | ||
406 | # placeholder: 'You can update tag name.' | ||
405 | 407 | ||
406 | # export: | 408 | # export: |
407 | # 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>' | 409 | # 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>' |
@@ -569,6 +571,7 @@ flashes: | |||
569 | tag: | 571 | tag: |
570 | notice: | 572 | notice: |
571 | tag_added: 'Etiket eklendi' | 573 | tag_added: 'Etiket eklendi' |
574 | # tag_renamed: 'Tag renamed' | ||
572 | import: | 575 | import: |
573 | notice: | 576 | notice: |
574 | # failed: 'Import failed, please try again.' | 577 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 070d5629..35351ab1 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig | |||
@@ -10,10 +10,22 @@ | |||
10 | <ul> | 10 | <ul> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}"> | 12 | <li id="tag-{{ tag.id|e }}"> |
13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | 13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" data-handle="tag-link">{{ tag.label }} ({{ tag.nbEntries }})</a> |
14 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"> | 14 | |
15 | <i class="material-icons md-24">rss_feed</i> | 15 | {% if renameForms is defined and renameForms[tag.id] is defined %} |
16 | <form class="card-tag-form hidden" data-handle="tag-rename-form" action="{{ path('tag_rename', {'slug': tag.slug})}}" method="POST"> | ||
17 | {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }} | ||
18 | {{ form_rest(renameForms[tag.id]) }} | ||
19 | </form> | ||
20 | <a class="card-tag-rename" data-handler="tag-rename" href="javascript:void(0);"> | ||
21 | <i class="material-icons">mode_edit</i> | ||
16 | </a> | 22 | </a> |
23 | {% endif %} | ||
24 | {% if app.user.config.rssToken %} | ||
25 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"> | ||
26 | <i class="material-icons md-24">rss_feed</i> | ||
27 | </a> | ||
28 | {% endif %} | ||
17 | </li> | 29 | </li> |
18 | {% endfor %} | 30 | {% endfor %} |
19 | </ul> | 31 | </ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig index c15b5146..21e88a9a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig | |||
@@ -13,7 +13,18 @@ | |||
13 | <ul class="card-tag-labels"> | 13 | <ul class="card-tag-labels"> |
14 | {% for tag in tags %} | 14 | {% for tag in tags %} |
15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}"> | 15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link">{{tag.label}} ({{ tag.nbEntries }})</a> | 16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link" data-handle="tag-link"> |
17 | {{ tag.label }} ({{ tag.nbEntries }}) | ||
18 | </a> | ||
19 | {% if renameForms is defined and renameForms[tag.id] is defined %} | ||
20 | <form class="card-tag-form hidden" data-handle="tag-rename-form" action="{{ path('tag_rename', {'slug': tag.slug})}}" method="POST"> | ||
21 | {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }} | ||
22 | {{ form_rest(renameForms[tag.id]) }} | ||
23 | </form> | ||
24 | <a class="card-tag-rename" data-handler="tag-rename" href="javascript:void(0);"> | ||
25 | <i class="material-icons">mode_edit</i> | ||
26 | </a> | ||
27 | {% endif %} | ||
17 | {% if app.user.config.rssToken %} | 28 | {% if app.user.config.rssToken %} |
18 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="card-tag-rss"><i class="material-icons">rss_feed</i></a> | 29 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="card-tag-rss"><i class="material-icons">rss_feed</i></a> |
19 | {% endif %} | 30 | {% endif %} |