Skip to content

Commit c8f43b5

Browse files
computatecomputate
authored
Merge pull request #27 from computate/computate
computate
2 parents 463fad7 + 09c5595 commit c8f43b5

File tree

2 files changed

+68
-72
lines changed

2 files changed

+68
-72
lines changed

‎src/main/java/org/computate/frFR/java/EcrirePageClasse.java‎

Lines changed: 67 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,7 @@ public void pageCodeClasseJava(String langueNom, JsonObject langueConfig) throws
938938
classeAdjectifVar = classeDoc.getString("classeAdjectifVar" + "_" + langueNom + "_stored_string");
939939
classeNomAdjectifSingulier = classeDoc.getString("classeNomAdjectifSingulier" + "_" + langueNom + "_stored_string");
940940
classeNomAdjectifPluriel = classeDoc.getString("classeNomAdjectifPluriel" + "_" + langueNom + "_stored_string");
941+
classeRechercherTousNom = classeDoc.getString("classeRechercherTousNom" + "_" + langueNom + "_stored_string");
941942
classeCe = classeDoc.getString("classeCe" + "_" + langueNom + "_stored_string");
942943
classeUn = classeDoc.getString("classeUn" + "_" + langueNom + "_stored_string");
943944
classeNomActuel = classeDoc.getString("classeNomActuel" + "_" + langueNom + "_stored_string");
@@ -5218,38 +5219,31 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
52185219

