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
commit a95e7549951d38cdb0b54cb37abc2edbed9a8c65 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu May 14 09:21:44 2020 +0200 [SYNCOPE-1560] Missing update for SAML metadata import --- .../syncope/client/console/panels/ImportMetadata.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 dd4dfe0..e5cdd86 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.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.commons.Constants; @@ -44,21 +45,21 @@ 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<>(); + Model<byte[]> metadata = new Model<>(); - FileInputConfig config = new FileInputConfig(); - config.showUpload(false); - config.showRemove(false); - config.showPreview(false); - final BootstrapFileInputField fileUpload = + 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); + } + BootstrapFileInputField fileUpload = new BootstrapFileInputField("fileUpload", new ListModel<>(new ArrayList<>()), config); fileUpload.setOutputMarkupId(true); fileUpload.add(new AjaxFormSubmitBehavior(Constants.ON_CHANGE) {
