This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4aa2d71 Improved: Rename invoiceApplications menu-item label to
Payments (OFBIZ-12405)
4aa2d71 is described below
commit 4aa2d714328447787455abcd5887ca99bcbf1152
Author: Jacques Le Roux <[email protected]>
AuthorDate: Tue Nov 30 12:15:16 2021 +0100
Improved: Rename invoiceApplications menu-item label to Payments
(OFBIZ-12405)
Application(s) is generic (also used within contexts elsewhere) in OFBiz.
Users have a better perception of context when looking at a menu-item
Payments
in the screen of an invoice, than seeing Applications.
The additional benefit for developers is that with the implemented change
the
tech come closer to the language of the user
jleroux: after a discussion with Pierre in the Jira, being more in favour of
using "Payments applications" (for instance the related screen is named
EditPaymentApplications), I had a look at
https://www.linguee.fr/francais-anglais/search?query=%22Payments%20applications%22
which was not much conclusive.
In a 1st attempt, using Google translate, I tried to translate few languages
based on a French translation:
<value xml:lang="ar">طلبات المدفوعات </value>
<value xml:lang="de">Zahlungsaufzeichnungen</value>
<value xml:lang="en">Payments application</value>
<value xml:lang="es">Registros de pago</value>
<value xml:lang="fr">Enregistrement des paiements</value>
<value xml:lang="hi-IN">अनुप्रयोग</value>
<value xml:lang="it">Registri di pagamento</value>
I finally think that Pierre's is right and we could simply use Payments
there
rather than Applications and even "Payments applications" (could be
debated...)
So I just changed the French and English labels and the labels names of
AccountingApplicationSuccess to AccountingPaymentApplicationSuccess
and AccountingApplications to AccountingPaymentsApplications
I let the users of other languages to decide what to put there or discuss if
they see an interest.
Thanks: Pierre for report and suggestion
---
applications/accounting/config/AccountingUiLabels.xml | 10 +++++-----
.../org/apache/ofbiz/accounting/invoice/InvoiceServices.java | 2 +-
applications/accounting/widget/AccountingMenus.xml | 2 +-
applications/accounting/widget/PaymentScreens.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/applications/accounting/config/AccountingUiLabels.xml
b/applications/accounting/config/AccountingUiLabels.xml
index 4d34851..b368a40 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -1173,12 +1173,12 @@
<value xml:lang="zh">应付支付组</value>
<value xml:lang="zh-TW">應付支付群組</value>
</property>
- <property key="AccountingApplicationSuccess">
+ <property key="AccountingPaymentApplicationSuccess">
<value xml:lang="ar">تطبيق ${amountApplied?currency$({isoCode})} من
الدفعة [${paymentId}] إلى ${toMessage}</value>
<value xml:lang="de">${amountApplied?currency(${isoCode})} von Zahlung
[${paymentId}] to ${toMessage} zugewiesen</value>
<value xml:lang="en">Applying ${amountApplied?currency(${isoCode})}
from payment [${paymentId}] to ${toMessage}</value>
<value xml:lang="es">Aplicando ${amountApplied?currency(${isoCode})}
de pago [${paymentId}] a ${toMessage}</value>
- <value xml:lang="fr">Enregistrer ${amountApplied?currency(${isoCode})}
du paiement [${paymentId}] à ${toMessage}</value>
+ <value xml:lang="fr">Enregistrement de
${amountApplied?currency(${isoCode})} du paiement [${paymentId}] à
${toMessage}</value>
<value xml:lang="hi-IN">${toMessage} के लिए भुगतान से [${paymentId}],
${amountApplied?currency(${isoCode})} को लगाएं</value>
<value xml:lang="it">Applicazione
${amountApplied?currency(${isoCode})} dal pagamento [${paymentId}] a
${toMessage}</value>
<value xml:lang="ja">${amountApplied?currency(${isoCode})} を、支払
[${paymentId}] から ${toMessage} に消込中</value>
@@ -1264,12 +1264,12 @@
<value xml:lang="zh">到税务机关辖区[${taxAuthGeoId}]</value>
<value xml:lang="zh-TW">到稅務機關轄區[${taxAuthGeoId}]</value>
</property>
- <property key="AccountingApplications">
+ <property key="AccountingPaymentsApplications">
<value xml:lang="ar">تطبيقات</value>
<value xml:lang="de">Zuweisungen</value>
- <value xml:lang="en">Applications</value>
+ <value xml:lang="en">Payments</value>
<value xml:lang="es">Aplicaciones</value>
- <value xml:lang="fr">Enregistrements</value>
+ <value xml:lang="fr">Enregistrement des paiements</value>
<value xml:lang="hi-IN">अनुप्रयोग</value>
<value xml:lang="it">Pagamenti Applicati</value>
<value xml:lang="ja">適用</value>
diff --git
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
index 7ee585a..9a1f5a6 100644
---
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
+++
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
@@ -3310,7 +3310,7 @@ public class InvoiceServices {
errorMessageList.add(UtilProperties.getMessage(RESOURCE,
"AccountingNoAmount", locale));
} else {
successMessage = UtilProperties.getMessage(RESOURCE,
- "AccountingApplicationSuccess",
+ "AccountingPaymentApplicationSuccess",
UtilMisc.<String, Object>toMap("amountApplied",
amountApplied,
"paymentId", paymentId,
"isoCode", currencyUomId,
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index 1f74942..7dd2e98 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -181,7 +181,7 @@ under the License.
<parameter param-name="invoiceId"
from-field="invoice.invoiceId"/>
</link>
</menu-item>
- <menu-item name="editInvoiceApplications"
title="${uiLabelMap.AccountingApplications}">
+ <menu-item name="editInvoiceApplications"
title="${uiLabelMap.AccountingPaymentsApplications}">
<condition>
<and>
<not><if-empty field="invoice.invoiceId"/></not>
diff --git a/applications/accounting/widget/PaymentScreens.xml
b/applications/accounting/widget/PaymentScreens.xml
index 043b285..a492c18 100644
--- a/applications/accounting/widget/PaymentScreens.xml
+++ b/applications/accounting/widget/PaymentScreens.xml
@@ -226,7 +226,7 @@ under the License.
<if-empty field="paymentApplications"/>
</condition>
<widgets>
- <container><label style="h1"
text="${uiLabelMap.AccountingPayment}
${uiLabelMap.AccountingApplications}"/></container>
+ <container><label style="h1"
text="${uiLabelMap.AccountingPayment}
${uiLabelMap.AccountingPaymentsApplications}"/></container>
<container><label style="h1"
text="${uiLabelMap.CommonAmount} ${uiLabelMap.CommonTotal}
${payment.amount?currency(${payment.currencyUomId})}
${uiLabelMap.AccountingAmountNotApplied}
${notAppliedAmount?currency(${payment.currencyUomId})}"/></container>
<container><label style="h3"
text="${uiLabelMap.AccountingNoPaymentsApplicationsfound}"></label></container>
</widgets>
@@ -236,7 +236,7 @@ under the License.
<not><if-empty
field="paymentApplicationsInv"/></not>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingPayment} ${uiLabelMap.AccountingApplications}">
+ <screenlet
title="${uiLabelMap.AccountingPayment}
${uiLabelMap.AccountingPaymentsApplications}">
<include-grid
name="EditPaymentApplicationsInv"
location="component://accounting/widget/PaymentForms.xml"/>
</screenlet>
</widgets>
