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:12 UTC
[syncope] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 96af0e3 [SYNCOPE-1560] Fix with default locale en
96af0e3 is described below
commit 96af0e3a3225ea8b56331ae2538809674ed06f4c
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue May 12 12:14:50 2020 +0200
[SYNCOPE-1560] Fix with default locale en
---
.../apache/syncope/client/console/wizards/CSVPullWizardBuilder.java | 6 +++++-
.../client/console/wicket/markup/html/form/BinaryFieldPanel.java | 6 +++++-
.../syncope/client/enduser/markup/html/form/BinaryFieldPanel.java | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
index 12e55f1..244c86f 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
@@ -23,6 +23,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.Fil
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
@@ -130,8 +131,11 @@ public class CSVPullWizardBuilder extends BaseAjaxWizardBuilder<CSVPullSpec> {
public Details(final CSVPullSpec spec) {
FileInputConfig csvFile = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false).
- withLocale(SyncopeConsoleSession.get().getLocale().getLanguage()).
browseClass("btn btn-success").browseIcon("<i class=\"fas fa-folder-open\"></i> ");
+ 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);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
index 610ef7c..11cb701 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/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;
@@ -180,8 +181,11 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
FileInputConfig config = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false).
- withLocale(SyncopeConsoleSession.get().getLocale().getLanguage()).
browseClass("btn btn-success").browseIcon("<i class=\"fas fa-folder-open\"></i> ");
+ 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/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
index 4bb7621..fa61ae8 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/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.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.StringUtils;
@@ -178,8 +179,11 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
FileInputConfig config = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false).
- withLocale(SyncopeEnduserSession.get().getLocale().getLanguage()).
browseClass("btn btn-success").browseIcon("<i class=\"fas fa-folder-open\"></i> ");
+ String language = SyncopeEnduserSession.get().getLocale().getLanguage();
+ if (!Locale.ENGLISH.getLanguage().equals(language)) {
+ config.withLocale(language);
+ }
fileUpload = new BootstrapFileInputField("fileUpload", new ListModel<>(new ArrayList<>()), config);
fileUpload.setOutputMarkupId(true);