52195220
public void ecrirePageRechercheAucun(String langueNom, JsonObject i18nPage) throws Exception {
52205221

5221-
///////////////////
5222-
// htmBodyCount0 //
5223-
///////////////////
5224-
5225-
tl(4, "<div class=\"", composantsWebPrefixe, "flank\">");
5226-
tl(5, "<div>");
5227-
tl(5, "{% if varsFqCount > 1 %}");
5228-
tl(5, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip></", composantsWebPrefixe, "tooltip>");
5229-
tl(5, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5230-
tl(6, "<i class=\"{{ FONTAWESOME_STYLE }} fa-angle-left\"></i>");
5231-
tl(6, classeTousNom);
5232-
tl(5, "</", composantsWebPrefixe, "button>");
5233-
tl(5, "{% endif %}");
5234-
tl(4, "</div>");
5235-
t(5, "<h1>");
5236-
s(classeIcone);
5237-
s(" <span>", classeNomAdjectifPluriel, "</span>");
5238-
l("</h1>");
5239-
tl(4, "</div>");
5240-
5241-
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
5242-
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
5243-
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
5222+
///////////////////
5223+
// htmBodyCount0 //
5224+
///////////////////
52445225

5245-
tl(4, "<h2>");
5246-
tl(5, "<span>");
5247-
tl(1, "{% if ", i18nPage.getString(I18n.var_classeIconeClassesCss), " is defined %}");
5248-
tl(6, "<i class=\"{{ ", i18nPage.getString(I18n.var_classeIconeClassesCss), " }} site-menu-icon \"></i>");
5249-
tl(1, "{% endif %}");
5250-
tl(6, "<span class=\"\">", classeAucunNomTrouve, "</span>");
5251-
tl(5, "</span>");
5252-
tl(4, "</h2>");
5226+
tl(4, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-3xl \">");
5227+
tl(5, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip></", composantsWebPrefixe, "tooltip>");
5228+
tl(5, "<", composantsWebPrefixe, "breadcrumb>");
5229+
tl(6, "<", composantsWebPrefixe, "breadcrumb-item id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5230+
tl(7, classeIcone);
5231+
tl(7, classeTousNom);
5232+
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5233+
tl(6, "<", composantsWebPrefixe, "breadcrumb-item>");
5234+
t(7).sx(classeAucunNomTrouve).l();
5235+
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5236+
tl(5, "</", composantsWebPrefixe, "breadcrumb>");
5237+
5238+
tl(5, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "align-items-center \">");
5239+
tl(6, "<div class=\"", composantsWebPrefixe, "heading-3xl \">");
5240+
tl(7, classeIcone);
5241+
tl(6, "</div>");
5242+
tl(6, "<span class=\"", composantsWebPrefixe, "heading-m \">", classeAucunNomTrouve, "</span>");
5243+
tl(6, "<p class=\"", composantsWebPrefixe, "caption-l \">", classeDescription, "</p>");
5244+
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
5245+
tl(5, "</div>");
5246+
tl(4, "</div>");
52535247
}
52545248

52555249
public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) throws Exception {
@@ -5369,49 +5363,55 @@ public void ecrirePageBoutonsPagination(String langueNom, JsonObject i18nPage) t
53695363
o = auteurBoutonsPaginationJinja;
53705364

53715365
l();
5372-
tl(5, "<div id=\"htm", i18nPage.getString(I18n.var_BoutonsPagination), "\">");
5373-
tl(6, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_precedents), classeNomAdjectifPluriel), "\"></", composantsWebPrefixe, "tooltip>");
5374-
tl(6, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_la_moitie_des_resultats), classeNomAdjectifPluriel), "\"></", composantsWebPrefixe, "tooltip>");
5375-
tl(6, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_le_double_des_resultats), classeNomAdjectifPluriel), "\"></", composantsWebPrefixe, "tooltip>");
5376-
tl(6, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_suivants), classeNomAdjectifPluriel), "\"></", composantsWebPrefixe, "tooltip>");
5377-
tl(6, "<", composantsWebPrefixe, "button-group>");
5378-
t(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill");
5366+
5367+
tl(5, "<div class=\"", composantsWebPrefixe, "split \">");
5368+
tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Precedent), "\" placement=\"top\"", "wa-".equals(composantsWebPrefixe) ? ">" : " content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_precedents), classeNomAdjectifPluriel), "", "wa-".equals(composantsWebPrefixe) ? "" : "\">", "</", composantsWebPrefixe, "tooltip>");
5369+
tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Diminuer), "\" placement=\"top\"", "wa-".equals(composantsWebPrefixe) ? ">" : " content=\"", String.format(i18nPage.getString(I18n.str_Afficher_la_moitie_des_resultats), classeNomAdjectifPluriel), "", "wa-".equals(composantsWebPrefixe) ? "" : "\">", "</", composantsWebPrefixe, "tooltip>");
5370+
tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Augmenter), "\" placement=\"top\"", "wa-".equals(composantsWebPrefixe) ? ">" : " content=\"", String.format(i18nPage.getString(I18n.str_Afficher_le_double_des_resultats), classeNomAdjectifPluriel), "", "wa-".equals(composantsWebPrefixe) ? "" : "\">", "</", composantsWebPrefixe, "tooltip>");
5371+
tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Suivant), "\" placement=\"top\"", "wa-".equals(composantsWebPrefixe) ? ">" : " content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_suivants), classeNomAdjectifPluriel), "", "wa-".equals(composantsWebPrefixe) ? "" : "\">", "</", composantsWebPrefixe, "tooltip>");
5372+
tl(6, "<div class=\"", composantsWebPrefixe, "caption-l \">{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i18nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }} ", classeNomPluriel, "</div>");
5373+
tl(6, "<", composantsWebPrefixe, "button-group size=\"small\" class=\"", composantsWebPrefixe, "cluster ", composantsWebPrefixe, "gap-xs \" id=\"htm", i18nPage.getString(I18n.var_BoutonsPagination), "\">");
5374+
5375+
t(7, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Precedent), "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline");
53795376
s("{% if pagination.page", i18nPage.getString(I18n.var_Precedent), " is defined %}");
53805377
s(" href=\"{{pageUri}}?start={{pagination.page", i18nPage.getString(I18n.var_Precedent), ".", i18nPage.getString(I18n.var_debut), "}}&amp;rows={{pagination.", i18nPage.getString(I18n.var_lignes), "}}\"");
53815378
s("{% else %}");
53825379
s(" disabled");
53835380
s("{% endif %}");
53845381
l(">");
53855382
tl(8, "<i slot=\"prefix\" class=\"{{ FONTAWESOME_STYLE }} fa-arrow-square-left \"></i>");
5383+
tl(8, i18nPage.getString(I18n.str_Precedent));
53865384
tl(7, "</", composantsWebPrefixe, "button>");
53875385

5388-
t(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
5386+
t(7, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Diminuer), "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
53895387
s("{% if pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Precedent), " >= pagination['1L'] %}");
53905388
s(" href=\"{{pageUri}}?start={{pagination.", i18nPage.getString(I18n.var_debut), "}}&amp;rows={{ pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Precedent), " }}\"");
53915389
s("{% else %}");
53925390
s(" disabled");
53935391
s("{% endif %}");
53945392
l(">");
53955393
tl(8, "<i slot=\"prefix\" class=\"{{ FONTAWESOME_STYLE }} fa-minus-square \"></i>");
5394+
tl(8, i18nPage.getString(I18n.str_Moins));
53965395
tl(7, "</", composantsWebPrefixe, "button>");
53975396

