You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/05/12 10:15:20 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1560] Fix with default
locale en
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 43299a9 [SYNCOPE-1560] Fix with default locale en
43299a9 is described below
commit 43299a949195add71086c3dbb683e2ac402c2acd
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue May 12 12:03:24 2020 +0200
[SYNCOPE-1560] Fix with default locale en
---
.../client/console/wicket/markup/html/form/BinaryFieldPanel.java | 8 ++++++--
.../syncope/client/console/wizards/CSVPullWizardBuilder.java | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
index 0730b37..cc90a5e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
@@ -28,6 +28,7 @@ import de.agilecoders.wicket.jquery.function.IFunction;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.Base64;
+import java.util.Locale;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -174,8 +175,11 @@ public class BinaryFieldPanel extends FieldPanel<String> {
uploadForm.add(downloadLink);
FileInputConfig config = new FileInputConfig().
- showUpload(false).showRemove(false).showPreview(false).
- withLocale(SyncopeConsoleSession.get().getLocale().getLanguage());
+ showUpload(false).showRemove(false).showPreview(false);
+ String language = SyncopeConsoleSession.get().getLocale().getLanguage();
+ if (!Locale.ENGLISH.getLanguage().equals(language)) {
+ config.withLocale(language);
+ }
fileUpload = new BootstrapFileInputField("fileUpload", new ListModel<>(new ArrayList<>()), config);
fileUpload.setOutputMarkupId(true);
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
index f342449..3817e43 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
@@ -132,8 +133,11 @@ public class CSVPullWizardBuilder extends AjaxWizardBuilder<CSVPullSpec> {
public Details(final CSVPullSpec spec) {
FileInputConfig csvFile = new FileInputConfig().
- showUpload(false).showRemove(false).showPreview(false).
- withLocale(SyncopeConsoleSession.get().getLocale().getLanguage());
+ showUpload(false).showRemove(false).showPreview(false);
+ String language = SyncopeConsoleSession.get().getLocale().getLanguage();
+ if (!Locale.ENGLISH.getLanguage().equals(language)) {
+ csvFile.withLocale(language);
+ }
BootstrapFileInputField csvUpload =
new BootstrapFileInputField("csvUpload", new ListModel<>(new ArrayList<>()), csvFile);
csvUpload.setRequired(true);