-
Notifications
You must be signed in to change notification settings - Fork 200
[SYNCOPE-1942] added getString to retrieve the label from localization properties file #1278
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
massx1
wants to merge
5
commits into
apache:master
Choose a base branch
from
massx1:SYNCOPE-1942
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9d3dcd6
[SYNCOPE-1942] added getString to retrieve the label from localizatio…
massx1 d08921b
[SYNCOPE-1942] Dynamic localization for enduser and console
massx1 0ed8940
[SYNCOPE-1942] - useless logs
massx1 6794833
[SYNCOPE-1942] - changes for checkstyle
massx1 81be4c2
[SYNCOPE-1942] - using injection instead of static class + localized …
massx1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...epo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/DynamicMenuRegister.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.syncope.client.ui.commons; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public final class DynamicMenuRegister { | ||
|
|
||
| private final Map<String, Class<?>> keysForPages; | ||
|
|
||
| public DynamicMenuRegister() { | ||
| keysForPages = new HashMap<>(); | ||
| } | ||
|
|
||
| public void register(final String key, final Class<?> pageClass) { | ||
| keysForPages.put(key, pageClass); | ||
| } | ||
|
|
||
| public Class<?> getPage(final String key) { | ||
| return keysForPages.get(key); | ||
| } | ||
| } | ||
71 changes: 71 additions & 0 deletions
71
...i/src/main/java/org/apache/syncope/client/ui/commons/DynamicMenuStringResourceLoader.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.syncope.client.ui.commons; | ||
|
|
||
| import java.util.Locale; | ||
| import org.apache.wicket.core.util.resource.locator.IResourceNameIterator; | ||
| import org.apache.wicket.resource.IPropertiesFactory; | ||
| import org.apache.wicket.resource.Properties; | ||
| import org.apache.wicket.resource.loader.ClassStringResourceLoader; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class DynamicMenuStringResourceLoader extends ClassStringResourceLoader { | ||
|
|
||
| protected static final Logger LOG = LoggerFactory.getLogger(DynamicMenuStringResourceLoader.class); | ||
|
|
||
| private DynamicMenuRegister dynamicMenuRegister; | ||
|
|
||
| public DynamicMenuStringResourceLoader(final DynamicMenuRegister dynamicMenuRegister) { | ||
| super(DynamicMenuStringResourceLoader.class); | ||
| this.dynamicMenuRegister = dynamicMenuRegister; | ||
| } | ||
|
|
||
| @Override | ||
| public String loadStringResource( | ||
| final Class<?> clazz, | ||
| final String key, | ||
| final Locale locale, | ||
| final String style, | ||
| final String variation) { | ||
|
|
||
| if (key != null && key.startsWith("menu.")) { | ||
| Class<?> pageClass = dynamicMenuRegister.getPage(key); | ||
|
|
||
| if (pageClass != null) { | ||
| final String path = pageClass.getName().replace('.', '/'); | ||
| final IResourceNameIterator iter = newResourceNameIterator(path, locale, style, variation); | ||
| final IPropertiesFactory propertiesFactory = getPropertiesFactory(); | ||
|
|
||
| while (iter.hasNext()) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use streams, not iterators |
||
| final String newPath = iter.next(); | ||
| final Properties props = propertiesFactory.load(pageClass, newPath); | ||
|
|
||
| if (props != null) { | ||
| final String localeLabel = props.getString(key); | ||
| LOG.debug("Found label \"{}\" for key: {}", localeLabel, key); | ||
| return localeLabel; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
| # under the License. | ||
| home=Home | ||
| version=Version | ||
| domain=Domain | ||
| domain=Domain | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please revert this space-adding change |
||
|
|
||
| systemInfo=System Information | ||
| hostname=Host Name | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Turn this class into a bean.
You can take https://github.com/apache/syncope/blob/master/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java as reference