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 2011/10/12 11:23:37 UTC
svn commit: r1182280 - in /ofbiz/trunk/specialpurpose/googlebase:
config/GoogleBaseUiLabels.xml webapp/googlebase/find/googleExportLink.ftl
widget/GoogleBaseScreens.xml
Author: jleroux
Date: Wed Oct 12 09:23:37 2011
New Revision: 1182280
URL: http://svn.apache.org/viewvc?rev=1182280&view=rev
Log:
Replaces an hardcoded label in an alert(). There are still some technical ones like "An error occured loading content! : " but I don't think it's worth the trouble to fix (more for developers)
Modified:
ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl
ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
Modified: ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=1182280&r1=1182279&r2=1182280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Wed Oct 12 09:23:37 2011
@@ -276,6 +276,10 @@
<value xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸²à¸¡à¸´à¹à¸à¸à¸£à¹à¸£à¸«à¸±à¸ªà¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">缺å°productCategoryIdåæ°</value>
</property>
+ <property key="productsExportToGoogle.missingProduct">
+ <value xml:lang="en">You have to choose any product(s)</value>
+ <value xml:lang="fr">Vous devez choisir un ou des produits</value>
+ </property>
<property key="productsExportToGoogle.noProductsAvailableInProductCategory">
<value xml:lang="en">No products available in the selected productCategoryId</value>
<value xml:lang="fr">Aucun article disponible dans la réf. de catégorie d'articles sélectionnée</value>
Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl?rev=1182280&r1=1182279&r2=1182280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl Wed Oct 12 09:23:37 2011
@@ -29,7 +29,7 @@ under the License.
document.products.action="<@o...@ofbizUrl>";
document.products.submit();
} else {
- alert("You have to choose any product(s).");
+ alert("${StringUtil.wrapString(uiLabelMap.productsExportToGoogle.missingProduct)}");
}
}
</script>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=1182280&r1=1182279&r2=1182280&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Wed Oct 12 09:23:37 2011
@@ -47,6 +47,7 @@ under the License.
<screen name="keywordsearch">
<section>
<actions>
+ <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitleSearchResults"/>
<script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/>
<script location="component://googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy"/>