Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix and make consistent the translation keys #341

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix and make consistent the translation keys #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ sylius_invoicing_plugin_invoice:
permission: true
vars:
all:
subheader: sylius_invoicing_plugin.ui.manage_invoices
subheader: sylius_invoicing.ui.manage_invoices
index:
icon: inbox
type: sylius.resource
Expand Down
2 changes: 2 additions & 0 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
- `Sylius\InvoicingPlugin\EventProducer\OrderPaymentPaidProducer`
- `Sylius\InvoicingPlugin\EventProducer\OrderPlacedProducer`
- `Sylius\InvoicingPlugin\Generator\SequentialInvoiceNumberGenerator`

1. The translation keys have been changed from `sylius_invoicing_plugin` and `sylius_admin_order_creation` to `sylius_invoicing`.
2 changes: 1 addition & 1 deletion src/Resources/config/app/routing/admin_invoicing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sylius_invoicing_plugin_invoice:
permission: true
vars:
all:
subheader: sylius_invoicing_plugin.ui.manage_invoices
subheader: sylius_invoicing.ui.manage_invoices
index:
icon: inbox
type: sylius.resource
Expand Down
14 changes: 7 additions & 7 deletions src/Resources/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ sylius_grid:
fields:
number:
type: string
label: sylius_invoicing_plugin.ui.invoice_number
label: sylius_invoicing.ui.invoice_number
sortable: true
orderNumber:
type: twig
Expand All @@ -64,22 +64,22 @@ sylius_grid:
template: "@SyliusAdmin/Order/Grid/Field/total.html.twig"
issuedAt:
type: datetime
label: sylius_invoicing_plugin.ui.issued_at
label: sylius_invoicing.ui.issued_at
options:
format: 'Y-m-d H:i:s'
sortable: true
filters:
orderNumber:
type: string
label: sylius_invoicing_plugin.ui.order_number
label: sylius_invoicing.ui.order_number
options:
fields: [order.number]
number:
type: string
label: sylius_invoicing_plugin.ui.invoice_number
label: sylius_invoicing.ui.invoice_number
issuedAt:
type: date
label: sylius_invoicing_plugin.ui.issued_at
label: sylius_invoicing.ui.issued_at
channel:
type: invoice_channel
label: sylius.ui.channel
Expand All @@ -89,7 +89,7 @@ sylius_grid:
type: show
download:
type: default
label: sylius_invoicing_plugin.ui.download_invoice
label: sylius_invoicing.ui.download_invoice
enabled: '%sylius_invoicing.pdf_generator.enabled%'
icon: download
options:
Expand All @@ -99,7 +99,7 @@ sylius_grid:
id: resource.id
resend:
type: default
label: sylius_invoicing_plugin.ui.resend_invoice
label: sylius_invoicing.ui.resend_invoice
icon: send
options:
link:
Expand Down
12 changes: 6 additions & 6 deletions src/Resources/config/validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
<class name="Sylius\InvoicingPlugin\Entity\ShopBillingData">
<property name="company">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.company.not_blank</option>
<option name="message">sylius_invoicing.channel.company.not_blank</option>
<option name="groups">
<value>sylius</value>
</option>
</constraint>
</property>
<property name="taxId">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.taxId.not_blank</option>
<option name="message">sylius_invoicing.channel.taxId.not_blank</option>
<option name="groups">sylius</option>
</constraint>
</property>
<property name="street">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.street.not_blank</option>
<option name="message">sylius_invoicing.channel.street.not_blank</option>
<option name="groups">sylius</option>
</constraint>
</property>
<property name="city">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.city.not_blank</option>
<option name="message">sylius_invoicing.channel.city.not_blank</option>
<option name="groups">sylius</option>
</constraint>
</property>
<property name="postcode">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.postcode.not_blank</option>
<option name="message">sylius_invoicing.channel.postcode.not_blank</option>
<option name="groups">sylius</option>
</constraint>
</property>
<property name="countryCode">
<constraint name="NotBlank">
<option name="message">sylius_admin_order_creation.channel.countryCode.not_blank</option>
<option name="message">sylius_invoicing.channel.countryCode.not_blank</option>
<option name="groups">sylius</option>
</constraint>
</property>
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/flashes.de.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sylius_invoicing_plugin:
sylius_invoicing:
invoice_resent_successfully: 'Die Rechnung wurde erneut erfolgreich an den Kunden gesendet.'
2 changes: 1 addition & 1 deletion src/Resources/translations/flashes.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sylius_invoicing_plugin:
sylius_invoicing:
invoice_resent_successfully: 'Invoice has been successfully resent to the customer'
2 changes: 1 addition & 1 deletion src/Resources/translations/flashes.pl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sylius_invoicing_plugin:
sylius_invoicing:
invoice_resent_successfully: 'Faktura została ponownie wysłana do klienta'
2 changes: 1 addition & 1 deletion src/Resources/translations/messages.de.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_invoicing_plugin:
sylius_invoicing:
ui:
billing_data: 'Rechnungsdaten'
buyer: 'Käufer'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/messages.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_invoicing_plugin:
sylius_invoicing:
ui:
billing_data: 'Billing data'
buyer: 'Buyer'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/messages.fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_invoicing_plugin:
sylius_invoicing:
ui:
billing_data: 'Données de facturation'
buyer: 'Acheteur'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/messages.pl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_invoicing_plugin:
sylius_invoicing:
ui:
billing_data: 'Dane do faktury'
buyer: 'Nabywca'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/validators.de.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_admin_order_creation:
sylius_invoicing:
channel:
company:
not_blank: 'Das Feld für die Firma darf nicht leer sein.'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/validators.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_admin_order_creation:
sylius_invoicing:
channel:
company:
not_blank: 'Company cannot be blank'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/translations/validators.pl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sylius_admin_order_creation:
sylius_invoicing:
channel:
company:
not_blank: 'Firma nie może być pusta'
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Invoice/Admin/_downloadButton.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

