Re: svn commit: r694183 - in /ofbiz/trunk/applications: ecommerce/config/EcommerceUiLabels.xml ecommerce/data/DemoProduct.xml securityext/email/default/passwordemail.ftl

[Jacques Le Roux]

Hi Ashish,

Why a CommonNewSmall in Ecommerce when there is already a CommonNew in Common, 
to keep it smaller in other languages ?
And should not CommonYourCapital better names EcommerceYourCapital ?

Thanks

Jacques

Author: ashish
Date: Thu Sep 11 01:51:39 2008
New Revision: 694183

URL: http://svn.apache.org/viewvc?rev=694183&view=rev
Log:
Some UI label change in passwordemail template.
Changed ${userLoginId} to ${userLogin.userLoginId}.

Modified:
   ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
   ofbiz/trunk/applications/ecommerce/data/DemoProduct.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=694183&r1=694182&r2=694183&view=diff

==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu Sep 11 
01:51:39 2008
@@ -977,6 +977,9 @@
        <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>
@@ -1029,6 +1032,9 @@
        <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>

Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?rev=694183&r1=694182&r2=694183&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Thu Sep 11 01:51:39 
2008
@@ -86,7 +86,7 @@

<ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="[EMAIL PROTECTED]"/>

- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="[EMAIL PROTECTED]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="[EMAIL PROTECTED]"/>

<ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="[EMAIL PROTECTED]" fromAddress="[EMAIL PROTECTED]"/>

Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl

URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?rev=694183&r1=694182&r2=694183&view=diff

==============================================================================
--- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl 
(original)
+++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Thu 
Sep 11 01:51:39 2008
@@ -23,6 +23,6 @@
<body>

<div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.CommonYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>

  <br/>

- <div>${uiLabelMap.CommonYour} <#if useEncryption>${uiLabelMap.CommonNew}</#if> ${uiLabelMap.EcommercePasswordIs} "${password}"</div> + <div>${uiLabelMap.CommonYourCapital} <#if useEncryption>${uiLabelMap.CommonNewSmall}</#if> ${uiLabelMap.EcommercePasswordIs} "${password}"</div>

</body>
</html>