mirror of
https://github.com/wallabag/wallabag.git
synced 2024-06-26 09:00:48 +00:00
Merge pull request #3147 from wallabag/delete-confirm
Add some deletion confirmation to avoid mistake
This commit is contained in:
Jérémy Benoist
GitHub
commit
7a90ca6171
|
|
@ -240,6 +240,9 @@ entry:
|
|||
save_label: 'Gem'
|
||||
public:
|
||||
# shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'Om'
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ config:
|
|||
annotations: Entferne ALLE Annotationen
|
||||
tags: Entferne ALLE Tags
|
||||
entries: Entferne ALLE Einträge
|
||||
# archived: Remove ALL archived entries
|
||||
archived: Entferne ALLE archivierten Einträge
|
||||
confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
|
||||
form_password:
|
||||
description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten."
|
||||
|
|
@ -155,7 +155,7 @@ config:
|
|||
or: 'Eine Regel ODER die andere'
|
||||
and: 'Eine Regel UND eine andere'
|
||||
matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>'
|
||||
# notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
|
||||
notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>'
|
||||
|
||||
entry:
|
||||
page_titles:
|
||||
|
|
@ -225,8 +225,8 @@ entry:
|
|||
original_article: 'original'
|
||||
annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen'
|
||||
created_at: 'Erstellungsdatum'
|
||||
# published_at: 'Publication date'
|
||||
# published_by: 'Published by'
|
||||
published_at: 'Erscheinungsdatum'
|
||||
published_by: 'Veröffentlicht von'
|
||||
new:
|
||||
page_title: 'Neuen Artikel speichern'
|
||||
placeholder: 'https://website.de'
|
||||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Speichern'
|
||||
public:
|
||||
shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
|
||||
confirm:
|
||||
delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?"
|
||||
delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?"
|
||||
|
||||
about:
|
||||
page_title: 'Über'
|
||||
|
|
@ -514,7 +517,7 @@ user:
|
|||
delete_confirm: Bist du sicher?
|
||||
back_to_list: Zurück zur Liste
|
||||
search:
|
||||
# placeholder: Filter by username or email
|
||||
placeholder: Filtere nach Benutzer oder E-Mail-Adresse
|
||||
|
||||
error:
|
||||
page_title: Ein Fehler ist aufgetreten
|
||||
|
|
@ -533,7 +536,7 @@ flashes:
|
|||
annotations_reset: Anmerkungen zurücksetzen
|
||||
tags_reset: Tags zurücksetzen
|
||||
entries_reset: Einträge zurücksetzen
|
||||
# archived_reset: Archived entries deleted
|
||||
archived_reset: Archiverte Einträge zurücksetzen
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Eintrag bereits am %date% gespeichert'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Save'
|
||||
public:
|
||||
shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
delete: "Are you sure you want to remove that article?"
|
||||
delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'About'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Guardar'
|
||||
public:
|
||||
shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'Acerca de'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'ذخیره'
|
||||
public:
|
||||
# shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'درباره'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: "Enregistrer"
|
||||
public:
|
||||
shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
|
||||
confirm:
|
||||
delete: "Voulez-vous vraiment supprimer cet article ?"
|
||||
delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
|
||||
|
||||
about:
|
||||
page_title: "À propos"
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Salva'
|
||||
public:
|
||||
# shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'About'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Enregistrar'
|
||||
public:
|
||||
shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'A prepaus'
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ config:
|
|||
annotations: Usuń WSZYSTKIE adnotacje
|
||||
tags: Usuń WSZYSTKIE tagi
|
||||
entries: usuń WSZYTSTKIE wpisy
|
||||
# archived: Remove ALL archived entries
|
||||
archived: usuń WSZYSTKIE zarchiwizowane wpisy
|
||||
confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
|
||||
form_password:
|
||||
description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków."
|
||||
|
|
@ -155,7 +155,7 @@ config:
|
|||
or: 'Jedna reguła LUB inna'
|
||||
and: 'Jedna reguła I inna'
|
||||
matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>'
|
||||
# notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
|
||||
notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>'
|
||||
|
||||
entry:
|
||||
page_titles:
|
||||
|
|
@ -225,8 +225,8 @@ entry:
|
|||
original_article: 'oryginalny'
|
||||
annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji'
|
||||
created_at: 'Czas stworzenia'
|
||||
# published_at: 'Publication date'
|
||||
# published_by: 'Published by'
|
||||
published_at: 'Data publikacji'
|
||||
published_by: 'Opublikowane przez'
|
||||
new:
|
||||
page_title: 'Zapisz nowy wpis'
|
||||
placeholder: 'http://website.com'
|
||||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Zapisz'
|
||||
public:
|
||||
shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?"
|
||||
delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?"
|
||||
|
||||
about:
|
||||
page_title: 'O nas'
|
||||
|
|
@ -514,7 +517,7 @@ user:
|
|||
delete_confirm: Jesteś pewien?
|
||||
back_to_list: Powrót do listy
|
||||
search:
|
||||
# placeholder: Filter by username or email
|
||||
placeholder: Filtruj po nazwie użytkownika lub adresie e-mail
|
||||
|
||||
error:
|
||||
page_title: Wystąpił błąd
|
||||
|
|
@ -533,7 +536,7 @@ flashes:
|
|||
annotations_reset: Zresetuj adnotacje
|
||||
tags_reset: Zresetuj tagi
|
||||
entries_reset: Zresetuj wpisy
|
||||
# archived_reset: Archived entries deleted
|
||||
archived_reset: Zarchiwizowane wpisy usunięte
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Wpis już został dodany %date%'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Salvar'
|
||||
public:
|
||||
shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'Sobre'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Salvează'
|
||||
public:
|
||||
# shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'Despre'
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@ entry:
|
|||
save_label: 'Kaydet'
|
||||
public:
|
||||
# shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
|
||||
confirm:
|
||||
# delete: "Are you sure you want to remove that article?"
|
||||
# delete_tag: "Are you sure you want to remove that tag from that article?"
|
||||
|
||||
about:
|
||||
page_title: 'Hakkımızda'
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}"><span>{{ entry.domainName|removeWww }}</span></a></li>
|
||||
<li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">check</i><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">star_rate</i><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li>
|
||||
</ul>
|
||||
{% if (entry.previewPicture is null or listMode == 1) %}
|
||||
<ul class="card-entry-tags">
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
|
||||
<li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
|
||||
<li><a title="{{ 'entry.view.left_menu.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
|
||||
{% if craue_setting('share_public') %}
|
||||
<li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li>
|
||||
<li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>
|
||||
|
|
@ -74,7 +74,13 @@
|
|||
<aside class="tags">
|
||||
<div class="card-entry-tags">
|
||||
{% for tag in entry.tags %}
|
||||
<span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span>
|
||||
<span class="label-outline">
|
||||
<i class="material-icons">label_outline</i>
|
||||
<a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
|
||||
<a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')" class="nostyle">
|
||||
<i>✘</i>
|
||||
</a>
|
||||
</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="input-field baggy-add-tag" style="display: none">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<li>
|
||||
<a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
|
||||
<a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
|
||||
<a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
|
||||
<a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<li>
|
||||
<a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
|
||||
<a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
|
||||
<a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
|
||||
<a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@
|
|||
<div class="collapsible-body"></div>
|
||||
</li>
|
||||
<li class="bold border-bottom">
|
||||
<a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
|
||||
<a class="waves-effect collapsible-header delete" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
|
||||
<i class="material-icons small">delete</i>
|
||||
<span>{{ 'entry.view.left_menu.delete'|trans }}</span>
|
||||
</a>
|
||||
|
|
@ -253,7 +253,10 @@
|
|||
<ul class="tags">
|
||||
{% for tag in entry.tags %}
|
||||
<li class="chip">
|
||||
<a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons vertical-align-middle">delete</i></a>
|
||||
<a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
|
||||
<a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')">
|
||||
<i class="material-icons vertical-align-middle">delete</i>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
@ -279,7 +282,7 @@
|
|||
<ul>
|
||||
<li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li>
|
||||
<li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li>
|
||||
<li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li>
|
||||
<li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')"><i class="material-icons">delete</i></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue