[syncope] 01/02: [SYNCOPE-1560] Missing update for SAML metadata import

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 1f0e959c894ddf7c6119d6421cabd16acc8f2007
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Thu May 14 09:21:44 2020 +0200

    [SYNCOPE-1560] Missing update for SAML metadata import
---
 .../syncope/client/console/panels/ImportMetadata.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
index 61bd660..7c4c902 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
@@ -23,6 +23,7 @@ import 
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.Fil
 import java.io.ByteArrayInputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Locale;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -45,20 +46,20 @@ public class ImportMetadata extends 
TogglePanel<Serializable> {
 
     private final SAML2IdPsRestClient restClient = new SAML2IdPsRestClient();
 
-    private final Form<?> form;
-
     public ImportMetadata(final String id, final WebMarkupContainer container, 
final PageReference pageRef) {
         super(id, pageRef);
 
-        form = new Form<>("metadataForm");
+        Form<?> form = new Form<>("metadataForm");
         addInnerObject(form);
 
         final Model<byte[]> metadata = new Model<>();
 
-        FileInputConfig config = new FileInputConfig();
-        config.showUpload(false);
-        config.showRemove(false);
-        config.showPreview(false);
+        FileInputConfig config = new FileInputConfig().
+                showUpload(false).showRemove(false).showPreview(false);
+        String language = 
SyncopeConsoleSession.get().getLocale().getLanguage();
+        if (!Locale.ENGLISH.getLanguage().equals(language)) {
+            config.withLocale(language);
+        }
         final BootstrapFileInputField fileUpload =
                 new BootstrapFileInputField("fileUpload", new ListModel<>(new 
ArrayList<FileUpload>()), config);
         fileUpload.setOutputMarkupId(true);