{% set path = path('sylius_invoicing_plugin_admin_invoice_download', {'id': invoice.id}) %}

{{ buttons.default(path, 'sylius_invoicing_plugin.ui.download_invoice'|trans, invoice.id, 'download', 'blue') }}
{{ buttons.default(path, 'sylius_invoicing.ui.download_invoice'|trans, invoice.id, 'download', 'blue') }}
2 changes: 1 addition & 1 deletion src/Resources/views/Invoice/Admin/_resendButton.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

{% set path = path('sylius_invoicing_plugin_admin_invoice_resend', {'id': invoice.id}) %}

{{ buttons.default(path, 'sylius_invoicing_plugin.ui.resend_invoice'|trans, invoice.id, 'send') }}
{{ buttons.default(path, 'sylius_invoicing.ui.resend_invoice'|trans, invoice.id, 'send') }}
36 changes: 18 additions & 18 deletions src/Resources/views/Invoice/Download/pdf.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
{% set logoPath = invoiceLogoPath %}

{% block header %}
<strong>{{ 'sylius_invoicing_plugin.ui.issued_at'|trans([], 'messages', invoice.localeCode) }}:</strong>
<strong>{{ 'sylius_invoicing.ui.issued_at'|trans([], 'messages', invoice.localeCode) }}:</strong>
{{ invoice.issuedAt|date('Y-m-d H:i:s') }}
{% endblock %}

{% block buyer %}
<h6>{{ 'sylius_invoicing_plugin.ui.buyer'|trans([], 'messages', invoice.localeCode) }}</h6>
<h6>{{ 'sylius_invoicing.ui.buyer'|trans([], 'messages', invoice.localeCode) }}</h6>
<strong>{{ invoice.billingData.firstName }} {{ invoice.billingData.lastName }}</strong><br/>
{% if invoice.billingData.company %}
{{ invoice.billingData.company }}<br/>
Expand All @@ -22,7 +22,7 @@

{% block seller %}
{%- if shopBillingData %}
<h6>{{ 'sylius_invoicing_plugin.ui.seller'|trans([], 'messages', invoice.localeCode) }}</h6>
<h6>{{ 'sylius_invoicing.ui.seller'|trans([], 'messages', invoice.localeCode) }}</h6>
{% if shopBillingData.company %}<strong>{{ shopBillingData.company }}</strong><br/>{% endif %}
{% if shopBillingData.street %}{{ shopBillingData.street }}<br/>{% endif %}
{% if shopBillingData.city %}{{ shopBillingData.city }}<br/>{% endif %}
Expand All @@ -34,21 +34,21 @@
{% endblock %}

{% block title %}
{{ 'sylius_invoicing_plugin.ui.invoice'|trans([], 'messages', invoice.localeCode) }} #{{ invoice.number }}
{{ 'sylius_invoicing.ui.invoice'|trans([], 'messages', invoice.localeCode) }} #{{ invoice.number }}
{% endblock %}

