svn commit: r1848834 - in /ofbiz/ofbiz-framework/trunk: applications/humanres/widget/ applications/party/widget/partymgr/ applications/product/widget/catalog/ framework/common/config/

Author: jleroux
Date: Thu Dec 13 09:43:03 2018
New Revision: 1848834

URL: http://svn.apache.org/viewvc?rev=1848834&view=rev
Log:
Improved: Splitting CommonRate and CommonProductRating
(OFBIZ-3844)

The CommonRate label is currently not used coherently throughout the application
stack. The existing translations suggest that the commonly understood meaning of
CommonRate is a rate as a tariff or day rate. However, in the product management
GUI, the CommonRate label is used to demark the section where ProductRating
setting are made.

The provided fix splits CommonRate into two labels, CommonRatioRate and
CommonAssessRate (product rating). Also, the application/product/webapp/ form
definition now references the CommonAssessRate label.

Thanks: Carsten Schinzer for report and patch, Adrian for suggestion and Markus
May for discussion

Modified:
    ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
    ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1848834&r1=1848833&r2=1848834&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Thu Dec 13 09:43:03 2018
@@ -159,7 +159,7 @@
                 <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
-                        <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}" collapsible="true">
+                        <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRatioRate}" collapsible="true">
                             <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
                         </screenlet>
                             <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1848834&r1=1848833&r2=1848834&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml Thu Dec 13 09:43:03 2018
@@ -80,7 +80,7 @@
                 <parameter param-name="partyId"/>
             </link>
         </menu-item>
-        <menu-item name="EditPartyRates" title="${uiLabelMap.CommonRates}">
+        <menu-item name="EditPartyRates" title="${uiLabelMap.CommonRatioRates}">
             <link target="EditPartyRates">
                 <parameter param-name="partyId"/>
             </link>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1848834&r1=1848833&r2=1848834&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml Thu Dec 13 09:43:03 2018
@@ -315,7 +315,7 @@ under the License.
                 <sort-field name="inventoryMessage"/>
                 <sort-field name="lotIdFilledIn"/>
             </field-group>
-            <field-group title="${uiLabelMap.CommonRate}" collapsible="true" initially-collapsed="true">
+            <field-group title="${uiLabelMap.CommonAssessRate}" collapsible="true" initially-collapsed="true">
                 <sort-field name="ratingTypeEnum"/>
                 <sort-field name="productRating"/>
             </field-group>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1848834&r1=1848833&r2=1848834&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml Thu Dec 13 09:43:03 2018
@@ -9398,7 +9398,7 @@
     <property key="CommonQuoteTerms">
         <value xml:lang="en">Quote Terms</value>
     </property>
-    <property key="CommonRate">
+    <property key="CommonRatioRate">
         <value xml:lang="ar">النسبة</value>
         <value xml:lang="cs">Sazba</value>
         <value xml:lang="de">Satz</value>
@@ -9419,7 +9419,7 @@
         <value xml:lang="zh-CN">等级</value>
         <value xml:lang="zh-TW">評等</value>
     </property>
-    <property key="CommonRates">
+    <property key="CommonRatioRates">
         <value xml:lang="ar">النسب</value>
         <value xml:lang="cs">Sazby</value>
         <value xml:lang="de">Sätze</value>
@@ -9440,6 +9440,10 @@
         <value xml:lang="zh-CN">费用</value>
         <value xml:lang="zh-TW">評等</value>
     </property>
+    <property key="CommonAssessRate">
+        <value xml:lang="de">Bewertung</value>
+        <value xml:lang="en">Rating</value>
+    </property>    
     <property key="CommonReady">
         <value xml:lang="ar">جاهز</value>
         <value xml:lang="cs">Připravený</value>