Author: jleroux Date: Fri Sep 5 10:12:58 2014 New Revision: 1622675 URL: http://svn.apache.org/r1622675 Log: "Applied fix from trunk for revision: 1622672 " ------------------------------------------------------------------------ r1622672 | jleroux | 2014-09-05 12:11:54 +0200 (ven. 05 sept. 2014) | 3 lignes
A patch from Julien NICOLAS for "Wrong label in Product Config Item" https://issues.apache.org/jira/browse/OFBIZ-5753 In the screen Product Config, when you want to add a componant to your config option, the label is wrong because it show : Add Configurations and not Add a component. ------------------------------------------------------------------------ Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/applications/product/config/ProductUiLabels.xml ofbiz/branches/release11.04/applications/product/widget/catalog/ConfigScreens.xml Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1622672 Modified: ofbiz/branches/release11.04/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/config/ProductUiLabels.xml?rev=1622675&r1=1622674&r2=1622675&view=diff ============================================================================== --- ofbiz/branches/release11.04/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/release11.04/applications/product/config/ProductUiLabels.xml Fri Sep 5 10:12:58 2014 @@ -23,6 +23,14 @@ <value xml:lang="de">Neues Merkmal für dieses Produkt erstellen</value> <value xml:lang="en">Add new Product Feature to current product</value> </property> + <property key="AddProductComponent"> + <value xml:lang="en">Add Product Component</value> + <value xml:lang="es">Añadir componente</value> + <value xml:lang="fr">Ajouter un composant</value> + <value xml:lang="it">Aggiungi componente</value> + <value xml:lang="pt_BR">Adicionar componente de produto</value> + <value xml:lang="ro">Adauga Componente Produs</value> + </property> <property key="CatalogWebAnalytics"> <value xml:lang="en">Web Analytics</value> <value xml:lang="it">Analisi Web</value> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/ConfigScreens.xml?rev=1622675&r1=1622674&r2=1622675&view=diff ============================================================================== --- ofbiz/branches/release11.04/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/branches/release11.04/applications/product/widget/catalog/ConfigScreens.xml Fri Sep 5 10:12:58 2014 @@ -197,8 +197,8 @@ under the License. <not><if-empty field="productId"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <screenlet title="${uiLabelMap.AddProductComponent}"> + <link style="buttontext" text="${uiLabelMap.AddProductComponent}" target="EditProductConfigOptions"> <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link> @@ -206,8 +206,8 @@ under the License. </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <screenlet title="${uiLabelMap.AddProductComponent}"> + <link style="buttontext" text="${uiLabelMap.AddProductComponent}" target="EditProductConfigOptions"> <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link>