Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Evolveum/midpoint
- Loading branch information
Showing
69 changed files
with
1,819 additions
and
353 deletions.
There are no files selected for viewing
This file contains 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
27 changes: 27 additions & 0 deletions
27
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebConfig.java
This file contains 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,27 @@ | ||
| /* | ||
| * Copyright (c) 2010-2017 Evolveum | ||
| * | ||
| * Licensed 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 com.evolveum.midpoint.web.boot; | ||
|
|
||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| /** | ||
| * Created by Viliam Repan (lazyman). | ||
| */ | ||
| @Configuration | ||
| public class WebConfig { | ||
|
|
||
| } |
This file contains 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 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 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 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 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 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 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
74 changes: 74 additions & 0 deletions
74
infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationMessageSource.java
This file contains 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,74 @@ | ||
| /* | ||
| * Copyright (c) 2010-2017 Evolveum | ||
| * | ||
| * Licensed 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 com.evolveum.midpoint.common; | ||
|
|
||
| import org.apache.commons.lang.Validate; | ||
| import org.springframework.context.MessageSource; | ||
| import org.springframework.context.MessageSourceResolvable; | ||
| import org.springframework.context.NoSuchMessageException; | ||
|
|
||
| import java.util.Locale; | ||
|
|
||
| /** | ||
| * Created by Viliam Repan (lazyman). | ||
| */ | ||
| public class LocalizationMessageSource implements MessageSource { | ||
|
|
||
| private LocalizationService localizationService; | ||
|
|
||
| public LocalizationMessageSource(LocalizationService localizationService) { | ||
| this.localizationService = localizationService; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) { | ||
| String msg = localizationService.translate(code, args, locale); | ||
| if (msg == null) { | ||
| return defaultMessage; | ||
| } | ||
|
|
||
| return msg; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException { | ||
| String msg = localizationService.translate(code, args, locale); | ||
| if (msg == null) { | ||
| throw new NoSuchMessageException("Message code '" + code + "' was not found"); | ||
| } | ||
|
|
||
| return msg; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException { | ||
| Validate.notNull(resolvable, "Message source resolvable must not be null"); | ||
|
|
||
| for (String code : resolvable.getCodes()) { | ||
| String msg = localizationService.translate(code, resolvable.getArguments(), locale); | ||
| if (msg != null) { | ||
| return msg; | ||
| } | ||
| } | ||
|
|
||
| if (resolvable.getDefaultMessage() != null) { | ||
| return resolvable.getDefaultMessage(); | ||
| } | ||
|
|
||
| throw new NoSuchMessageException("Can't resolve message: " + resolvable); | ||
| } | ||
| } |
This file contains 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.