diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
17 files changed, 95 insertions, 19 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5d9e85e4..72493fe3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 225 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Oprettelsesdato' | 226 | created_at: 'Oprettelsesdato' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Gem ny artikel' | 230 | page_title: 'Gem ny artikel' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | # page_title: 'Edit an entry' | 237 | # page_title: 'Edit an entry' |
235 | # title_label: 'Title' | 238 | # title_label: 'Title' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | # is_public_label: 'Public' | ||
238 | save_label: 'Gem' | 240 | save_label: 'Gem' |
239 | public: | 241 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | # entry_already_saved: 'Entry already saved on %date%' | 536 | # entry_already_saved: 'Entry already saved on %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index f1952a3e..dbad8b16 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Entferne ALLE Annotationen | 110 | annotations: Entferne ALLE Annotationen |
111 | tags: Entferne ALLE Tags | 111 | tags: Entferne ALLE Tags |
112 | entries: Entferne ALLE Einträge | 112 | entries: Entferne ALLE Einträge |
113 | # archived: Remove ALL archived entries | ||
113 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) | 114 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) |
114 | form_password: | 115 | form_password: |
115 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." | 116 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' | 225 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' |
225 | created_at: 'Erstellungsdatum' | 226 | created_at: 'Erstellungsdatum' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Neuen Artikel speichern' | 230 | page_title: 'Neuen Artikel speichern' |
228 | placeholder: 'https://website.de' | 231 | placeholder: 'https://website.de' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Eintrag bearbeiten' | 237 | page_title: 'Eintrag bearbeiten' |
235 | title_label: 'Titel' | 238 | title_label: 'Titel' |
236 | url_label: 'URL' | 239 | url_label: 'URL' |
237 | is_public_label: 'Öffentlich' | ||
238 | save_label: 'Speichern' | 240 | save_label: 'Speichern' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" | 242 | shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Anmerkungen zurücksetzen | 530 | annotations_reset: Anmerkungen zurücksetzen |
529 | tags_reset: Tags zurücksetzen | 531 | tags_reset: Tags zurücksetzen |
530 | entries_reset: Einträge zurücksetzen | 532 | entries_reset: Einträge zurücksetzen |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 536 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index df782b01..42a12b2a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Remove ALL annotations | 110 | annotations: Remove ALL annotations |
111 | tags: Remove ALL tags | 111 | tags: Remove ALL tags |
112 | entries: Remove ALL entries | 112 | entries: Remove ALL entries |
113 | archived: Remove ALL archived entries | ||
113 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 114 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 225 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Creation date' | 226 | created_at: 'Creation date' |
227 | published_at: 'Publication date' | ||
228 | published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Save new entry' | 230 | page_title: 'Save new entry' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Edit an entry' | 237 | page_title: 'Edit an entry' |
235 | title_label: 'Title' | 238 | title_label: 'Title' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | is_public_label: 'Public' | ||
238 | save_label: 'Save' | 240 | save_label: 'Save' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 242 | shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Annotations reset | 530 | annotations_reset: Annotations reset |
529 | tags_reset: Tags reset | 531 | tags_reset: Tags reset |
530 | entries_reset: Entries reset | 532 | entries_reset: Entries reset |
533 | archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Entry already saved on %date%' | 536 | entry_already_saved: 'Entry already saved on %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 3d65c311..6e21614e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Eliminar TODAS las anotaciones | 110 | annotations: Eliminar TODAS las anotaciones |
111 | tags: Eliminar TODAS las etiquetas | 111 | tags: Eliminar TODAS las etiquetas |
112 | entries: Eliminar TODOS los artículos | 112 | entries: Eliminar TODOS los artículos |
113 | # archived: Remove ALL archived entries | ||
113 | confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) | 114 | confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) |
114 | form_password: | 115 | form_password: |
115 | description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres." | 116 | description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones' | 225 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones' |
225 | created_at: 'Fecha de creación' | 226 | created_at: 'Fecha de creación' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Guardar un nuevo artículo' | 230 | page_title: 'Guardar un nuevo artículo' |
228 | placeholder: 'http://sitioweb.com' | 231 | placeholder: 'http://sitioweb.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Editar un artículo' | 237 | page_title: 'Editar un artículo' |
235 | title_label: 'Título' | 238 | title_label: 'Título' |
236 | url_label: 'URL' | 239 | url_label: 'URL' |
237 | is_public_label: 'Es público' | ||
238 | save_label: 'Guardar' | 240 | save_label: 'Guardar' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" | 242 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Anotaciones reiniciadas | 530 | annotations_reset: Anotaciones reiniciadas |
529 | tags_reset: Etiquetas reiniciadas | 531 | tags_reset: Etiquetas reiniciadas |
530 | entries_reset: Artículos reiniciados | 532 | entries_reset: Artículos reiniciados |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Artículo ya guardado el %fecha%' | 536 | entry_already_saved: 'Artículo ya guardado el %fecha%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 80500d19..b938c80a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'اصلی' | 224 | original_article: 'اصلی' |
224 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' | 225 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' |
225 | created_at: 'زمان ساخت' | 226 | created_at: 'زمان ساخت' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'ذخیرهٔ مقالهٔ تازه' | 230 | page_title: 'ذخیرهٔ مقالهٔ تازه' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'ویرایش مقاله' | 237 | page_title: 'ویرایش مقاله' |
235 | title_label: 'عنوان' | 238 | title_label: 'عنوان' |
236 | url_label: 'نشانی' | 239 | url_label: 'نشانی' |
237 | is_public_label: 'عمومی' | ||
238 | save_label: 'ذخیره' | 240 | save_label: 'ذخیره' |
239 | public: | 241 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 536 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 4f49f777..9abcda45 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Supprimer TOUTES les annotations | 110 | annotations: Supprimer TOUTES les annotations |
111 | tags: Supprimer TOUS les tags | 111 | tags: Supprimer TOUS les tags |
112 | entries: Supprimer TOUS les articles | 112 | entries: Supprimer TOUS les articles |
113 | archived: Supprimer TOUS les articles archivés | ||
113 | confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) | 114 | confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) |
114 | form_password: | 115 | form_password: |
115 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." | 116 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: "original" | 224 | original_article: "original" |
224 | annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations" | 225 | annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations" |
225 | created_at: "Date de création" | 226 | created_at: "Date de création" |
227 | published_at: "Date de publication" | ||
228 | published_by: "Publié par" | ||
226 | new: | 229 | new: |
227 | page_title: "Sauvegarder un nouvel article" | 230 | page_title: "Sauvegarder un nouvel article" |
228 | placeholder: "http://website.com" | 231 | placeholder: "http://website.com" |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: "Éditer un article" | 237 | page_title: "Éditer un article" |
235 | title_label: "Titre" | 238 | title_label: "Titre" |
236 | url_label: "Adresse" | 239 | url_label: "Adresse" |
237 | is_public_label: "Public" | ||
238 | save_label: "Enregistrer" | 240 | save_label: "Enregistrer" |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" | 242 | shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Annotations supprimées | 530 | annotations_reset: Annotations supprimées |
529 | tags_reset: Tags supprimés | 531 | tags_reset: Tags supprimés |
530 | entries_reset: Articles supprimés | 532 | entries_reset: Articles supprimés |
533 | archived_reset: Articles archivés supprimés | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: "Article déjà sauvegardé le %date%" | 536 | entry_already_saved: "Article déjà sauvegardé le %date%" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 992ff71c..58d0962a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'originale' | 224 | original_article: 'originale' |
224 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni' | 225 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni' |
225 | created_at: 'Data di creazione' | 226 | created_at: 'Data di creazione' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Salva un nuovo contenuto' | 230 | page_title: 'Salva un nuovo contenuto' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Modifica voce' | 237 | page_title: 'Modifica voce' |
235 | title_label: 'Titolo' | 238 | title_label: 'Titolo' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | is_public_label: 'Pubblico' | ||
238 | save_label: 'Salva' | 240 | save_label: 'Salva' |
239 | public: | 241 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Contenuto già salvato in data %date%' | 536 | entry_already_saved: 'Contenuto già salvato in data %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index f6488565..825a0efd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Levar TOTAS las anotacions | 110 | annotations: Levar TOTAS las anotacions |
111 | tags: Levar TOTAS las etiquetas | 111 | tags: Levar TOTAS las etiquetas |
112 | entries: Levar TOTES los articles | 112 | entries: Levar TOTES los articles |
113 | # archived: Remove ALL archived entries | ||
113 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) | 114 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) |
114 | form_password: | 115 | form_password: |
115 | description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs." | 116 | description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions" | 225 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions" |
225 | created_at: 'Data de creacion' | 226 | created_at: 'Data de creacion' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Enregistrar un novèl article' | 230 | page_title: 'Enregistrar un novèl article' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Modificar un article' | 237 | page_title: 'Modificar un article' |
235 | title_label: 'Títol' | 238 | title_label: 'Títol' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | is_public_label: 'Public' | ||
238 | save_label: 'Enregistrar' | 240 | save_label: 'Enregistrar' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" | 242 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Anotacions levadas | 530 | annotations_reset: Anotacions levadas |
529 | tags_reset: Etiquetas levadas | 531 | tags_reset: Etiquetas levadas |
530 | entries_reset: Articles levats | 532 | entries_reset: Articles levats |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Article ja salvargardat lo %date%' | 536 | entry_already_saved: 'Article ja salvargardat lo %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index eda9bbbf..b02aa4ec 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | annotations: Usuń WSZYSTKIE adnotacje | 110 | annotations: Usuń WSZYSTKIE adnotacje |
111 | tags: Usuń WSZYSTKIE tagi | 111 | tags: Usuń WSZYSTKIE tagi |
112 | entries: usuń WSZYTSTKIE wpisy | 112 | entries: usuń WSZYTSTKIE wpisy |
113 | # archived: Remove ALL archived entries | ||
113 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) | 114 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) |
114 | form_password: | 115 | form_password: |
115 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." | 116 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'oryginalny' | 224 | original_article: 'oryginalny' |
224 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' | 225 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' |
225 | created_at: 'Czas stworzenia' | 226 | created_at: 'Czas stworzenia' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Zapisz nowy wpis' | 230 | page_title: 'Zapisz nowy wpis' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Edytuj wpis' | 237 | page_title: 'Edytuj wpis' |
235 | title_label: 'Tytuł' | 238 | title_label: 'Tytuł' |
236 | url_label: 'Adres URL' | 239 | url_label: 'Adres URL' |
237 | is_public_label: 'Publiczny' | ||
238 | save_label: 'Zapisz' | 240 | save_label: 'Zapisz' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" | 242 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | annotations_reset: Zresetuj adnotacje | 530 | annotations_reset: Zresetuj adnotacje |
529 | tags_reset: Zresetuj tagi | 531 | tags_reset: Zresetuj tagi |
530 | entries_reset: Zresetuj wpisy | 532 | entries_reset: Zresetuj wpisy |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Wpis już został dodany %date%' | 536 | entry_already_saved: 'Wpis już został dodany %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 8a7cc6f8..8aa7e5af 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações' | 225 | annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações' |
225 | created_at: 'Data de criação' | 226 | created_at: 'Data de criação' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Salvar nova entrada' | 230 | page_title: 'Salvar nova entrada' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Editar uma entrada' | 237 | page_title: 'Editar uma entrada' |
235 | title_label: 'Título' | 238 | title_label: 'Título' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | is_public_label: 'Público' | ||
238 | save_label: 'Salvar' | 240 | save_label: 'Salvar' |
239 | public: | 241 | public: |
240 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" | 242 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Entrada já foi salva em %date%' | 536 | entry_already_saved: 'Entrada já foi salva em %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 52b6414f..ce8d8d52 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'original' | 224 | original_article: 'original' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 225 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Data creării' | 226 | created_at: 'Data creării' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Salvează un nou articol' | 230 | page_title: 'Salvează un nou articol' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | # page_title: 'Edit an entry' | 237 | # page_title: 'Edit an entry' |
235 | # title_label: 'Title' | 238 | # title_label: 'Title' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | # is_public_label: 'Public' | ||
238 | save_label: 'Salvează' | 240 | save_label: 'Salvează' |
239 | public: | 241 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | # entry_already_saved: 'Entry already saved on %date%' | 536 | # entry_already_saved: 'Entry already saved on %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index bfb7e206..d8903608 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -110,6 +110,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 110 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 111 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 112 | # entries: Remove ALL entries |
113 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 114 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 115 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 116 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -223,6 +224,8 @@ entry: | |||
223 | original_article: 'orijinal' | 224 | original_article: 'orijinal' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 225 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Oluşturulma tarihi' | 226 | created_at: 'Oluşturulma tarihi' |
227 | # published_at: 'Publication date' | ||
228 | # published_by: 'Published by' | ||
226 | new: | 229 | new: |
227 | page_title: 'Yeni makaleyi kaydet' | 230 | page_title: 'Yeni makaleyi kaydet' |
228 | placeholder: 'http://website.com' | 231 | placeholder: 'http://website.com' |
@@ -234,7 +237,6 @@ entry: | |||
234 | page_title: 'Makaleyi düzenle' | 237 | page_title: 'Makaleyi düzenle' |
235 | title_label: 'Başlık' | 238 | title_label: 'Başlık' |
236 | url_label: 'Url' | 239 | url_label: 'Url' |
237 | is_public_label: 'Herkes tarafından erişime açık olsun mu?' | ||
238 | save_label: 'Kaydet' | 240 | save_label: 'Kaydet' |
239 | public: | 241 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
@@ -528,6 +530,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 530 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 531 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 532 | # entries_reset: Entries reset |
533 | # archived_reset: Archived entries deleted | ||
531 | entry: | 534 | entry: |
532 | notice: | 535 | notice: |
533 | entry_already_saved: 'Entry already saved on %date%' | 536 | entry_already_saved: 'Entry already saved on %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 3548f590..01f63a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -200,6 +200,11 @@ | |||
200 | </a> | 200 | </a> |
201 | </li> | 201 | </li> |
202 | <li> | 202 | <li> |
203 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
204 | {{ 'config.reset.archived'|trans }} | ||
205 | </a> | ||
206 | </li> | ||
207 | <li> | ||
203 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 208 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
204 | {{ 'config.reset.entries'|trans }} | 209 | {{ 'config.reset.entries'|trans }} |
205 | </a> | 210 | </a> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index a555691d..426ce91c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -30,6 +30,7 @@ | |||
30 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | 30 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} |
31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} | 31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} |
32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | 32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} |
33 | {% if craue_setting('share_scuttle') %}<li><a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--scuttle" title="scuttle"><span>scuttle</span></a></li>{% endif %} | ||
33 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | 34 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} |
34 | {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %} | 35 | {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %} |
35 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | 36 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} |
@@ -43,9 +44,23 @@ | |||
43 | 44 | ||
44 | <div id="article-informations"> | 45 | <div id="article-informations"> |
45 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> | 46 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> |
46 | {{ entry.createdAt|date('Y-m-d') }} | 47 | {{ entry.createdAt|date('Y-m-d H:i') }} |
47 | </i> | 48 | </i> |
48 | 49 | ||
50 | {% if entry.publishedAt is not null %} | ||
51 | <i class="tool icon icon-pencil2" title="{{ 'entry.view.published_at'|trans }}"> | ||
52 | {{ entry.publishedAt|date('Y-m-d H:i') }} | ||
53 | </i> | ||
54 | {% endif %} | ||
55 | |||
56 | {% if entry.publishedBy is not empty %} | ||
57 | <i class="tool icon icon-users" title="{{ 'entry.view.published_by'|trans }}"> | ||
58 | {% for author in entry.publishedBy %} | ||
59 | {{ author }}{% if not loop.last %}, {% endif %} | ||
60 | {% endfor %} | ||
61 | </i> | ||
62 | {% endif %} | ||
63 | |||
49 | <i class="tool icon icon-time"> | 64 | <i class="tool icon icon-time"> |
50 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 65 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
51 | {% if readingTime > 0 %} | 66 | {% if readingTime > 0 %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5d411fdd..708ff951 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -229,6 +229,9 @@ | |||
229 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 229 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
230 | {{ 'config.reset.tags'|trans }} | 230 | {{ 'config.reset.tags'|trans }} |
231 | </a> | 231 | </a> |
232 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
233 | {{ 'config.reset.archived'|trans }} | ||
234 | </a> | ||
232 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 235 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
233 | {{ 'config.reset.entries'|trans }} | 236 | {{ 'config.reset.entries'|trans }} |
234 | </a> | 237 | </a> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig index 1c5e2aab..b9537975 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig | |||
@@ -27,11 +27,6 @@ | |||
27 | {{ form_label(form.url) }} | 27 | {{ form_label(form.url) }} |
28 | {{ form_widget(form.url) }} | 28 | {{ form_widget(form.url) }} |
29 | </div> | 29 | </div> |
30 | |||
31 | <div class="input-field s12"> | ||
32 | {{ form_widget(form.is_public) }} | ||
33 | {{ form_label(form.is_public) }} | ||
34 | </div> | ||
35 | <br> | 30 | <br> |
36 | 31 | ||
37 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 32 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index c3508083..8be5fd0d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -131,6 +131,14 @@ | |||
131 | </a> | 131 | </a> |
132 | </li> | 132 | </li> |
133 | {% endif %} | 133 | {% endif %} |
134 | {% if craue_setting('share_scuttle') %} | ||
135 | <li> | ||
136 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank"> | ||
137 | <i class="tool icon-image icon-image--scuttle" title="scuttle"></i> | ||
138 | <span>scuttle</span> | ||
139 | </a> | ||
140 | </li> | ||
141 | {% endif %} | ||
134 | {% if craue_setting('share_diaspora') %} | 142 | {% if craue_setting('share_diaspora') %} |
135 | <li> | 143 | <li> |
136 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank"> | 144 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank"> |
@@ -218,8 +226,22 @@ | |||
218 | </li> | 226 | </li> |
219 | <li> | 227 | <li> |
220 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> | 228 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
221 | {{ entry.createdAt|date('Y-m-d') }} | 229 | {{ entry.createdAt|date('Y-m-d H:i') }} |
230 | </li> | ||
231 | {% if entry.publishedAt is not null %} | ||
232 | <li> | ||
233 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> | ||
234 | {{ entry.publishedAt|date('Y-m-d H:i') }} | ||
222 | </li> | 235 | </li> |
236 | {% endif %} | ||
237 | {% if entry.publishedBy is not empty %} | ||
238 | <li> | ||
239 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> | ||
240 | {% for author in entry.publishedBy %} | ||
241 | {{ author }}{% if not loop.last %}, {% endif %} | ||
242 | {% endfor %} | ||
243 | </li> | ||
244 | {% endif %} | ||
223 | <li> | 245 | <li> |
224 | <i class="material-icons link">link</i> | 246 | <i class="material-icons link">link</i> |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | 247 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> |