5398-
t(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
5397+
t(7, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Augmenter), "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
53995398
s(" href=\"{{pageUri}}?start={{pagination.", i18nPage.getString(I18n.var_debut), "}}&amp;rows={{ pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Prochaine), " }}\"");
54005399
l(">");
54015400
tl(8, "<i slot=\"prefix\" class=\"{{ FONTAWESOME_STYLE }} fa-plus-square \"></i>");
5401+
tl(8, i18nPage.getString(I18n.str_Plus));
54025402
tl(7, "</", composantsWebPrefixe, "button>");
54035403

5404-
t(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill");
5404+
t(7, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_BoutonsPagination), i18nPage.getString(I18n.var_Suivant), "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline");
54055405
s("{% if pagination.page", i18nPage.getString(I18n.var_Prochaine), " is defined %}");
54065406
s(" href=\"{{pageUri}}?start={{pagination.page", i18nPage.getString(I18n.var_Prochaine), ".", i18nPage.getString(I18n.var_debut), "}}&amp;rows={{pagination.", i18nPage.getString(I18n.var_lignes), "}}\"");
54075407
s("{% else %}");
54085408
s(" disabled");
54095409
s("{% endif %}");
54105410
l(">");
5411-
tl(8, "<i slot=\"prefix\" class=\"{{ FONTAWESOME_STYLE }} fa-arrow-square-right \"></i>");
5411+
tl(8, i18nPage.getString(I18n.str_Suivant));
5412+
tl(8, "<i slot=\"suffix\" class=\"{{ FONTAWESOME_STYLE }} fa-arrow-square-right \"></i>");
54125413
tl(7, "</", composantsWebPrefixe, "button>");
54135414
tl(6, "</", composantsWebPrefixe, "button-group>");
5414-
tl(6, "<div>{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i18nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }} ", classeNomPluriel, "</div>");
54155415
tl(5, "</div>");
54165416

54175417
o = oAncien;
@@ -5453,18 +5453,6 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
54535453
tl(0, "{{ super() }}");
54545454
tl(0, "{%- block htmBody", i18nPage.getString(I18n.var_Debut), classePageNomSimple, " %}");
54555455

5456-
tl(0, "{% if ", varResultat, "Count > 0 %}");
5457-
t(5, "<h1>");
5458-
s("<a href=\"{{pageUri}}\">");
5459-
s(classeIcone);
5460-
s(" <span>", classeNomAdjectifPluriel, "</span>");
5461-
s("</a>");
5462-
l("</h1>");
5463-
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");
5464-
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
5465-
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
5466-
tl(0, "{% endif %}");
5467-
54685456
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Debut), classePageNomSimple, " %}");
54695457
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Debut), classePageSuperNomSimple, " %}");
54705458
l();
@@ -5477,6 +5465,8 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
54775465
tl(0, "{% else %}");
54785466

54795467
tl(0, "{%- include ", classePageBarreLateraleTemplate, " %}");
5468+
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");
5469+
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
54805470

