LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix for language handling 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5945 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-04-14 15:41:11 +00:00
parent ef59369409
commit f82e4c101f
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
View File

@ -353,7 +353,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
// } // }
} else { } else {
final String lang = url.substring(url.lastIndexOf(".")); final String lang = url.substring(url.lastIndexOf(".") + 1);
GlobalizationHelper.setSelectedLocale(lang); GlobalizationHelper.setSelectedLocale(lang);
} }
} }

27
ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java
View File

@ -35,7 +35,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.HashMap; import java.util.HashMap;
@ -461,19 +460,26 @@ public class FreeMarkerPresentationManager implements PresentationManager {
+ "second: int"); + "second: int");
} }
final String style = ((TemplateScalarModel) list.get(0)) final String style = ((TemplateScalarModel) list
.get(0))
.getAsString(); .getAsString();
final String yearParam = ((TemplateScalarModel) list.get(1)) final String yearParam = ((TemplateScalarModel) list
.get(1))
.getAsString(); .getAsString();
final String monthParam = ((TemplateScalarModel) list.get(2)) final String monthParam = ((TemplateScalarModel) list
.get(2))
.getAsString(); .getAsString();
final String dayOfMonthParam = ((TemplateScalarModel) list.get(3)) final String dayOfMonthParam = ((TemplateScalarModel) list
.get(3))
.getAsString(); .getAsString();
final String hourParam = ((TemplateScalarModel) list.get(4)) final String hourParam = ((TemplateScalarModel) list
.get(4))
.getAsString(); .getAsString();
final String minuteParam = ((TemplateScalarModel) list.get(5)) final String minuteParam = ((TemplateScalarModel) list
.get(5))
.getAsString(); .getAsString();
final String secondParam = ((TemplateScalarModel) list.get(6)) final String secondParam = ((TemplateScalarModel) list
.get(6))
.getAsString(); .getAsString();
final int year = Integer.parseInt(yearParam); final int year = Integer.parseInt(yearParam);
@ -506,8 +512,9 @@ public class FreeMarkerPresentationManager implements PresentationManager {
final Optional<String> format = dateFormats final Optional<String> format = dateFormats
.stream() .stream()
.filter(dateFormat -> dateFormat.getStyle().equals(style)) .filter(dateFormat -> dateFormat.getStyle().equals(style))
.filter(dateFormat -> dateFormat.getLang().equals(locale .filter(
.toString())) dateFormat -> dateFormat.getLang().equals(locale.toString())
)
.map(DateFormat::getFormat) .map(DateFormat::getFormat)
.findAny(); .findAny();