svn commit: r1340372 - in /ofbiz/trunk/framework/webtools: src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java webapp/webtools/labelmanager/ViewLabels.ftl

Author: jleroux
Date: Sat May 19 08:42:13 2012
New Revision: 1340372

URL: http://svn.apache.org/viewvc?rev=1340372&view=rev
Log:
Defintively closes "The Label Manager is wrongly overriding CommonEmptyHeader" https://issues.apache.org/jira/browse/OFBIZ-4652

CommonEmptyHeader is now useless, so this is no longer a concern

Modified:
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java?rev=1340372&r1=1340371&r2=1340372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java Sat May 19 08:42:13 2012
@@ -34,10 +34,8 @@ import org.ofbiz.base.util.UtilPropertie
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.cache.UtilCache;
-
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.ServiceUtil;
-
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -136,9 +134,6 @@ public class SaveLabelsToXmlFile {
                             valueString = StringEscapeUtils.unescapeHtml(valueString);
                             Element valueElem = UtilXml.addChildElementValue(propertyElem, "value", valueString, resourceDocument);
                             valueElem.setAttribute("xml:lang", localeFound);
-                            if (valueString.trim().isEmpty()) {
-                                valueElem.setAttribute("xml:space", "preserve");
-                            }
                             if (UtilValidate.isNotEmpty(labelValue.getLabelComment())) {
                                 Comment labelComment = resourceDocument.createComment(StringEscapeUtils.unescapeHtml(labelValue.getLabelComment()));
                                 Node parent = valueElem.getParentNode();

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl?rev=1340372&r1=1340371&r2=1340372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl Sat May 19 08:42:13 2012
@@ -64,11 +64,7 @@ under the License.
           </#if>
         </#if>
         <#assign showLabel = true>
-        <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y"
-              &&  labelKey == "CommonEmptyHeader" > <#-- CommonEmptyHeader is empty by definition -->
-          <#assign showLabel = false>
-        </#if>
-        <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y"
+        <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y"
             && parameters.labelLocaleName?exists && parameters.labelLocaleName != "">
           <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)?if_exists>
           <#if labelValue?exists && labelValue?has_content>