You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/05/08 22:32:26 UTC
svn commit: r773088 - in /ofbiz/branches/release09.04: ./
specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
specialpurpose/webpos/webapp/webpos/includes/Messages.ftl
Author: jleroux
Date: Fri May 8 20:32:26 2009
New Revision: 773088
URL: http://svn.apache.org/viewvc?rev=773088&view=rev
Log:
revert r772893
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
ofbiz/branches/release09.04/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 8 20:32:26 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772887,773076
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,773076
Modified: ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=773088&r1=773087&r2=773088&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Fri May 8 20:32:26 2009
@@ -37,14 +37,14 @@
<#-- display the error messages -->
<#if (errorMessage?has_content || errorMessageList?has_content)>
- <div class="errorMessage">${uiLabelMap.CommonFollowingErrorsOccurred}:</div><br/>
+ <div class="errorMessage">Errors Occurred:</div><br/>
<ul>
<#if errorMessage?has_content>
- <li class="errorMessage">${StringUtil.wrapString(errorMessage)}</li>
+ <li class="errorMessage">${errorMessage}</li>
</#if>
<#if errorMessageList?has_content>
<#list errorMessageList as errorMsg>
- <li class="errorMessage">${StringUtil.wrapString(errorMsg)}</li>
+ <li class="errorMessage">${errorMsg}</li>
</#list>
</#if>
</ul>
@@ -53,14 +53,14 @@
<#-- display the event messages -->
<#if (eventMessage?has_content || eventMessageList?has_content)>
- <div class="eventMessage">${uiLabelMap.CommonFollowingOccurred}:</div><br/>
+ <div class="eventMessage">Events:</div><br/>
<ul>
<#if eventMessage?has_content>
- <li class="eventMessage">${StringUtil.wrapString(eventMessage)}</li>
+ <li class="eventMessage">${eventMessage}</li>
</#if>
<#if eventMessageList?has_content>
<#list eventMessageList as eventMsg>
- <li class="eventMessage">${StringUtil.wrapString(eventMsg)}</li>
+ <li class="eventMessage">${eventMsg}</li>
</#list>
</#if>
</ul>
Modified: ofbiz/branches/release09.04/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl?rev=773088&r1=773087&r2=773088&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl Fri May 8 20:32:26 2009
@@ -39,11 +39,11 @@
<#if (errorMessage?has_content || errorMessageList?has_content)>
<div class="errorPosMessage">
<#if errorMessage?has_content>
- <p>${StringUtil.wrapString(errorMessage)}</p>
+ <p>${errorMessage}</p>
</#if>
<#if errorMessageList?has_content>
<#list errorMessageList as errorMsg>
- <p>${StringUtil.wrapString(errorMsg)}</p>
+ <p>${errorMsg}</p>
</#list>
</#if>
</div>
@@ -53,11 +53,11 @@
<#if (eventMessage?has_content || eventMessageList?has_content)>
<div class="errorPosMessage">
<#if eventMessage?has_content>
- <p>${StringUtil.wrapString(eventMessage)}</p>
+ <p>${eventMessage}</p>
</#if>
<#if eventMessageList?has_content>
<#list eventMessageList as eventMsg>
- <p>${StringUtil.wrapString(eventMsg)}</p>
+ <p>${eventMsg}</p>
</#list>
</#if>
</div>