svn commit: r1625006 - in /ofbiz/trunk: build.xml framework/common/config/CommonUiLabels.xml themes/bizznesstime/includes/footer.ftl themes/droppingcrumbs/includes/footer.ftl themes/flatgrey/includes/footer.ftl themes/tomahawk/includes/footer.ftl

Mon, 15 Sep 2014 05:09:13 -0700 

Author: jleroux
Date: Mon Sep 15 12:08:08 2014
New Revision: 1625006

URL: http://svn.apache.org/r1625006
Log:
Better way for deployed-date-time ant target, now deployed-on
Still in discussion in dev ML, notably if we should backport

Put back the CommonDepth label inadvertently removed, thanks to Scott's review

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
    ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
    ofbiz/trunk/themes/flatgrey/includes/footer.ftl
    ofbiz/trunk/themes/tomahawk/includes/footer.ftl

Modified: ofbiz/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon Sep 15 12:08:08 2014
@@ -263,18 +263,18 @@ under the License.
         <echo message="Done!"/>
     </target>
     
-    <target name="deployed-date-time"
+    <target name="deployed-on"
         description="Set the date and time of last deployment info in the 
footer.">
         <tstamp>
-            <format property="dateTime" pattern="yyyy/MM/dd HH:mm:ss"/>
+            <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
         </tstamp>
-        <echo message="${dateTime}" file="runtime/deployedThe.ftl"/>
+        <echo message="${dateTime}" file="runtime/deployedOn.ftl"/>
         <echo message="Done!"/>
     </target>
 
-    <target name="clean-deployed-date-time">
-        <echo message="Resetting deployed-date-time..."/>
-        <echo message=" " file="runtime/deployedThe.ftl"/>
+    <target name="clean-deployed-on">
+        <echo message="Resetting deployed-on..."/>
+        <delete file="runtime/deployedOn.ftl"/>
         <echo message="Done!"/>
     </target>    
     

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Sep 15 12:08:08 
2014
@@ -2766,8 +2766,28 @@
         <value xml:lang="zh">删除该小窗口</value>
         <value xml:lang="zh_TW">删除此Portlet</value>
     </property>
-    <property key="CommonDeployedThe">
-        <value xml:lang="en">Deployed the</value>
+    <property key="CommonDepth">
+        <value xml:lang="ar">عمق</value>
+        <value xml:lang="cs">Hloubka</value>
+        <value xml:lang="de">Tiefe</value>
+        <value xml:lang="en">Depth</value>
+        <value xml:lang="es">Profundidad</value>
+        <value xml:lang="fr">Profondeur</value>
+        <value xml:lang="hi-IN">गहराई</value>
+        <value xml:lang="it">Profondità</value>
+        <value xml:lang="ja">深度</value>
+        <value xml:lang="nl">Diepte</value>
+        <value xml:lang="pt">Profundidade</value>
+        <value xml:lang="ro">Adancime</value>
+        <value xml:lang="ru">Глубина</value>
+        <value xml:lang="th">ความลึก</value>
+        <value xml:lang="vi">Độ dày</value>
+        <value xml:lang="zh">深度</value>
+        <value xml:lang="zh-CN">深度</value>
+        <value xml:lang="zh_TW">深度</value>
+    </property>
+    <property key="CommonDeployedOn">
+        <value xml:lang="en">Deployed on</value>
         <value xml:lang="fr">Déployé le</value>
     </property>
     <property key="CommonDescription">

Modified: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/footer.ftl?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/footer.ftl Mon Sep 15 12:08:08 2014
@@ -28,7 +28,11 @@ under the License.
     <div class="poweredBy">
       <span>
         ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org"; 
class="noicon">OFBiz</a></span><span>Copyright 
2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org"; 
class="noicon">The Apache Software Foundation - www.apache.org</a>
-        <#include "ofbizhome://runtime/svninfo.ftl" /> <#include 
"ofbizhome://runtime/gitinfo.ftl" /> <#attempt> - 
${uiLabelMap.CommonDeployedThe} <#include "ofbizhome://runtime/deployedThe.ftl" 
/><#recover></#attempt>
+        <#include "ofbizhome://runtime/svninfo.ftl" /> <#include 
"ofbizhome://runtime/gitinfo.ftl" /> 
+        <#assign isDeployed = 
Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
+        <#if isDeployed == "true">
+          - ${uiLabelMap.CommonDeployedOn} <#include 
"ofbizhome://runtime/deployedOn.ftl" />
+        </#if>
       </span>
     </div> 
 </div>

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Mon Sep 15 12:08:08 
2014
@@ -28,7 +28,10 @@ under the License.
   <p>
     ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The 
Apache Software Foundation - <a href="http://www.apache.org"; 
target="_blank">www.apache.org</a><br />
     ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org"; 
target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> 
<#include "ofbizhome://runtime/gitinfo.ftl" />
-    <#attempt> - ${uiLabelMap.CommonDeployedThe} <#include 
"ofbizhome://runtime/deployedThe.ftl" /><#recover></#attempt>
+    <#assign isDeployed = 
Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
+    <#if isDeployed == "true">
+      - ${uiLabelMap.CommonDeployedOn} <#include 
"ofbizhome://runtime/deployedOn.ftl" />
+    </#if>
   </p>
 </div>
 <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>

Modified: ofbiz/trunk/themes/flatgrey/includes/footer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Mon Sep 15 12:08:08 2014
@@ -25,7 +25,10 @@ under the License.
   <p>
     ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a 
href="http://www.apache.org"; target="_blank">The Apache Software 
Foundation</a>. 
     ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org"; 
target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> 
<#include "ofbizhome://runtime/gitinfo.ftl" />
-    <#attempt> - ${uiLabelMap.CommonDeployedThe} <#include 
"ofbizhome://runtime/deployedThe.ftl" /><#recover></#attempt>
+    <#assign isDeployed = 
Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
+    <#if isDeployed == "true">
+      - ${uiLabelMap.CommonDeployedOn} <#include 
"ofbizhome://runtime/deployedOn.ftl" />
+    </#if>
   </p>
 </div>
 </div>

Modified: ofbiz/trunk/themes/tomahawk/includes/footer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/footer.ftl?rev=1625006&r1=1625005&r2=1625006&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/footer.ftl Mon Sep 15 12:08:08 2014
@@ -24,7 +24,10 @@ under the License.
     <li>
       ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} 
The Apache Software Foundation - <a href="http://www.apache.org"; 
target="_blank">www.apache.org</a><br/>
       ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org"; 
target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> 
<#include "ofbizhome://runtime/gitinfo.ftl" />
-      <#attempt> - ${uiLabelMap.CommonDeployedThe} <#include 
"ofbizhome://runtime/deployedThe.ftl" /><#recover> </#attempt>
+      <#assign isDeployed = 
Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
+      <#if isDeployed == "true">
+        - ${uiLabelMap.CommonDeployedOn} <#include 
"ofbizhome://runtime/deployedOn.ftl" />
+      </#if>
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a 
href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
 Static["java.util.TimeZone"].LONG, locale)}</a>

Reply via email to