54815471
tl(5, "<form action=\"", classeApiUri, "\" id=\"", classeApiClasseNomSimple, "Form\" class=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " \" onsubmit=\"event.preventDefault(); return false; \">");
54825472
t(6, "<input");
@@ -5504,15 +5494,18 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
55045494
// tl(7, "<h3 id=\"site-calendar-title\">Calendar</h3>");
55055495
tl(6, "<div id=\"site-calendar\"><!-- // --></div>");
55065496
tl(5, "</div>");
5507-
tl(5, "{% if varsFqCount > 1 %}");
5508-
tl(5, "<div class=\"margin-block\">");
5509-
tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip>");
5510-
tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5511-
tl(7, "<i class=\"{{ FONTAWESOME_STYLE }} fa-angle-left\"></i>");
5497+
5498+
tl(4, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-m \">");
5499+
tl(5, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip></", composantsWebPrefixe, "tooltip>");
5500+
tl(5, "<", composantsWebPrefixe, "breadcrumb>");
5501+
tl(6, "<", composantsWebPrefixe, "breadcrumb-item id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5502+
tl(7, classeIcone);
55125503
tl(7, classeTousNom);
5513-
tl(6, "</", composantsWebPrefixe, "button>");
5514-
tl(5, "</div>");
5515-
tl(5, "{% endif %}");
5504+
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5505+
tl(6, "<", composantsWebPrefixe, "breadcrumb-item>");
5506+
t(7).sx(classeRechercherTousNom).l();
5507+
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5508+
tl(5, "</", composantsWebPrefixe, "breadcrumb>");
55165509

55175510
/////////////////
55185511
// htmBodyTous //
@@ -5522,30 +5515,33 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
55225515
// tl(6, "{{ htm", i18nPage.getString(I18n.var_BoutonsPagination), classePageNomSimple, "() }}");
55235516

55245517
tl(5, "<div class=\"", composantsWebPrefixe, "flank ", composantsWebPrefixe, "align-items-baseline margin-block-start \">");
5525-
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
55265518
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
55275519
tl(5, "</div>");
5528-
tl(5, "<div class=\"card-like-thing background-color-surface-border\" id=\"site-results-grid\">");
5529-
tl(6, "<div>");
5520+
tl(5, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-0 \">");
5521+
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
5522+
tl(6, "<div class=\"card-like-thing background-color-surface-border\" id=\"site-results-grid\">");
5523+
tl(7, "<div>");
55305524
s(wTh);
5531-
tl(6, "</div>");
5525+
tl(7, "</div>");
55325526
// TODO
55335527
// tl(2, "Map<String, Map<String, List<String>>> highlighting = ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse().getHighlighting();");
5534-
tl(6, "{% for item in ", i18nPage.getString(I18n.var_liste), classeApiClasseNomSimple, "%}");
5528+
tl(7, "{% for item in ", i18nPage.getString(I18n.var_liste), classeApiClasseNomSimple, "%}");
55355529
// TODO
55365530
// tl(3, classeApiClasseNomSimple, " o = ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getList().get(i);");
55375531
// tl(3, "Map<String, List<String>> highlights = highlighting == null ? null : highlighting.get(o.getId());");
55385532
// tl(3, "List<String> highlightList = highlights == null ? null : highlights.get(highlights.keySet().stream().findFirst().orElse(null));");
55395533
// tl(3, "String uri = ", classeEntiteVars.contains("pageUri") ? "o.getPageUri()" : (q(classePageUriMethode, "/") + " + o.get" + StringUtils.capitalize(classeVarClePrimaire) + "()"), ";");
5540-
tl(6, "<div>");
5534+
tl(7, "<div>");
55415535
// tl(6, "<a href=\"{{ item.", classeVarUrlPageAffichage, " }}\">");
55425536
s(wTd);
55435537
// tl(6, "</a>");
5544-
tl(6, "</div>");
5545-
tl(6, "{% endfor %}");
5538+
tl(7, "</div>");
5539+
tl(7, "{% endfor %}");
55465540
// TODO
55475541
// tl(3, "SimpleOrderedMap facets = (SimpleOrderedMap)Optional.ofNullable(", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse()).map(QueryResponse::getResponse).map(r -> r.get(\"facets\")).orElse(new SimpleOrderedMap());");
55485542
s(wFoot);
5543+
tl(6, "</div>");
5544+
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
55495545
tl(5, "</div>");
55505546
tl(4, "</div>");
55515547
tl(0, "{% endif %}");

‎src/main/java/org/computate/frFR/java/IndexerClasse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5667,7 +5667,7 @@ else if("enUS".equals(langueNom)) {
56675667
classeTous = indexerStockerSolr(langueNom, classeDoc, "classeTous", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_TousNom), classeCommentaire, CONTEXTE_enUS_ToutesPluriel));
56685668
classeTousNom = indexerStockerSolr(langueNom, classeDoc, "classeTousNom", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_TousNom), classeCommentaire, CONTEXTE_enUS_ToutesPluriel + classeNomPluriel));
56695669
classeRechercherTousNomPar = indexerStockerSolr(langueNom, classeDoc, "classeRechercherTousNomPar", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_RechercherTousNomPar), classeCommentaire, CONTEXTE_enUS_Rechercher + classeNomPluriel + CONTEXTE_enUS_Par));
5670-
classeRechercherTousNom = indexerStockerSolr(langueNom, classeDoc, "classeRechercherTousNomr", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_RechercherTousNom), classeCommentaire, CONTEXTE_enUS_Rechercher + classeNomPluriel));
5670+
classeRechercherTousNom = indexerStockerSolr(langueNom, classeDoc, "classeRechercherTousNom", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_RechercherTousNom), classeCommentaire, CONTEXTE_enUS_Rechercher + classeNomPluriel));
56715671
classeAucunNomTrouve = indexerStockerSolr(langueNom, classeDoc, "classeAucunNomTrouve", regexLangue(langueNom, "^" + i18nGlobale.getString(I18n.var_AucunNomTrouve), classeCommentaire, CONTEXTE_enUS_AucuneTrouveAvant + classeNomSingulier + CONTEXTE_enUS_AucuneTrouveApres));
56725672

56735673
String suffixe = StringUtils.substringAfter(classeUnNom, " ");

0 commit comments

Comments
 (0)