Skip to content

Commit b6eccb1

Browse files
committed
Mostly finishing support for multiple language pages
1 parent 6c8114d commit b6eccb1

File tree

6 files changed

+2150
-2132
lines changed

6 files changed

+2150
-2132
lines changed

src/main/java/org/computate/frFR/java/ConfigSite.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,15 +493,15 @@ protected void _autresLangues() throws Exception {
493493
* Var.enUS:classOtherLanguages enUS: Other language names supported in this
494494
* application.
495495
*/
496-
public String[] classeAutresLangues;
496+
// public String[] classeAutresLangues;
497497

498498
/**
499499
* Var.enUS: _allLanguages r: toutesLangues r.enUS: allLanguages r: siteNom
500500
* r.enUS: siteName r: autresLangues r.enUS: otherLanguages r: langueNom r.enUS:
501501
* languageName
502502
**/
503503
protected void _toutesLangues() throws Exception {
504-
toutesLangues = ArrayUtils.add(ArrayUtils.addAll(autresLangues), langueNomGlobale);
504+
toutesLangues = ArrayUtils.add(autresLangues, langueNomGlobale);
505505
}
506506

507507
/**
@@ -1136,7 +1136,7 @@ protected String regexLangue(String langueNom, String nomChampRegex, String comm
11361136
throws Exception {
11371137
String valeurChamp = null;
11381138
if (nomChampRegex != null && commentaire != null) {
1139-
Matcher m = Pattern.compile("^" + nomChampRegex + "(." + langueNom + ")?:\\s*(.*)", Pattern.MULTILINE)
1139+
Matcher m = Pattern.compile("^" + nomChampRegex + "(\\." + langueNom + ")?:\\s*(.*)", Pattern.MULTILINE)
11401140
.matcher(commentaire);
11411141
if (m.find()) {
11421142
valeurChamp = m.group(m.groupCount());

0 commit comments

Comments
 (0)