This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push: new 5988e27 Improved: Implement the pretty print for keyword search 5988e27 is described below commit 5988e27a0d80a891f01e34a9a835ceb6a4d3119a Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Thu Mar 26 11:07:29 2020 +0100 Improved: Implement the pretty print for keyword search (OFBIZ-11476) With OFBIZ-9164 and r1835891 I introduced keywordConstraint::prettyPrintConstraint without implementation. So the information is missing at top of page. This implements it. It also amends 2 French labels --- applications/product/config/ProductUiLabels.xml | 4 ++-- .../main/java/org/apache/ofbiz/product/product/ProductSearch.java | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml index 83b4a5e..421353b 100644 --- a/applications/product/config/ProductUiLabels.xml +++ b/applications/product/config/ProductUiLabels.xml @@ -29031,7 +29031,7 @@ <value xml:lang="de">Sie haben gesucht nach</value> <value xml:lang="en">you searched for</value> <value xml:lang="es">ha buscado por</value> - <value xml:lang="fr">Vous avez recherché</value> + <value xml:lang="fr">vous avez recherché</value> <value xml:lang="it">tu hai cercato</value> <value xml:lang="ja">検索対象は</value> <value xml:lang="ro">tu ai cautat</value> @@ -29075,7 +29075,7 @@ <value xml:lang="de">Produkte suchen</value> <value xml:lang="en">Search Products</value> <value xml:lang="es">Buscar Productos</value> - <value xml:lang="fr">Rechercher l'article</value> + <value xml:lang="fr">Recherche d'articles</value> <value xml:lang="it">Ricerca prodotti</value> <value xml:lang="ja">製品を検索</value> <value xml:lang="nl">Zoeken producten</value> diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java index 744f9b1..48e6532 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java @@ -1662,12 +1662,9 @@ public class ProductSearch { return true; } - /* (non-Javadoc) - * @see org.apache.ofbiz.product.product.ProductSearch.ProductSearchConstraint#prettyPrintConstraint(org.apache.ofbiz.service.LocalDispatcher, boolean, java.util.Locale) - */ @Override public String prettyPrintConstraint(LocalDispatcher dispatcher, boolean detailed, Locale locale) { - return null; + return this.keywordsString; } }