Merge pull request #412 from foodcoop1040/confirm
Get rid of duplicated confirm_delete translations
This commit is contained in:
commit
b4e2ddf66d
10 changed files with 6 additions and 38 deletions
|
@ -40,6 +40,6 @@
|
||||||
%p
|
%p
|
||||||
= link_to t('ui.edit'), edit_admin_user_path(@user), class: 'btn'
|
= link_to t('ui.edit'), edit_admin_user_path(@user), class: 'btn'
|
||||||
= link_to t('ui.delete'), [:admin, @user], method: :delete, class: 'btn btn-danger',
|
= link_to t('ui.delete'), [:admin, @user], method: :delete, class: 'btn btn-danger',
|
||||||
data: {confirm: t('.confirm_delete', user: @user.first_name)}
|
data: {confirm: t('ui.confirm_delete', name: @user.first_name)}
|
||||||
= link_to t('.sudo'), sudo_admin_user_path(@user), method: :post, class: 'btn',
|
= link_to t('.sudo'), sudo_admin_user_path(@user), method: :post, class: 'btn',
|
||||||
data: {confirm: t('.confirm_sudo', user: @user.first_name)}
|
data: {confirm: t('.confirm_sudo', user: @user.first_name)}
|
||||||
|
|
|
@ -15,5 +15,5 @@
|
||||||
%td= truncate article_category.description, length: 50
|
%td= truncate article_category.description, length: 50
|
||||||
%td
|
%td
|
||||||
= link_to t('ui.edit'), edit_article_category_path(article_category), class: 'btn btn-mini'
|
= link_to t('ui.edit'), edit_article_category_path(article_category), class: 'btn btn-mini'
|
||||||
= link_to t('ui.delete'), article_category, :method => :delete, :data => {:confirm => t('.confirm_delete')},
|
= link_to t('ui.delete'), article_category, :method => :delete, :data => {:confirm => t('ui.confirm_delete', name: article_category.name)},
|
||||||
class: 'btn btn-mini btn-danger'
|
class: 'btn btn-mini btn-danger'
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
%td= link_to t('ui.edit'), edit_supplier_article_path(@supplier, article),
|
%td= link_to t('ui.edit'), edit_supplier_article_path(@supplier, article),
|
||||||
:remote => true, class: 'btn btn-mini'
|
:remote => true, class: 'btn btn-mini'
|
||||||
%td= link_to t('ui.delete'), [@supplier, article],
|
%td= link_to t('ui.delete'), [@supplier, article],
|
||||||
:method => :delete, :data => {:confirm => t('.confirm_delete')}, :remote => true, class: 'btn btn-mini btn-danger'
|
:method => :delete, :data => {:confirm => t('ui.confirm_delete', name: article.name)}, :remote => true, class: 'btn btn-mini btn-danger'
|
||||||
|
|
|
@ -37,5 +37,5 @@
|
||||||
= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
|
= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
|
||||||
%td
|
%td
|
||||||
- if invoice.user_can_edit?(current_user)
|
- if invoice.user_can_edit?(current_user)
|
||||||
= link_to t('ui.delete'), finance_invoice_path(invoice), :data => {:confirm => t('.confirm_delete')}, :method => :delete,
|
= link_to t('ui.delete'), finance_invoice_path(invoice), :data => {:confirm => t('ui.confirm_delete', name: invoice.number)}, :method => :delete,
|
||||||
class: 'btn btn-danger btn-mini'
|
class: 'btn btn-danger btn-mini'
|
||||||
|
|
|
@ -10,5 +10,5 @@
|
||||||
%td= stock_article.article_category.name
|
%td= stock_article.article_category.name
|
||||||
%td
|
%td
|
||||||
= link_to t('ui.edit'), edit_stock_article_path(stock_article), remote: true, class: 'btn btn-mini'
|
= link_to t('ui.edit'), edit_stock_article_path(stock_article), remote: true, class: 'btn btn-mini'
|
||||||
= link_to t('ui.delete'), stock_article, :method => :delete, :data => {:confirm => t('.confirm_delete', :name => stock_article.name)},
|
= link_to t('ui.delete'), stock_article, :method => :delete, :data => {:confirm => t('ui.confirm_delete', :name => stock_article.name)},
|
||||||
class: 'btn btn-mini btn-danger', :remote => true
|
class: 'btn btn-mini btn-danger', :remote => true
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
- if @current_user.role_suppliers?
|
- if @current_user.role_suppliers?
|
||||||
.form-actions
|
.form-actions
|
||||||
= link_to t('ui.edit'), edit_supplier_path(@supplier), class: 'btn'
|
= link_to t('ui.edit'), edit_supplier_path(@supplier), class: 'btn'
|
||||||
= link_to t('ui.delete'), @supplier, :data => {:confirm => t('.confirm_delete')}, :method => :delete, class: 'btn btn-danger'
|
= link_to t('ui.delete'), @supplier, :data => {:confirm => t('ui.confirm_delete', name: @supplier.name)}, :method => :delete, class: 'btn btn-danger'
|
||||||
|
|
||||||
- if @deliveries.any?
|
- if @deliveries.any?
|
||||||
.span6
|
.span6
|
||||||
|
|
|
@ -290,7 +290,6 @@ de:
|
||||||
error: 'Benutzer/in konnte nicht wiederhergestellt werden: %{error}'
|
error: 'Benutzer/in konnte nicht wiederhergestellt werden: %{error}'
|
||||||
notice: Benutzer/in wurde wiederhergestellt
|
notice: Benutzer/in wurde wiederhergestellt
|
||||||
show:
|
show:
|
||||||
confirm_delete: Willst du den Benutzer %{user} wirklich löschen?
|
|
||||||
confirm_sudo: Wenn du fortsetzt, dann wirst du als Benutzer %{user} angemeldet. Sei vorsichtig und melde dich ab, wenn du fertig bist!
|
confirm_sudo: Wenn du fortsetzt, dann wirst du als Benutzer %{user} angemeldet. Sei vorsichtig und melde dich ab, wenn du fertig bist!
|
||||||
groupabos: Gruppenabos
|
groupabos: Gruppenabos
|
||||||
member_since: Mitglied seit %{time}
|
member_since: Mitglied seit %{time}
|
||||||
|
@ -339,7 +338,6 @@ de:
|
||||||
edit:
|
edit:
|
||||||
title: Kategorie ändern
|
title: Kategorie ändern
|
||||||
index:
|
index:
|
||||||
confirm_delete: Bist Du sicher?
|
|
||||||
new: Neue Kategorie anlegen
|
new: Neue Kategorie anlegen
|
||||||
title: Artikelkategorien
|
title: Artikelkategorien
|
||||||
new:
|
new:
|
||||||
|
@ -348,7 +346,6 @@ de:
|
||||||
notice: Die Kategorie wurde aktualisiert
|
notice: Die Kategorie wurde aktualisiert
|
||||||
articles:
|
articles:
|
||||||
article:
|
article:
|
||||||
confirm_delete: Bist du sicher?
|
|
||||||
last_update: 'zuletzt geändert: %{last_update} | Brutto: %{gross_price}'
|
last_update: 'zuletzt geändert: %{last_update} | Brutto: %{gross_price}'
|
||||||
articles:
|
articles:
|
||||||
confirm_delete: Willst Du wirklich alle gewählten Artikel löschen?
|
confirm_delete: Willst Du wirklich alle gewählten Artikel löschen?
|
||||||
|
@ -781,8 +778,6 @@ de:
|
||||||
index:
|
index:
|
||||||
action_new: Neue Rechnung anlegen
|
action_new: Neue Rechnung anlegen
|
||||||
title: Rechnungen
|
title: Rechnungen
|
||||||
invoices:
|
|
||||||
confirm_delete: Bist Du sicher?
|
|
||||||
linked: Diese Rechnung ist mit %{what_link} verknüpft.
|
linked: Diese Rechnung ist mit %{what_link} verknüpft.
|
||||||
linked_delivery: einer Lieferung
|
linked_delivery: einer Lieferung
|
||||||
linked_order: einer Bestellung
|
linked_order: einer Bestellung
|
||||||
|
@ -1590,8 +1585,6 @@ de:
|
||||||
new_quantity: Neuer Bestand
|
new_quantity: Neuer Bestand
|
||||||
reason: Ereignis
|
reason: Ereignis
|
||||||
stock_changes: Verlauf des Lagerbestands
|
stock_changes: Verlauf des Lagerbestands
|
||||||
stock_article:
|
|
||||||
confirm_delete: Möchtest Du den Lagerartikel %{name} wirklich löschen?
|
|
||||||
update:
|
update:
|
||||||
notice: Lagerartikel »%{name}« aktualisiert.
|
notice: Lagerartikel »%{name}« aktualisiert.
|
||||||
suppliers:
|
suppliers:
|
||||||
|
@ -1623,7 +1616,6 @@ de:
|
||||||
supplier: Lieferantin
|
supplier: Lieferantin
|
||||||
title: Externe Listen
|
title: Externe Listen
|
||||||
show:
|
show:
|
||||||
confirm_delete: Bist Du sicher?
|
|
||||||
last_deliveries: Letzte Lieferungen
|
last_deliveries: Letzte Lieferungen
|
||||||
last_orders: Letzte Bestellungen
|
last_orders: Letzte Bestellungen
|
||||||
new_delivery: Neue Lieferung anlegen
|
new_delivery: Neue Lieferung anlegen
|
||||||
|
|
|
@ -295,7 +295,6 @@ en:
|
||||||
error: 'User could not be restored: %{error}'
|
error: 'User could not be restored: %{error}'
|
||||||
notice: User was restored
|
notice: User was restored
|
||||||
show:
|
show:
|
||||||
confirm_delete: Do you really want to remove %{user}?
|
|
||||||
confirm_sudo: If you continue, you will take on the identity of %{user}. Do not forget to log out when you're done!
|
confirm_sudo: If you continue, you will take on the identity of %{user}. Do not forget to log out when you're done!
|
||||||
groupabos: Group subscriptions
|
groupabos: Group subscriptions
|
||||||
member_since: Member since %{time}
|
member_since: Member since %{time}
|
||||||
|
@ -344,7 +343,6 @@ en:
|
||||||
edit:
|
edit:
|
||||||
title: Edit category
|
title: Edit category
|
||||||
index:
|
index:
|
||||||
confirm_delete: Are you sure?
|
|
||||||
new: Add new category
|
new: Add new category
|
||||||
title: Article categories
|
title: Article categories
|
||||||
new:
|
new:
|
||||||
|
@ -353,7 +351,6 @@ en:
|
||||||
notice: Category was updated
|
notice: Category was updated
|
||||||
articles:
|
articles:
|
||||||
article:
|
article:
|
||||||
confirm_delete: Are you sure?
|
|
||||||
last_update: 'last updated: %{last_update} | gross: %{gross_price}'
|
last_update: 'last updated: %{last_update} | gross: %{gross_price}'
|
||||||
articles:
|
articles:
|
||||||
confirm_delete: Do you really want to delete all selected articles?
|
confirm_delete: Do you really want to delete all selected articles?
|
||||||
|
@ -794,8 +791,6 @@ en:
|
||||||
index:
|
index:
|
||||||
action_new: Create new invoice
|
action_new: Create new invoice
|
||||||
title: Invoices
|
title: Invoices
|
||||||
invoices:
|
|
||||||
confirm_delete: Are you sure?
|
|
||||||
linked: This invoice is linked to %{what_link}.
|
linked: This invoice is linked to %{what_link}.
|
||||||
linked_delivery: a delivery
|
linked_delivery: a delivery
|
||||||
linked_order: an order
|
linked_order: an order
|
||||||
|
@ -1612,8 +1607,6 @@ en:
|
||||||
new_quantity: New quantity
|
new_quantity: New quantity
|
||||||
reason: Reason
|
reason: Reason
|
||||||
stock_changes: Stock quantity changes
|
stock_changes: Stock quantity changes
|
||||||
stock_article:
|
|
||||||
confirm_delete: Are you sure you want to delete the stock article %{name}?
|
|
||||||
update:
|
update:
|
||||||
notice: Stock article %{name} was saved.
|
notice: Stock article %{name} was saved.
|
||||||
suppliers:
|
suppliers:
|
||||||
|
@ -1645,7 +1638,6 @@ en:
|
||||||
supplier: Supplier
|
supplier: Supplier
|
||||||
title: External lists
|
title: External lists
|
||||||
show:
|
show:
|
||||||
confirm_delete: Are you sure?
|
|
||||||
last_deliveries: Recent deliveries
|
last_deliveries: Recent deliveries
|
||||||
last_orders: Last orders
|
last_orders: Last orders
|
||||||
new_delivery: New delivery
|
new_delivery: New delivery
|
||||||
|
|
|
@ -285,7 +285,6 @@ fr:
|
||||||
new:
|
new:
|
||||||
title: Ajouter unE nouveLLE_eau membre
|
title: Ajouter unE nouveLLE_eau membre
|
||||||
show:
|
show:
|
||||||
confirm_delete: Veux-tu vraiment expulser %{user}?
|
|
||||||
confirm_sudo:
|
confirm_sudo:
|
||||||
groupabos: Participation à des équipes
|
groupabos: Participation à des équipes
|
||||||
member_since: Membre depuis %{time}
|
member_since: Membre depuis %{time}
|
||||||
|
@ -334,7 +333,6 @@ fr:
|
||||||
edit:
|
edit:
|
||||||
title: Modifier la catégorie
|
title: Modifier la catégorie
|
||||||
index:
|
index:
|
||||||
confirm_delete: T'es sûrE de ton coup?
|
|
||||||
new: Créer une nouvelle catérogie
|
new: Créer une nouvelle catérogie
|
||||||
title: Catégories de produits
|
title: Catégories de produits
|
||||||
new:
|
new:
|
||||||
|
@ -343,7 +341,6 @@ fr:
|
||||||
notice: La catégorie a été mise à jour
|
notice: La catégorie a été mise à jour
|
||||||
articles:
|
articles:
|
||||||
article:
|
article:
|
||||||
confirm_delete: T'es sûrE de ton coup?
|
|
||||||
last_update: 'dernière modification: %{last_update} | TTC: %{gross_price}'
|
last_update: 'dernière modification: %{last_update} | TTC: %{gross_price}'
|
||||||
articles:
|
articles:
|
||||||
confirm_delete: Tu veux vraiment supprimer tous ces produits?
|
confirm_delete: Tu veux vraiment supprimer tous ces produits?
|
||||||
|
@ -778,8 +775,6 @@ fr:
|
||||||
index:
|
index:
|
||||||
action_new: Ajouter une facture
|
action_new: Ajouter une facture
|
||||||
title: Factures
|
title: Factures
|
||||||
invoices:
|
|
||||||
confirm_delete: T'es sûrE de ton coup?
|
|
||||||
linked: Cette facture est associée à %{what_link}.
|
linked: Cette facture est associée à %{what_link}.
|
||||||
linked_delivery: un réapprovisionnement
|
linked_delivery: un réapprovisionnement
|
||||||
linked_order: une commande
|
linked_order: une commande
|
||||||
|
@ -1596,8 +1591,6 @@ fr:
|
||||||
new_quantity: Nouveau stock
|
new_quantity: Nouveau stock
|
||||||
reason: Raison
|
reason: Raison
|
||||||
stock_changes: Afficher l'historique
|
stock_changes: Afficher l'historique
|
||||||
stock_article:
|
|
||||||
confirm_delete: Es-tu sûr de vouloir supprimer l'article %{name} du cellier?
|
|
||||||
update:
|
update:
|
||||||
notice: Les données de l'article "%{name}" ont été mises à jour.
|
notice: Les données de l'article "%{name}" ont été mises à jour.
|
||||||
suppliers:
|
suppliers:
|
||||||
|
@ -1632,7 +1625,6 @@ fr:
|
||||||
supplier: Fournisseur-e
|
supplier: Fournisseur-e
|
||||||
title: Listes externes
|
title: Listes externes
|
||||||
show:
|
show:
|
||||||
confirm_delete: Tu es sûrE de ton coup?
|
|
||||||
last_deliveries: Dernières livraisons
|
last_deliveries: Dernières livraisons
|
||||||
last_orders: Dernières commande
|
last_orders: Dernières commande
|
||||||
new_delivery: Approvisionner le cellier
|
new_delivery: Approvisionner le cellier
|
||||||
|
|
|
@ -285,7 +285,6 @@ nl:
|
||||||
new:
|
new:
|
||||||
title: Nieuwe gebruiker toevoegen
|
title: Nieuwe gebruiker toevoegen
|
||||||
show:
|
show:
|
||||||
confirm_delete: Wil je %{user} daadwerkelijk verwijderen?
|
|
||||||
confirm_sudo: Als je doorgaat, neem je de identiteit aan van gebruiker %{user}. Vergeet hierna niet uit te loggen!
|
confirm_sudo: Als je doorgaat, neem je de identiteit aan van gebruiker %{user}. Vergeet hierna niet uit te loggen!
|
||||||
groupabos: Groepslidmaatschappen
|
groupabos: Groepslidmaatschappen
|
||||||
member_since: Lid sinds %{time}
|
member_since: Lid sinds %{time}
|
||||||
|
@ -334,7 +333,6 @@ nl:
|
||||||
edit:
|
edit:
|
||||||
title: Categorie bewerken
|
title: Categorie bewerken
|
||||||
index:
|
index:
|
||||||
confirm_delete: Weet je het zeker?
|
|
||||||
new: Nieuwe categorie
|
new: Nieuwe categorie
|
||||||
title: Categoriën
|
title: Categoriën
|
||||||
new:
|
new:
|
||||||
|
@ -343,7 +341,6 @@ nl:
|
||||||
notice: Categorie is bijgewerkt.
|
notice: Categorie is bijgewerkt.
|
||||||
articles:
|
articles:
|
||||||
article:
|
article:
|
||||||
confirm_delete: Weet je het zeker?
|
|
||||||
last_update: 'laatst bijgewerkt: %{last_update} | bruto: %{gross_price}'
|
last_update: 'laatst bijgewerkt: %{last_update} | bruto: %{gross_price}'
|
||||||
articles:
|
articles:
|
||||||
confirm_delete: Weet je zeker dat je alle artikelen wilt verwijderen?
|
confirm_delete: Weet je zeker dat je alle artikelen wilt verwijderen?
|
||||||
|
@ -776,8 +773,6 @@ nl:
|
||||||
index:
|
index:
|
||||||
action_new: Nieuwe factuur toevoegen
|
action_new: Nieuwe factuur toevoegen
|
||||||
title: Facturen
|
title: Facturen
|
||||||
invoices:
|
|
||||||
confirm_delete: Weet je het zeker?
|
|
||||||
linked: Deze factuur is aan %{what_link} gekoppeld.
|
linked: Deze factuur is aan %{what_link} gekoppeld.
|
||||||
linked_delivery: een levering
|
linked_delivery: een levering
|
||||||
linked_order: een bestelling
|
linked_order: een bestelling
|
||||||
|
@ -1589,8 +1584,6 @@ nl:
|
||||||
new_quantity: Nieuw aantal
|
new_quantity: Nieuw aantal
|
||||||
reason: Reden
|
reason: Reden
|
||||||
stock_changes: Verloop
|
stock_changes: Verloop
|
||||||
stock_article:
|
|
||||||
confirm_delete: Voorraadartikel "%{name}" echt verwijderen?
|
|
||||||
update:
|
update:
|
||||||
notice: Voorraadartikel "%{name}" is bijgewerkt.
|
notice: Voorraadartikel "%{name}" is bijgewerkt.
|
||||||
suppliers:
|
suppliers:
|
||||||
|
@ -1622,7 +1615,6 @@ nl:
|
||||||
supplier: Leverancier
|
supplier: Leverancier
|
||||||
title: Externe lijsten
|
title: Externe lijsten
|
||||||
show:
|
show:
|
||||||
confirm_delete: Zeker weten?
|
|
||||||
last_deliveries: Laatste leveringen
|
last_deliveries: Laatste leveringen
|
||||||
last_orders: Recente bestellingen
|
last_orders: Recente bestellingen
|
||||||
new_delivery: Levering aanmaken
|
new_delivery: Levering aanmaken
|
||||||
|
|
Loading…
Reference in a new issue