You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/09/11 16:11:51 UTC

svn commit: r694264 - in /ofbiz/trunk/applications: ecommerce/config/EcommerceUiLabels.xml securityext/email/default/passwordemail.ftl

Author: ashish
Date: Thu Sep 11 07:11:49 2008
New Revision: 694264

URL: http://svn.apache.org/viewvc?rev=694264&view=rev
Log:
As per Bruno's comment on the Dev mailing list for keeping a single message instead of splitted word so that it will be easy to have new message in other language.

Thanks Bruno for your tip.

Modified:
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=694264&r1=694263&r2=694264&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu Sep 11 07:11:49 2008
@@ -977,9 +977,6 @@
         <value xml:lang="ru">больше чем</value>
         <value xml:lang="th">มากกว่า</value>
     </property>
-    <property key="CommonNewSmall">
-        <value xml:lang="en">new</value>
-    </property>
     <property key="CommonNewListSubscription">
         <value xml:lang="en">New List Subscription</value>
         <value xml:lang="es">Nueva lista de subscripción</value>
@@ -1032,9 +1029,6 @@
         <value xml:lang="it">tuo</value>
         <value xml:lang="th">ของคุณ</value>
     </property>
-    <property key="CommonYourCapital">
-        <value xml:lang="en">Your</value>
-    </property>
     <property key="EcommerceAccountLogin">
         <value xml:lang="en">Your account login is:</value>
         <value xml:lang="es">Usuario</value>
@@ -1481,6 +1475,12 @@
         <value xml:lang="th">ตะกร้าว่างเปล่า</value>
         <value xml:lang="zh">清空购物车</value>
     </property>
+    <property key="EcommerceNewPasswordMssgEncryptionOn">
+        <value xml:lang="en">Your new password is :- </value>
+    </property>        
+    <property key="EcommerceNewPasswordMssgEncryptionOff">
+        <value xml:lang="en">Your password is :- </value>
+    </property>        
     <property key="EcommerceEnterPromoCode">
         <value xml:lang="en">Enter Promo Code</value>
     </property>        

Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?rev=694264&r1=694263&r2=694264&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl (original)
+++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Thu Sep 11 07:11:49 2008
@@ -23,6 +23,13 @@
 <body>
   <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.CommonYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
   <br/>
-  <div>${uiLabelMap.CommonYourCapital} <#if useEncryption>${uiLabelMap.CommonNewSmall}</#if> ${uiLabelMap.EcommercePasswordIs} "${password}"</div>
+  <div>
+      <#if useEncryption>
+          ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOn}
+      <#else>
+          ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOff}
+      </#if> 
+      "${password}"
+  </div>
 </body>
 </html>