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 d599d77 Improved: no functional change, labels improvements
d599d77 is described below
commit d599d7718b60f608c013396779c41916c774e84b
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sun Jan 16 10:28:20 2022 +0100
Improved: no functional change, labels improvements
In French, and maybe other languages, there is not only one word for new.
There are nouveau (masculine), nouvelle (féminine) and nouvel (masculine
followed
by a word starting with a vowel)
Here are few related changes with misc. labels, and use of these labels in
MainActionMenu of marketing order and catalog menus
---
applications/marketing/widget/MarketingMenus.xml | 2 +-
applications/order/config/OrderUiLabels.xml | 1 +
applications/order/widget/ordermgr/OrderMenus.xml | 8 ++++----
applications/product/config/ProductUiLabels.xml | 2 +-
applications/product/widget/catalog/CatalogMenus.xml | 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/applications/marketing/widget/MarketingMenus.xml
b/applications/marketing/widget/MarketingMenus.xml
index c97d921..2608bb2 100644
--- a/applications/marketing/widget/MarketingMenus.xml
+++ b/applications/marketing/widget/MarketingMenus.xml
@@ -27,7 +27,7 @@ under the License.
<menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link
target="MarketingReport"/></menu-item>
</menu>
<menu name="MainActionMenu" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
- <menu-item name="NewCampaign" title="${uiLabelMap.CommonNew}
${uiLabelMap.MarketingCampaign}">
+ <menu-item name="NewCampaign"
title="${uiLabelMap.MarketingCampaignCreate}">
<condition>
<or>
<if-has-permission permission="MARKETING"
action="_CREATE"/>
diff --git a/applications/order/config/OrderUiLabels.xml
b/applications/order/config/OrderUiLabels.xml
index f5eed7a..74d17f9 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -2094,6 +2094,7 @@
</property>
<property key="OrderAllocationPlan">
<value xml:lang="en">Allocation Plan</value>
+ <value xml:lang="fr">Plan d'allocation</value>
<value xml:lang="nl">Allocatieplan</value>
</property>
<property key="OrderAllocationPlanNotFound">
diff --git a/applications/order/widget/ordermgr/OrderMenus.xml
b/applications/order/widget/ordermgr/OrderMenus.xml
index 426b7d0..11825ac 100644
--- a/applications/order/widget/ordermgr/OrderMenus.xml
+++ b/applications/order/widget/ordermgr/OrderMenus.xml
@@ -84,7 +84,7 @@ under the License.
</menu-item>
</menu>
<menu name="MainActionMenu" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
- <menu-item name="NewOrder" title="${uiLabelMap.CommonNew}
${uiLabelMap.CommonOrder}">
+ <menu-item name="NewOrder" title="${uiLabelMap.OrderNewOrder}">
<condition>
<or>
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
@@ -93,7 +93,7 @@ under the License.
</condition>
<link target="orderentry" link-type="anchor"/>
</menu-item>
- <menu-item name="NewQuote" title="${uiLabelMap.CommonNew}
${uiLabelMap.CommonQuote}">
+ <menu-item name="NewQuote" title="${uiLabelMap.OrderNewQuote}">
<condition>
<or>
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
@@ -101,7 +101,7 @@ under the License.
</condition>
<link target="EditQuote"/>
</menu-item>
- <menu-item name="NewRequest" title="${uiLabelMap.CommonNew}
${uiLabelMap.CommonRequest}">
+ <menu-item name="NewRequest" title="${uiLabelMap.OrderNewRequest}">
<condition>
<or>
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
@@ -109,7 +109,7 @@ under the License.
</condition>
<link target="request"/>
</menu-item>
- <menu-item name="NewRequirement" title="${uiLabelMap.CommonNew}
${uiLabelMap.OrderRequirement}">
+ <menu-item name="NewRequirement"
title="${uiLabelMap.OrderNewRequirement}">
<condition>
<or>
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
diff --git a/applications/product/config/ProductUiLabels.xml
b/applications/product/config/ProductUiLabels.xml
index 1226c40..4d4f43d 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -33245,4 +33245,4 @@
<value xml:lang="zh">使用购物车数量</value>
<value xml:lang="zh-TW">使用購物車數量</value>
</property>
-</resource>
\ No newline at end of file
+</resource>
diff --git a/applications/product/widget/catalog/CatalogMenus.xml
b/applications/product/widget/catalog/CatalogMenus.xml
index d02e0b3..6114a83 100644
--- a/applications/product/widget/catalog/CatalogMenus.xml
+++ b/applications/product/widget/catalog/CatalogMenus.xml
@@ -35,7 +35,7 @@ under the License.
<menu-item name="Imagemanagement"
title="${uiLabelMap.ImageManagement}"><link
target="Imagemanagement"/></menu-item>
</menu>
<menu name="MainActionMenu" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
- <menu-item name="newProduct" title="${uiLabelMap.CommonNew}
${uiLabelMap.CommonProduct}">
+ <menu-item name="newProduct"
title="${uiLabelMap.ProductCreateNewProduct}">
<condition>
<and>
<or>
@@ -65,7 +65,7 @@ under the License.
</condition>
<link target="EditProdCatalog"/>
</menu-item>
- <menu-item name="newCategory" title="${uiLabelMap.CommonNew}
${uiLabelMap.ProductCategory}">
+ <menu-item name="newCategory"
title="${uiLabelMap.ProductCreateNewCategory}">
<condition>
<and>
<or>
