svn commit: r1762077 - in /ofbiz/trunk: build.gradle framework/common/config/CommonUiLabels.xml framework/webtools/config/WebtoolsUiLabels.xml

Author: jleroux
Date: Fri Sep 23 18:09:19 2016
New Revision: 1762077

URL: http://svn.apache.org/viewvc?rev=1762077&view=rev
Log:
Improves: Translate the svn and git info footers
(OFBIZ-7798)

We slightly changed the old format of the footer. The old format used only the
translated words _uiLabelMap.CommonBuiltOn_ and _uiLabelMap.CommonWith_.
On the other hand, the new format contains the words Branch, Revision,
Built On and Java Version.

We need to translate all four words in the CommonUiLabels.xml and then
incorporate them

old version:
" - Release-revision : ${releasePath}-r${info.entry.commit(revision)},  
${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith}
Java ${java.version}

new version:
"Branch: ${info.entry.url.text()}" + System.lineSeparator()
"Revision: ${info.entry.commit.@revision}" + System.lineSeparator()
"Built on: ${timestamp}" + System.lineSeparator()
"Java Version: ${org.gradle.internal.jvm.Jvm.current()}"

Thanks: Taher Alkhateeb for the 1st patch

Modified:
    ofbiz/trunk/build.gradle
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml

Modified: ofbiz/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1762077&r1=1762076&r2=1762077&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Fri Sep 23 18:09:19 2016
@@ -801,10 +801,10 @@ task gitInfoFooter(group: committerGroup
     revision = revisionOutput.toString()
     gitFooterFile.delete()
     gitFooterFile.createNewFile()
-    gitFooterFile << '${uiLabelMap.Branch} : ' + "${branch}" + System.lineSeparator()
-    gitFooterFile << '${uiLabelMap.Revision} : ' + "${revision}" + System.lineSeparator()
-    gitFooterFile << '${uiLabelMap.BuiltOn} : ' + "${timestamp}" + System.lineSeparator()
-    gitFooterFile << '${uiLabelMap.JavaVersion} : ' + "${org.gradle.internal.jvm.Jvm.current()}"
+    gitFooterFile << '${uiLabelMap.CommonBranch} : ' + "${branch}" + System.lineSeparator()
+    gitFooterFile << '${uiLabelMap.CommonRevision} : ' + "${revision}" + System.lineSeparator()
+    gitFooterFile << '${uiLabelMap.CommonBuiltOn} : ' + "${timestamp}" + System.lineSeparator()
+    gitFooterFile << '${uiLabelMap.CommonJavaVersion} : ' + "${org.gradle.internal.jvm.Jvm.current()}"
 }
 
 task svnInfoFooter(group: committerGroup, description: 'Update the Subversion revision info in the footer if Subversion is used') << {
@@ -824,10 +824,10 @@ task svnInfoFooter(group: committerGroup
     def info = new XmlParser().parseText(svnOutput.toString())
     svnFooterFile.delete()
     svnFooterFile.createNewFile()
-    svnFooterFile << '${uiLabelMap.Branch} : ' + "${info.entry.url.text()}" + System.lineSeparator()
-    svnFooterFile << '${uiLabelMap.Revision} : ' + "${info.entry.commit.@revision}" + System.lineSeparator()
-    svnFooterFile << '${uiLabelMap.BuiltOn} : ' + "${timestamp}" + System.lineSeparator()
-    svnFooterFile << '${uiLabelMap.JavaVersion} : ' + "${org.gradle.internal.jvm.Jvm.current()}"
+    svnFooterFile << '${uiLabelMap.CommonBranch} : ' + "${info.entry.url.text()}" + System.lineSeparator()
+    svnFooterFile << '${uiLabelMap.CommonRevision} : ' + "${info.entry.commit.@revision}" + System.lineSeparator()
+    svnFooterFile << '${uiLabelMap.CommonBuiltOn} : ' + "${timestamp}" + System.lineSeparator()
+    svnFooterFile << '${uiLabelMap.CommonJavaVersion} : ' + "${org.gradle.internal.jvm.Jvm.current()}"
 }
 
 /* ========================================================

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1762077&r1=1762076&r2=1762077&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Sep 23 18:09:19 2016
@@ -1363,6 +1363,10 @@
         <value xml:lang="zh-CN">让利</value>
         <value xml:lang="zh-TW">回報</value>
     </property>
+    <property key="CommonBranch">
+        <value xml:lang="en">branch</value>
+        <value xml:lang="fr">branche</value>
+    </property>
     <property key="CommonBuiltOn">
         <value xml:lang="en">built on</value>
         <value xml:lang="fr">compilée le</value>
@@ -5836,6 +5840,10 @@
         <value xml:lang="zh-CN">一月</value>
         <value xml:lang="zh-TW">一月</value>
     </property>
+    <property key="CommonJavaVersion">
+        <value xml:lang="en">with java version:</value>
+        <value xml:lang="fr">avec la version de Java : </value>
+    </property>
     <property key="CommonJuly">
         <value xml:lang="ar">يوليو</value>
         <value xml:lang="cs">Červenec</value>
@@ -9969,6 +9977,10 @@
         <value xml:lang="zh-CN">评论</value>
         <value xml:lang="zh-TW">評論</value>
     </property>
+    <property key="CommonRevision">
+        <value xml:lang="en">revision</value>
+        <value xml:lang="fr">révision</value>
+    </property>
     <property key="CommonRole">
         <value xml:lang="en">Role</value>
         <value xml:lang="nl">Rol</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1762077&r1=1762076&r2=1762077&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Fri Sep 23 18:09:19 2016
@@ -2843,18 +2843,6 @@
         <value xml:lang="zh">Java类型</value>
         <value xml:lang="zh-TW">JAVA類型</value>
     </property>
-    <property key="WebtoolsJavaVersionIs5">
-        <value xml:lang="de">Hinweis: Einige Funktionen benötigen Java 5; ist die Java-Version [${javaVer}] tatsächlich 5 oder höher?</value>
-        <value xml:lang="en">Note: certain things only work in Java 5. Java Version is ${javaVer}; is Java 5 ?</value>
-        <value xml:lang="fr">Note: certaines choses ne fonctionnent qu'avec Java 5. La version de Java est: ${javaVer}; c'est Java 5 ?</value>
-        <value xml:lang="it">Nota: certe cose funzionano solo con Java 5. Versione Java è ${javaVer}; è Java 5 ?</value>
-        <value xml:lang="ja">注意: Java 5 でのみ実行可能です。Java バージョンは ${javaVer}</value>
-        <value xml:lang="pt">Nota: certas coisas só funcionam em Java 5. A versão Java é de R ${javaVer}; é Java 5?</value>
-        <value xml:lang="th">หมายเหตุ: การทำงานบางอย่างจะต้องทำใน Java 5. Java เวอร์ชันที่${javaVer};  Java 5 ?</value>
-        <value xml:lang="vi">Ghi chú: chỉ thá»±c hiện được trên Java 5. Phiên bản Java của bạn ${javaVer} có phải là Java 5?</value>
-        <value xml:lang="zh">注意：某些程序只能运行在Java 5下。Java版本是${javaVer}；是Java 5吗？</value>
-        <value xml:lang="zh-TW">注意:某些程式只能執行在JAVA 5下.JAVA版本是${javaVer};是JAVA 5嗎？</value>
-    </property>
     <property key="WebtoolsJob">
         <value xml:lang="de">Job</value>
         <value xml:lang="en">Job</value>