{% block data %}
<table>
<tr>
<th>{{ 'sylius_invoicing_plugin.ui.no'|trans([], 'messages', invoice.localeCode) }}</th>
<th>{{ 'sylius_invoicing.ui.no'|trans([], 'messages', invoice.localeCode) }}</th>
<th>{{ 'sylius.ui.name'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius.ui.quantity'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.unit_net_price'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.discounted_unit_net_price'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.net_value'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.tax_rate'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.tax_amount'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing_plugin.ui.gross_value'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.unit_net_price'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.discounted_unit_net_price'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.net_value'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.tax_rate'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.tax_amount'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius_invoicing.ui.gross_value'|trans([], 'messages', invoice.localeCode) }}</th>
<th class="text-right">{{ 'sylius.ui.currency'|trans([], 'messages', invoice.localeCode) }}</th>
</tr>

Expand All @@ -73,14 +73,14 @@

<tr>
<td class="border-0" colspan="6"></td>
<td class="text-right bg-gray" colspan="2">{{ 'sylius_invoicing_plugin.ui.net_total'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray" colspan="2">{{ 'sylius_invoicing.ui.net_total'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray">{{ '%0.2f'|format(invoice.subtotal/100) }}</td>
<td class="text-right bg-gray">{{ invoice.currencyCode }}</td>
</tr>

<tr>
<td class="border-0" colspan="6"></td>
<td class="text-right bg-gray" colspan="2" >{{ 'sylius_invoicing_plugin.ui.taxes_total'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray" colspan="2" >{{ 'sylius_invoicing.ui.taxes_total'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray">{{ '%0.2f'|format(invoice.taxesTotal/100) }}</td>
<td class="text-right bg-gray">{{ invoice.currencyCode }}</td>
</tr>
Expand All @@ -93,21 +93,21 @@
</tr>
<tr>
<td class="border-0" colspan="6"></td>
<td class="text-right bg-gray" colspan="2">{{ 'sylius_invoicing_plugin.ui.payment.paid'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray" colspan="2">{{ 'sylius_invoicing.ui.payment.paid'|trans([], 'messages', invoice.localeCode) }}:</td>
<td class="text-right bg-gray" colspan="2">
{% if invoice.paymentState() is constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %}
{{ 'sylius_invoicing_plugin.ui.payment.yes'|trans([], 'messages', invoice.localeCode) }}
{{ 'sylius_invoicing.ui.payment.yes'|trans([], 'messages', invoice.localeCode) }}
{% else %}
{{ 'sylius_invoicing_plugin.ui.payment.no'|trans([], 'messages', invoice.localeCode) }}
{{ 'sylius_invoicing.ui.payment.no'|trans([], 'messages', invoice.localeCode) }}
{% endif %}
</td>
</tr>

{% if invoice.taxItems.count() > 0 %}
<tr>
<td class="border-0" colspan="7"></td>
<td class="text-right">{{ 'sylius_invoicing_plugin.ui.tax_rate'|trans([], 'messages', invoice.localeCode) }}</td>
<td class="text-right">{{ 'sylius_invoicing_plugin.ui.tax_amount'|trans([], 'messages', invoice.localeCode) }}</td>
<td class="text-right">{{ 'sylius_invoicing.ui.tax_rate'|trans([], 'messages', invoice.localeCode) }}</td>
<td class="text-right">{{ 'sylius_invoicing.ui.tax_amount'|trans([], 'messages', invoice.localeCode) }}</td>
<td class="text-right">{{ 'sylius.ui.currency'|trans([], 'messages', invoice.localeCode) }}</td>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Invoice/Show/_billingData.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set billingData = invoice.billingData %}

<h4 class="ui top attached styled header">
{{ 'sylius_invoicing_plugin.ui.buyer'|trans }}
{{ 'sylius_invoicing.ui.buyer'|trans }}
</h4>
<div class="ui attached segment" id="billing-data">
<address>
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Invoice/Show/_breadcrumb.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% set breadcrumbs = [
{ label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') },
{ label: 'sylius_invoicing_plugin.ui.invoices'|trans, url: path('sylius_invoicing_plugin_admin_invoice_index') },
{ label: 'sylius_invoicing.ui.invoices'|trans, url: path('sylius_invoicing_plugin_admin_invoice_index') },
{ label: invoice.id, url: path('sylius_invoicing_plugin_admin_invoice_show', { 'id': invoice.id }) }
]
%}
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/views/Invoice/Show/_header.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<h1 class="ui header">
<i class="circular inbox icon"></i>
<div class="content">
{{ 'sylius_invoicing_plugin.ui.invoice'|trans }} {{ invoice.number }}
{{ 'sylius_invoicing.ui.invoice'|trans }} {{ invoice.number }}
<div class="sub header">
<div class="ui horizontal divided list">
<div class="item">
{{ 'sylius_invoicing_plugin.ui.issued_at'|trans }}: <span id="invoice-issued-at">{{ invoice.issuedAt|format_datetime }}</span>
{{ 'sylius_invoicing.ui.issued_at'|trans }}: <span id="invoice-issued-at">{{ invoice.issuedAt|format_datetime }}</span>
</div>
<div class="item">
{{ 'sylius_invoicing_plugin.ui.issued_for_order'|trans }}: #{{ invoice.order.number }}
{{ 'sylius_invoicing.ui.issued_for_order'|trans }}: #{{ invoice.order.number }}
</div>
<div class="item">
{{ 'sylius_invoicing_plugin.ui.issued_from'|trans }}
{{ 'sylius_invoicing.ui.issued_from'|trans }}
{% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': invoice.channel} %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Invoice/Show/_shopBillingData.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% if shopBillingData %}
<h4 class="ui top attached styled header">
{{ 'sylius_invoicing_plugin.ui.seller'|trans }}
{{ 'sylius_invoicing.ui.seller'|trans }}
</h4>
<div class="ui attached segment" id="shop-billing-data">
<address>
Expand Down
Loading