svn commit: r1806272 - in /ofbiz/branches: release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/ release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/ release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1806272 - in /ofbiz/branches: release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/ release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/ release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/

jleroux@apache.org
Author: jleroux
Date: Sat Aug 26 07:56:43 2017
New Revision: 1806272

URL: http://svn.apache.org/viewvc?rev=1806272&view=rev
Log:
"Applied fix from trunk framework for revision: 1806269"
------------------------------------------------------------------------
r1806269 | jleroux | 2017-08-26 09:43:54 +0200 (sam., 26 août 2017) | 8 lines

Fixed: LabelManager doesn't search labels in all elements in xml
(OFBIZ-9606)

Currently, label manager for xml search only for fail-property elements in xml
files, it should also search for the property-to-field, default-message element
in xml files.

Thanks: Suraj Khurana
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
    ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
    ofbiz/branches/release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java

Modified: ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1806272&r1=1806271&r2=1806272&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Sat Aug 26 07:56:43 2017
@@ -287,6 +287,8 @@ public class LabelReferences {
                 findUiLabelMapInFile(inFile, file.getPath());
                 findLabelKeyInElement(inFile, file.getPath(), "set");
                 findLabelKeyInElement(inFile, file.getPath(), "fail-property");
+                findLabelKeyInElement(inFile, file.getPath(), "property-to-field");
+                findLabelKeyInElement(inFile, file.getPath(), "default-message");
             }
         }
     }

Modified: ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1806272&r1=1806271&r2=1806272&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Sat Aug 26 07:56:43 2017
@@ -287,6 +287,8 @@ public class LabelReferences {
                 findUiLabelMapInFile(inFile, file.getPath());
                 findLabelKeyInElement(inFile, file.getPath(), "set");
                 findLabelKeyInElement(inFile, file.getPath(), "fail-property");
+                findLabelKeyInElement(inFile, file.getPath(), "property-to-field");
+                findLabelKeyInElement(inFile, file.getPath(), "default-message");
             }
         }
     }

Modified: ofbiz/branches/release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1806272&r1=1806271&r2=1806272&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/branches/release15.12/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Sat Aug 26 07:56:43 2017
@@ -286,6 +286,8 @@ public class LabelReferences {
                 findUiLabelMapInFile(inFile, file.getPath());
                 findLabelKeyInElement(inFile, file.getPath(), "set");
                 findLabelKeyInElement(inFile, file.getPath(), "fail-property");
+                findLabelKeyInElement(inFile, file.getPath(), "property-to-field");
+                findLabelKeyInElement(inFile, file.getPath(), "default-message");
             }
         }
     }