svn commit: r1709213 - in /ofbiz/trunk/applications: commonext/widget/CommonScreens.xml content/src/org/ofbiz/content/data/DataEvents.java product/config/ProductUiLabels.xml

Author: jleroux
Date: Sat Oct 17 22:00:40 2015
New Revision: 1709213

URL: http://svn.apache.org/viewvc?rev=1709213&view=rev
Log:
Misc. non functional changes which were pending in my working copy

Modified:
    ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml

Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1709213&r1=1709212&r2=1709213&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sat Oct 17 22:00:40 2015
@@ -71,7 +71,7 @@ under the License.
                             <order-by field-name="-fromDate"/>
                         </entity-and>
                         <set field="orgContentId" from-field="orgPartyContentMap[0].contentId"/>
-                        <set field="orgPartyContent" value="${groovy: orgContentId!=null?&quot;/content/control/stream?contentId=&quot; + orgContentId : &quot;&quot;}"/>
+                        <set field="orgPartyContent" value="${groovy: orgContentId!=null?'/content/control/stream?contentId=' + orgContentId : ''}"/>
                         <set field="layoutSettings.organizationLogoLinkUrl" from-field="orgPartyContent" default-value="${orgPartyLogoMap.logoImageUrl}" global="true"/>
                         <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="${defaultCurrencyUomId}" global="true"/>
                         <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1709213&r1=1709212&r2=1709213&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java Sat Oct 17 22:00:40 2015
@@ -180,7 +180,7 @@ public class DataEvents {
             https = "true";
         }
 
-        // get the data resource stream and conent length
+        // get the data resource stream and content length
         Map<String, Object> resourceData;
         try {
             resourceData = DataResourceWorker.getDataResourceStream(dataResource, https, webSiteId, locale, contextRoot, false);

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1709213&r1=1709212&r2=1709213&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Oct 17 22:00:40 2015
@@ -8376,6 +8376,7 @@
     <property key="ImageManagementApplication">
         <value xml:lang="de">Bildverwaltungs Applikation</value>
         <value xml:lang="en">Image Management Application</value>
+        <value xml:lang="en">Application de gestion d'images</value>
         <value xml:lang="ja">画像管理アプリケーション</value>
         <value xml:lang="th">โปรแกรมจัดการรูปภาพ</value>
         <value xml:lang="vi">Ứng dụng quản lý hình ảnh</value>