Skip to content

Commit

Permalink
Merge pull request #344 from GSadee/fix-translations
Browse files Browse the repository at this point in the history
Fix translations' keys after upmerge
  • Loading branch information
GSadee authored Nov 21, 2024
2 parents b8deb58 + 9cbc864 commit 6a907e8
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ sylius_grid:
id: resource.id
resend:
type: default
label: sylius_invoicing_plugin.ui.resend_invoice
label: sylius_invoicing.ui.resend_invoice
icon: "tabler:send"
options:
link:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<h1 class="page-title">
{{ 'sylius_invoicing_plugin.ui.invoice'|trans }} {{ hookable_metadata.context.resource.number }}
{{ 'sylius_invoicing.ui.invoice'|trans }} {{ hookable_metadata.context.resource.number }}
</h1>
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<div class="mt-1">
<ul class="list-inline mb-0">
<li class="list-inline-item">
<strong>{{ 'sylius_invoicing_plugin.ui.issued_at'|trans }}:</strong>
<strong>{{ 'sylius_invoicing.ui.issued_at'|trans }}:</strong>
<span {{ sylius_test_html_attribute('issued-at') }}>{{ invoice.issuedAt|format_datetime }}</span>
</li>
<li class="list-inline-item">
<strong>{{ 'sylius_invoicing_plugin.ui.issued_for_order'|trans }}:</strong>
<strong>{{ 'sylius_invoicing.ui.issued_for_order'|trans }}:</strong>
#{{ invoice.order.number }}
</li>
<li class="list-inline-item">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="card mb-3">
<div class="card-header">
<div class="card-title">
{{ 'sylius_invoicing_plugin.ui.buyer'|trans }}
{{ 'sylius_invoicing.ui.buyer'|trans }}
</div>
</div>
<div class="card-body">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="card-footer text-end">
<div class="d-inline-block" {{ sylius_test_html_attribute('invoice-is-paid') }}>
<strong>{{ 'sylius_invoicing_plugin.ui.payment.paid'|trans }}: </strong>
<strong>{{ 'sylius_invoicing.ui.payment.paid'|trans }}: </strong>
<span>
{% if hookable_metadata.context.resource.paymentState is constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %}
{{ 'sylius_invoicing_plugin.ui.payment.yes'|trans }}
{{ 'sylius_invoicing.ui.payment.yes'|trans }}
{% else %}
{{ 'sylius_invoicing_plugin.ui.payment.no'|trans }}
{{ 'sylius_invoicing.ui.payment.no'|trans }}
{% endif %}
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="card mb-3">
<div class="card-header">
<div class="card-title">
{{ 'sylius_invoicing_plugin.ui.seller'|trans }}
{{ 'sylius_invoicing.ui.seller'|trans }}
</div>
</div>
<div class="card-body">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="card mb-3">
<div class="card-header">
<div class="card-title">
{{ 'sylius_invoicing_plugin.ui.invoices'|trans }}
{{ 'sylius_invoicing.ui.invoices'|trans }}
</div>
</div>
<table class="table table-borderless align-middle mb-0">
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/shared/action/download.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
<path d="M7 11l5 5l5 -5" />
<path d="M12 4l0 12" />
</svg>
{{ 'sylius_invoicing_plugin.ui.download_invoice'|trans }}
{{ 'sylius_invoicing.ui.download_invoice'|trans }}
</a>
2 changes: 1 addition & 1 deletion templates/admin/shared/action/resend.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

<a href="{{ path }}" class="btn">
{{ ux_icon('tabler:send', {'class': 'icon'}) }}
{{ 'sylius_invoicing_plugin.ui.resend_invoice'|trans }}
{{ 'sylius_invoicing.ui.resend_invoice'|trans }}
</a>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th>{{ 'sylius_invoicing_plugin.ui.issued_at'|trans }}</th>
<th>{{ 'sylius_invoicing.ui.issued_at'|trans }}</th>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="card-header pb-3 mb-3 border-bottom">
{{ 'sylius_invoicing_plugin.ui.invoices'|trans }}
{{ 'sylius_invoicing.ui.invoices'|trans }}
</div>

0 comments on commit 6a907e8

Please sign in to comment.