svn commit: r537942 - in /ofbiz/trunk/applications: ecommerce/config/EcommerceUiLabels.properties ecommerce/config/EcommerceUiLabels_fr.properties securityext/email/default/passwordemail.ftl

Author: jleroux
Date: Mon May 14 11:31:25 2007
New Revision: 537942

URL: http://svn.apache.org/viewvc?view=rev&rev=537942
Log:
A patch from Nicolas Malin "Password request internationalization" (https://issues.apache.org/jira/browse/OFBIZ-984).

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

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?view=diff&rev=537942&r1=537941&r2=537942
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Mon May 14 11:31:25 2007
@@ -85,10 +85,12 @@
 CommonLessThan=less than
 CommonMessages=Messages
 CommonMoreThan=more than
+CommonNew=new
 CommonNewListSubscription=New List Subscription
 CommonSubscribe=Subscribe
 CommonUnsubscribe=Unsubscribe
 CommonVerifySubscription=Verify Subscription
+CommonYour=your
 EcommerceAccountLogin=Your account login is:
 EcommerceActive=Active
 EcommerceAddAlltoCart=Add All to Cart
@@ -104,6 +106,7 @@
 EcommerceAdjustments=Adjustments
 EcommerceAlwaysList=but will still be included if they are in these categories:
 EcommerceAlwaysViewCartAfterAddingAnItem=Always view cart after adding an item
+EcommerceANew=a new
 EcommerceAnonymous=Anonymous
 EcommerceArticleInformation=Article Information
 EcommerceAverageRating=Average Rating
@@ -240,6 +243,8 @@
 EcommerceOwningDepartment=Owning Department
 EcommerceParentList=Parent List
 EcommercePassword=With the password you set during registration.
+EcommercePasswordIs=password is
+EcommercePasswordSentToYou=password sent to you
 EcommercePieces=Pieces
 EcommercePointsFrom=points from
 EcommercePostAnonymous=Post Anonymous
@@ -308,6 +313,7 @@
 EcommerceToAddSelectedItemsToShoppingList=to add selected items to a shopping list
 EcommerceToCart=to Cart
 EcommerceToOrderCreateCustRequestFromCart=to create a request for quote
+EcommerceThisEmailIsInResponseToYourRequestToHave=This email is in response to your request to have
 EcommerceTotal=Total
 EcommerceTotalPrice=Total Price
 EcommerceUnitPrice=Unit Price

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_fr.properties?view=diff&rev=537942&r1=537941&r2=537942
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_fr.properties (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_fr.properties Mon May 14 11:31:25 2007
@@ -81,6 +81,8 @@
 AccountingUseGiftCardNotOnFile=La carte cadeau utilis\u00E9e n'existe pas
 AccountingVirtualCard=Carte virtuelle
 AccountingVisaMastercardAmexDiscover=Carte de cr\u00E9dit: Visa/Mastercard/Amex/Discover
+CommonNew=nouveau
+CommonYour=votre
 EcommerceAccountLogin=Votre identifiant est :
 EcommerceActive=Actif
 EcommerceAddAlltoCart=Ajouter tout au panier
@@ -94,6 +96,7 @@
 EcommerceAdjustment=Ajustement
 EcommerceAdjustments=Ajustements
 EcommerceAlwaysViewCartAfterAddingAnItem=Toujours voir le panier apr\u00E8s l'ajout d'un article
+EcommerceANew=un nouvel
 EcommerceAnonymous=Anonyme
 EcommerceArticleInformation=Information sur l'article
 EcommerceAverageRating=Classement moyen
@@ -213,6 +216,8 @@
 EcommerceOwningDepartment=%Service propri\u00E9taire%
 EcommerceParentList=Liste m\u00E8re
 EcommercePassword=Avec le mot de passe que vous avez choisi pendant l'enregistrement.
+EcommercePasswordIs=mot de passe est
+EcommercePasswordSentToYou=mot de passe
 EcommercePieces=Pi\u00E8ces
 EcommercePointsFrom=points depuis
 EcommercePostAnonymous=Envoyer en anonyme
@@ -282,6 +287,7 @@
 EcommerceToOrderCreateCustRequestFromCart=Pour faire une demande de devis
 EcommerceTotal=Total
 EcommerceTotalPrice=Prix total
+EcommerceThisEmailIsInResponseToYourRequestToHave=Cette email vous ait envoy\u00e9 suite \u00e0 votre demande d'obtenir
 EcommerceUnitPrice=Prix unitaire
 EcommerceUnsupportedQuestionType=Type de question non support\u00E9
 EcommerceUpdateSurvey="[Mettre \u00E0 jour le commentaire]"

Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?view=diff&rev=537942&r1=537941&r2=537942
==============================================================================
--- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl (original)
+++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Mon May 14 11:31:25 2007
@@ -21,8 +21,8 @@
 <head>
 </head>
 <body>
-  <div>This email is in response to your request to have <#if useEncryption>a new<#else>your</#if> password sent to you.</div>
+  <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.CommonYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
   <br/>
-  <div>Your <#if useEncryption>new</#if> password is "${password}"</div>
+  <div>${uiLabelMap.CommonYour} <#if useEncryption>${uiLabelMap.CommonNew}</#if> ${uiLabelMap.EcommercePasswordIs} "${password}"</div>
 </body>
 </html>