You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/12/27 17:23:43 UTC
svn commit: r729638 - in /ofbiz/trunk/applications:
ecommerce/config/EcommerceUiLabels.xml
ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
ecommerce/webapp/ecommerce/customer/viewprofile.ftl
securityext/email/default/passwordemail.ftl
Author: mrisaliti
Date: Sat Dec 27 08:23:42 2008
New Revision: 729638
URL: http://svn.apache.org/viewvc?rev=729638&view=rev
Log:
Renamed some Common labels in EcommerceUiLabels to Ecommerce in the same file (Part of OFBIZ-1780)
Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
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=729638&r1=729637&r2=729638&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Sat Dec 27 08:23:42 2008
@@ -19,18 +19,6 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <property key="CommonDigitalProductUpload">
- <value xml:lang="de">Digitales Produkt hochladen</value>
- <value xml:lang="en">Digital Product Upload</value>
- <value xml:lang="es">carga de productos digitales</value>
- <value xml:lang="fr">Téléchargement du produit numérique vers le serveur</value>
- <value xml:lang="hi_IN">à¤
à¤à¤à¥à¤¯ फल à¤
पलà¥à¤¡</value>
- <value xml:lang="it">Upload prodotto digitale</value>
- <value xml:lang="ro">Upload Produs Digital</value>
- <value xml:lang="ru">ÐагÑÑзка ÑиÑÑовой пÑодÑкÑии</value>
- <value xml:lang="th">à¹à¸«à¸¥à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸´à¸à¸´à¸à¸±à¸¥</value>
- <value xml:lang="zh">æ°å产åä¸ä¼ </value>
- </property>
<property key="CommonLessThan">
<value xml:lang="de">weniger als</value>
<value xml:lang="en">less than</value>
@@ -59,64 +47,6 @@
<value xml:lang="ru">болÑÑе Ñем</value>
<value xml:lang="th">มาà¸à¸à¸§à¹à¸²</value>
</property>
- <property key="CommonNewListSubscription">
- <value xml:lang="de">Neue Liste abonnieren</value>
- <value xml:lang="en">New List Subscription</value>
- <value xml:lang="es">Nueva lista de subscripción</value>
- <value xml:lang="fr">Nouvelle liste de souscription</value>
- <value xml:lang="it">Nuova lista di sottoscrizione</value>
- <value xml:lang="ro">Noua Lista Subscriere </value>
- <value xml:lang="ru">ÐÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñка на ÑаÑÑÑлкÑ</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¹à¸«à¸¡à¹</value>
- <value xml:lang="zh">æ°æ³¨åå表</value>
- </property>
- <property key="CommonSubscribe">
- <value xml:lang="de">Abonnieren</value>
- <value xml:lang="en">Subscribe</value>
- <value xml:lang="es">Subscricir</value>
- <value xml:lang="fr">S'inscrire</value>
- <value xml:lang="it">Sottoscrivi</value>
- <value xml:lang="ro">Subscrie </value>
- <value xml:lang="ru">ÐодпиÑаÑÑÑÑ</value>
- <value xml:lang="th">à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
- <value xml:lang="zh">注å</value>
- </property>
- <property key="CommonUnknown">
- <value xml:lang="de">Unbekannt</value>
- <value xml:lang="en">Unknown</value>
- <value xml:lang="fr">Inconnu</value>
- <value xml:lang="it">Sconosciuto</value>
- <value xml:lang="th">à¹à¸¡à¹à¸à¸£à¸²à¸</value>
- </property>
- <property key="CommonUnsubscribe">
- <value xml:lang="de">Abonnement beenden</value>
- <value xml:lang="en">Unsubscribe</value>
- <value xml:lang="es">des-Subscribir</value>
- <value xml:lang="fr">Se désinscrire</value>
- <value xml:lang="it">Annulla sottoscrizione</value>
- <value xml:lang="ro">Sterge Subscrierea</value>
- <value xml:lang="ru">ÐÑмениÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑкÑ</value>
- <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
- <value xml:lang="zh">注é</value>
- </property>
- <property key="CommonVerifySubscription">
- <value xml:lang="de">Abonnement prüfn</value>
- <value xml:lang="en">Verify Subscription</value>
- <value xml:lang="es">Verificar subscripción</value>
- <value xml:lang="fr">Vérifier son inscription</value>
- <value xml:lang="it">Verifica sottoscrizione</value>
- <value xml:lang="ro">Verifica Subscrierea</value>
- <value xml:lang="ru">ÐÑовеÑиÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑкÑ</value>
- <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
- <value xml:lang="zh">éªè¯æ³¨å</value>
- </property>
- <property key="CommonYour">
- <value xml:lang="de">Ihr</value>
- <value xml:lang="en">your</value>
- <value xml:lang="fr">Votre</value>
- <value xml:lang="it">tuo</value>
- <value xml:lang="th">à¸à¸à¸à¸à¸¸à¸</value>
- </property>
<property key="EcommerceAccountLogin">
<value xml:lang="de">Ihre Benutzeranmeldung ist:</value>
<value xml:lang="en">Your account login is:</value>
@@ -635,6 +565,18 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¹à¸²à¸à¸à¸¡à¸¡à¸´à¸à¸à¸±à¹à¸à¹à¸à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸´à¸à¸´à¸à¸±à¸¥</value>
<value xml:lang="zh">æ°å产åè´ä¹°åå²è®°å½åä½£é</value>
</property>
+ <property key="EcommerceDigitalProductUpload">
+ <value xml:lang="de">Digitales Produkt hochladen</value>
+ <value xml:lang="en">Digital Product Upload</value>
+ <value xml:lang="es">carga de productos digitales</value>
+ <value xml:lang="fr">Téléchargement du produit numérique vers le serveur</value>
+ <value xml:lang="hi_IN">à¤
à¤à¤à¥à¤¯ फल à¤
पलà¥à¤¡</value>
+ <value xml:lang="it">Upload prodotto digitale</value>
+ <value xml:lang="ro">Upload Produs Digital</value>
+ <value xml:lang="ru">ÐагÑÑзка ÑиÑÑовой пÑодÑкÑии</value>
+ <value xml:lang="th">à¹à¸«à¸¥à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸´à¸à¸´à¸à¸±à¸¥</value>
+ <value xml:lang="zh">æ°å产åä¸ä¼ </value>
+ </property>
<property key="EcommerceDownloadNotFound">
<value xml:lang="de">Datei zum Herunterladen nicht gefunden</value>
<value xml:lang="en">Download Not Found</value>
@@ -1607,6 +1549,17 @@
<value xml:lang="th">à¸à¸±à¸à¸à¸µà¸à¸à¸²à¸à¸²à¸£à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">æ°å»ºçµåèµé转账账æ·</value>
</property>
+ <property key="EcommerceNewListSubscription">
+ <value xml:lang="de">Neue Liste abonnieren</value>
+ <value xml:lang="en">New List Subscription</value>
+ <value xml:lang="es">Nueva lista de subscripción</value>
+ <value xml:lang="fr">Nouvelle liste de souscription</value>
+ <value xml:lang="it">Nuova lista di sottoscrizione</value>
+ <value xml:lang="ro">Noua Lista Subscriere </value>
+ <value xml:lang="ru">ÐÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñка на ÑаÑÑÑлкÑ</value>
+ <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¹à¸«à¸¡à¹</value>
+ <value xml:lang="zh">æ°æ³¨åå表</value>
+ </property>
<property key="EcommerceNoDigitalProductsFound">
<value xml:lang="de">Keine digitalen Produkte gefunden</value>
<value xml:lang="en">No Digital Products Found</value>
@@ -2527,6 +2480,17 @@
<value xml:lang="th">หัวà¸à¹à¸</value>
<value xml:lang="zh">主é¢</value>
</property>
+ <property key="EcommerceSubscribe">
+ <value xml:lang="de">Abonnieren</value>
+ <value xml:lang="en">Subscribe</value>
+ <value xml:lang="es">Subscricir</value>
+ <value xml:lang="fr">S'inscrire</value>
+ <value xml:lang="it">Sottoscrivi</value>
+ <value xml:lang="ro">Subscrie </value>
+ <value xml:lang="ru">ÐодпиÑаÑÑÑÑ</value>
+ <value xml:lang="th">à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
+ <value xml:lang="zh">注å</value>
+ </property>
<property key="EcommerceSummary">
<value xml:lang="de">Zusammenfassung</value>
<value xml:lang="en">Summary</value>
@@ -2706,6 +2670,17 @@
<value xml:lang="th">ราà¸à¸²à¸à¹à¸à¸«à¸à¹à¸§à¸¢</value>
<value xml:lang="zh">åä»·</value>
</property>
+ <property key="EcommerceUnsubscribe">
+ <value xml:lang="de">Abonnement beenden</value>
+ <value xml:lang="en">Unsubscribe</value>
+ <value xml:lang="es">des-Subscribir</value>
+ <value xml:lang="fr">Se désinscrire</value>
+ <value xml:lang="it">Annulla sottoscrizione</value>
+ <value xml:lang="ro">Sterge Subscrierea</value>
+ <value xml:lang="ru">ÐÑмениÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑкÑ</value>
+ <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
+ <value xml:lang="zh">注é</value>
+ </property>
<property key="EcommerceUnsupportedQuestionType">
<value xml:lang="de">Nicht unterstützter Fragetyp</value>
<value xml:lang="en">Unsupported Question Type</value>
@@ -2789,6 +2764,17 @@
<value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸ªà¸¹à¹à¸à¸°à¸à¸£à¹à¸²</value>
<value xml:lang="zh">çéæ©å°è´ç©è½¦</value>
</property>
+ <property key="EcommerceVerifySubscription">
+ <value xml:lang="de">Abonnement prüfn</value>
+ <value xml:lang="en">Verify Subscription</value>
+ <value xml:lang="es">Verificar subscripción</value>
+ <value xml:lang="fr">Vérifier son inscription</value>
+ <value xml:lang="it">Verifica sottoscrizione</value>
+ <value xml:lang="ro">Verifica Subscrierea</value>
+ <value xml:lang="ru">ÐÑовеÑиÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑкÑ</value>
+ <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¸à¹à¸²à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
+ <value xml:lang="zh">éªè¯æ³¨å</value>
+ </property>
<property key="EcommerceViewAll">
<value xml:lang="de">Alle anzeigen</value>
<value xml:lang="en">View All</value>
@@ -2905,6 +2891,13 @@
<value xml:lang="th">สิà¹à¸à¸à¸µà¹à¸à¹à¸²à¸ªà¸à¹à¸</value>
<value xml:lang="zh">ä½ å¯è½ä¼å欢</value>
</property>
+ <property key="EcommerceYour">
+ <value xml:lang="de">Ihr</value>
+ <value xml:lang="en">your</value>
+ <value xml:lang="fr">Votre</value>
+ <value xml:lang="it">tuo</value>
+ <value xml:lang="th">à¸à¸à¸à¸à¸¸à¸</value>
+ </property>
<property key="EcommerceYourCardNumber">
<value xml:lang="de">Ihre Kartennummer:</value>
<value xml:lang="en">Your Card Number</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=729638&r1=729637&r2=729638&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sat Dec 27 08:23:42 2008
@@ -48,7 +48,7 @@
</#list>
</select>
- <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
</form>
<#else>
<#-- Not logged in so ask them to log in and then sign up or clear the user association -->
@@ -62,7 +62,7 @@
<span class="tabletext">${uiLabelMap.EcommerceSignUpForContactListComments}</span>
<@contactList publicEmailContactLists=publicEmailContactLists/>
<input size="20" maxlength="255" name="email" class="inputBox" value="" type="text">
- <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
</form>
</#if>
</div>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=729638&r1=729637&r2=729638&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Dec 27 08:23:42 2008
@@ -41,7 +41,7 @@
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyShowOld}</a>
</#if>
<#if (productStore.enableDigProdUpload)?if_exists == "Y">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDigitalProductUpload}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceDigitalProductUpload}</a>
</#if>
</td>
</tr>
@@ -493,7 +493,7 @@
<td width="5"> </td>
<td width="20%" nowrap>
<#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUnsubscribe}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
<#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")>
<form method="post" action="<@o...@ofbizUrl>" name="clistAcceptForm${contactListParty_index}">
<input type="hidden" name="partyId" value="${party.partyId}"/>
@@ -501,10 +501,10 @@
<input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
<input type="hidden" name="statusId" value="CLPT_ACCEPTED"/>
<input type="text" size="10" name="optInVerifyCode" value="" class="inputBox"/>
- <input type="submit" value="${uiLabelMap.CommonVerifySubscription}" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/>
</form>
<#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSubscribe}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
</#if>
</td>
</tr>
@@ -515,7 +515,7 @@
<form method="post" action="<@o...@ofbizUrl>" name="clistPendingForm">
<input type="hidden" name="partyId" value="${party.partyId}"/>
<input type="hidden" name="statusId" value="CLPT_PENDING"/>
- <span class="tableheadtext">${uiLabelMap.CommonNewListSubscription}: </span>
+ <span class="tableheadtext">${uiLabelMap.EcommerceNewListSubscription}: </span>
<select name="contactListId" class="selectBox">
<#list publicContactLists as publicContactList>
<#-- <#assign publicContactListType = publicContactList.getRelatedOneCache("ContactListType")> -->
@@ -529,7 +529,7 @@
<option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option>
</#list>
</select>
- <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
</form>
</div>
<div class="tabletext">
Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?rev=729638&r1=729637&r2=729638&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl (original)
+++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Sat Dec 27 08:23:42 2008
@@ -21,7 +21,7 @@
<head>
</head>
<body>
- <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.CommonYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
+ <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.EcommerceYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
<br/>
<div>
<#if useEncryption>