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 2009/10/26 18:41:42 UTC

svn commit: r829875 - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/order/webapp/ordermgr/entry/catalog/ applications/product/config/ applications/product/webapp/catalog/find/ applications/workeffort/webapp/workeffort/find/ fra...

Author: jleroux
Date: Mon Oct 26 17:41:41 2009
New Revision: 829875

URL: http://svn.apache.org/viewvc?rev=829875&view=rev
Log:
Please gents, no words sentences, thanks

Modified:
    ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
    ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl

Modified: ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl Mon Oct 26 17:41:41 2009
@@ -104,7 +104,7 @@
             <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
             <div class="tabletext">
               ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input type="radio" name="clearSearch" value="Y" checked>
-              ${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch} <input type="radio" name="clearSearch" value="N">
+              ${uiLabelMap.CommonRefineSearch} <input type="radio" name="clearSearch" value="N">
             </div>
         </td>
       </tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Mon Oct 26 17:41:41 2009
@@ -120,7 +120,7 @@
             <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
             <div>
               ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked>
-              ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N">
+              ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N">
             </div>
         </td>
       </tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Mon Oct 26 17:41:41 2009
@@ -27,7 +27,7 @@
 <br/>
 <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
 <br/>
-<div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductRefineSearch}</a></div>
+<div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div>
 
 <#if !productIds?has_content>
   <h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Oct 26 17:41:41 2009
@@ -17403,20 +17403,6 @@
         <value xml:lang="th">(คุณต้องสร้างกลุ่มถึงการเปลี่ยนแปลงนี้อีกครั้ง)</value>
         <value xml:lang="zh">(要修改这个，你必须重新创建关联。)</value>
     </property>
-    <property key="ProductRefineSearch">
-        <value xml:lang="cs">Detailní hledání</value>
-        <value xml:lang="de">Verfeinerte Suche</value>
-        <value xml:lang="en">Refine Search</value>
-        <value xml:lang="es">Afinar búsqueda</value>
-        <value xml:lang="fr">Affiner la recherche</value>
-        <value xml:lang="it">Raffina la ricerca</value>
-        <value xml:lang="ja">Refine Search</value>
-        <value xml:lang="nl">Zoeken verfijnen</value>
-        <value xml:lang="ro">Rafineaza Cautarea</value>
-        <value xml:lang="ru">Уточнить поиск</value>
-        <value xml:lang="th">ปรับปรุงการค้นหา</value>
-        <value xml:lang="zh">提炼搜索</value>
-    </property>
     <property key="ProductRegularPrice">
         <value xml:lang="cs">Obvyklá cena</value>
         <value xml:lang="de">Regulärer Preis</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Mon Oct 26 17:41:41 2009
@@ -300,7 +300,7 @@
                 <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
                 <div>
                   ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked"/>
-                  ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/>
+                  ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"/>
                 </div>
             </td>
           </tr>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Mon Oct 26 17:41:41 2009
@@ -25,7 +25,7 @@
       <div>&nbsp;<a href="<@o...@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
     </#list>
     <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
-    <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div>
+    <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div>
 
     <#if !productIds?has_content>
       <br/><h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Mon Oct 26 17:41:41 2009
@@ -151,7 +151,7 @@
                 <div class="label">${uiLabelMap.CommonSortedBy} ${searchSortOrderString}</div>
                 <div>
                   ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked/>
-                  ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/>
+                  ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"/>
                 </div>
             </td>
           </tr>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Mon Oct 26 17:41:41 2009
@@ -25,7 +25,7 @@
         <div>&nbsp;<a href="<@o...@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
     </#list>
     <div><span class="label">${uiLabelMap.CommonSortedBy}</span> ${searchSortOrderString}</div>
-    <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div>
+    <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div>
 
     <#if !workEffortIds?has_content>
       <br/><h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Oct 26 17:41:41 2009
@@ -5815,6 +5815,20 @@
         <value xml:lang="zh">提炼</value>
         <value xml:lang="zh_CN">精炼</value>
     </property>
+    <property key="CommonRefineSearch">
+        <value xml:lang="cs">Detailní hledání</value>
+        <value xml:lang="de">Verfeinerte Suche</value>
+        <value xml:lang="en">Refine Search</value>
+        <value xml:lang="es">Afinar búsqueda</value>
+        <value xml:lang="fr">Affiner la recherche</value>
+        <value xml:lang="it">Raffina la ricerca</value>
+        <value xml:lang="ja">Refine Search</value>
+        <value xml:lang="nl">Zoeken verfijnen</value>
+        <value xml:lang="ro">Rafineaza Cautarea</value>
+        <value xml:lang="ru">Уточнить поиск</value>
+        <value xml:lang="th">ปรับปรุงการค้นหา</value>
+        <value xml:lang="zh">提炼搜索</value>
+    </property>    
     <property key="CommonRefresh">
         <value xml:lang="ar">تحديث</value>
         <value xml:lang="de">Aktualisieren</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Mon Oct 26 17:41:41 2009
@@ -88,7 +88,7 @@
             <div>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div>
             <div>
               ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked"/>
-              ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/>
+              ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"/>
             </div>
         </td>
       </tr>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl?rev=829875&r1=829874&r2=829875&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl Mon Oct 26 17:41:41 2009
@@ -79,7 +79,7 @@
             <div class="tabletext">${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div>
             <div class="tabletext">
               ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked>
-              ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N">
+              ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N">
             </div>
         </td>
       </tr>