Tobias Jeger pushed to branch feature/visual-editing-psp1-CHANNELMGR-915 at
cms-community / hippo-addon-channel-manager
Commits:
815bdf25 by Tobias Jeger at 2016-10-15T00:24:28+02:00
CHANNELMGR-915 Skip locale-dependent logic is there's no locale
- - - - -
1 changed file:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FieldType.java
Changes:
=====================================
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FieldType.java
=====================================
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FieldType.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FieldType.java
@@ -169,8 +169,11 @@ public class FieldType {
setId(fieldId);
- LocalizationUtils.determineFieldDisplayName(fieldId, resourceBundle,
editorFieldConfig).ifPresent(this::setDisplayName);
- LocalizationUtils.determineFieldHint(fieldId, resourceBundle,
editorFieldConfig).ifPresent(this::setHint);
+ // only load displayName and hints if locale-info is available.
+ contentTypeContext.getLocale().ifPresent(dummy -> {
+ LocalizationUtils.determineFieldDisplayName(fieldId,
resourceBundle, editorFieldConfig).ifPresent(this::setDisplayName);
+ LocalizationUtils.determineFieldHint(fieldId, resourceBundle,
editorFieldConfig).ifPresent(this::setHint);
+ });
if (item.isMultiple() ||
item.getValidators().contains(FieldValidators.OPTIONAL)) {
setMultiple(true);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/815bdf255ab076bde1393a6dacc94b3b29086aa8
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
