Done, Committed slightly modified version of the suggested patch. Thanks & Regards -- Deepak Dixit ofbiz.apache.org
On Thu, Mar 14, 2019 at 2:41 PM Deepak Dixit <[email protected]> wrote: > Sure Jacques, Will do > Thanks & Regards > -- > Deepak Dixit > ofbiz.apache.org > > > On Thu, Mar 14, 2019 at 2:16 PM Jacques Le Roux < > [email protected]> wrote: > >> Thanks Deepak, >> >> Unfortunately it's difficult to use it as us and I have not created a >> Jira for that. >> >> Could you please commit it? >> >> TIA >> >> Jacques >> >> Le 13/03/2019 à 06:42, Deepak Dixit a écrit : >> > Hi Jacques, >> > >> > I tested the following patch and it works >> > ===================== >> > >> > Index: build.gradle >> > >> > =================================================================== >> > >> > --- build.gradle (revision 1855081) >> > >> > +++ build.gradle (working copy) >> > >> > @@ -638,7 +638,7 @@ >> > >> > revision = revisionOutput.toString() >> > >> > gitFooterFile.delete() >> > >> > gitFooterFile.createNewFile() >> > >> > - gitFooterFile << '${uiLabelMap.CommonBranch} : ' + "${branch}" >> + >> > System.lineSeparator() >> > >> > + 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()}" >> > >> > @@ -663,7 +663,7 @@ >> > >> > def info = new XmlParser().parseText(svnOutput.toString()) >> > >> > svnFooterFile.delete() >> > >> > svnFooterFile.createNewFile() >> > >> > - svnFooterFile << '${uiLabelMap.CommonBranch} : ' + >> > "${info.entry.url.text()}" + System.lineSeparator() >> > >> > + 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()}" >> > >> > Index: framework/common/config/CommonUiLabels.xml >> > >> > =================================================================== >> > >> > --- framework/common/config/CommonUiLabels.xml (revision 1855081) >> > >> > +++ framework/common/config/CommonUiLabels.xml (working copy) >> > >> > @@ -1389,9 +1389,9 @@ >> > >> > <value xml:lang="zh-TW">回報</value> >> > >> > </property> >> > >> > <property key="CommonBranch"> >> > >> > - <value xml:lang="en"> branch</value> >> > >> > - <value xml:lang="es"> rama</value> >> > >> > - <value xml:lang="fr"> branche</value> >> > >> > + <value xml:lang="en">branch</value> >> > >> > + <value xml:lang="es">rama</value> >> > >> > + <value xml:lang="fr">branche</value> >> > >> > </property> >> > >> > <property key="CommonBuiltOn"> >> > >> > <value xml:lang="en">built on</value> >> > >> > >> > ===================== >> > >> > >> > Kind Regards, >> > Deepak Dixit >> > >> > On Wed, Mar 13, 2019 at 2:16 AM Jacques Le Roux < >> > [email protected]> wrote: >> > >> >> Actually I changed it there because it does not work in build.gradle >> where >> >> it's already >> >> >> >> gitFooterFile << '${uiLabelMap.CommonBranch} : ' + "${branch}" + >> >> System.lineSeparator() >> >> >> >> svnFooterFile << '${uiLabelMap.CommonBranch} : ' + >> >> "${info.entry.url.text()}" + System.lineSeparator() >> >> >> >> Jacques >> >> >> >> Le 12/03/2019 à 10:33, Jacques Le Roux a écrit : >> >>> Agreed Deepak, >> >>> >> >>> Makes sense, I 'll change that >> >>> >> >>> Thanks >> >>> >> >>> Jacques >> >>> >> >>> Le 12/03/2019 à 10:07, Deepak Dixit a écrit : >> >>>> Hi Jacques, >> >>>> >> >>>> I think instead of adding space in uiLabel it would be food if we add >> >> space in the template >> >>>> Thanks & Regards >> >>>> -- >> >>>> Deepak Dixit >> >>>> ofbiz.apache.org <http://ofbiz.apache.org> >> >>>> >> >>>> >> >>>> On Mon, Feb 25, 2019 at 4:03 PM <[email protected] <mailto: >> >> [email protected]>> wrote: >> >>>> Author: jleroux >> >>>> Date: Mon Feb 25 10:33:53 2019 >> >>>> New Revision: 1854306 >> >>>> >> >>>> URL: http://svn.apache.org/viewvc?rev=1854306&view=rev >> >>>> Log: >> >>>> Improved: no functional change >> >>>> >> >>>> A missing space before CommonBranch label made the word >> trunkbranch >> >> instead of >> >>>> trunk branch. >> >>>> >> >>>> I'll backport this >> >>>> >> >>>> Modified: >> >>>> >> >> >> ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml >> >>>> Modified: >> >> ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml >> >>>> URL: >> >>>> >> >> >> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1854306&r1=1854305&r2=1854306&view=diff >> >> >> >> ============================================================================== >> >>>> --- >> >> ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml >> >> (original) >> >>>> +++ >> >> ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml >> Mon >> >> Feb 25 10:33:53 2019 >> >>>> @@ -1389,9 +1389,9 @@ >> >>>> <value xml:lang="zh-TW">å›žå ±</value> >> >>>> </property> >> >>>> <property key="CommonBranch"> >> >>>> - <value xml:lang="en">branch</value> >> >>>> - <value xml:lang="es">rama</value> >> >>>> - <value xml:lang="fr">branche</value> >> >>>> + <value xml:lang="en"> branch</value> >> >>>> + <value xml:lang="es"> rama</value> >> >>>> + <value xml:lang="fr"> branche</value> >> >>>> </property> >> >>>> <property key="CommonBuiltOn"> >> >>>> <value xml:lang="en">built on</value> >> >>>> >> >>>> >> >
