diff --git a/internationalization.markdown b/internationalization.markdown new file mode 100644 index 0000000000000000000000000000000000000000..ee3f1f12c55ddcc4298a7c3c074dd5b95f8c3c77 --- /dev/null +++ b/internationalization.markdown @@ -0,0 +1,15 @@ +``` mermaid + classDiagram + HashMap <|-- Internationalization + InternationalizationApplicationMap *-- Internationalization:internationalization + InternationalizationMap "1"-->"*" InternationalizationApplicationMap + InternationalizationMap : + InternationalizationApplicationMap application + InternationalizationMap "*"-->"*" InternationalizationReferenceMap + InternationalizationMap : + Map<String, InternationalizationReferenceMap> references + InternationalizationMap "*"-->"*" InternationalizationDataTypeMap + InternationalizationMap : + Map<String, InternationalizationDataTypeMap> references + InternationalizationDisplay + InternationalizationReferenceMap "1"-->"*" Internationalization internationalizationName + InternationalizationReferenceMap "1"-->"*" InternationalizationDisplay internationalizationDisplay + InternationalizationReferenceMap : + Map<String, InternationalizationDataTypeMap> internationalizationDisplay +``` \ No newline at end of file diff --git a/src/main/java/fr/inra/oresing/model/Configuration.java b/src/main/java/fr/inra/oresing/model/Configuration.java index 0bdbfbea4b506a333d78105e2ac312a6bdf6d0ef..f49a9c216d2080a16e2bdc014162150230eb0ea9 100644 --- a/src/main/java/fr/inra/oresing/model/Configuration.java +++ b/src/main/java/fr/inra/oresing/model/Configuration.java @@ -4,8 +4,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.MoreCollectors; import fr.inra.oresing.checker.*; -import fr.inra.oresing.model.internationalization.Internationalization; -import fr.inra.oresing.model.internationalization.InternationalizationMap; +import fr.inra.oresing.model.internationalization.*; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -14,16 +13,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.TreeMap; +import java.util.*; @Getter @Setter @@ -39,6 +29,14 @@ public class Configuration { private LinkedHashMap<String, CompositeReferenceDescription> compositeReferences = new LinkedHashMap<>(); private LinkedHashMap<String, DataTypeDescription> dataTypes = new LinkedHashMap<>(); + public InternationalizationMap getInternationalization() { + final InternationalizationMap internationalizationMap = new InternationalizationMap(); + internationalizationMap.setApplication(Optional.ofNullable(application).map(ApplicationDescription::getInternationalization).orElse(null)); + internationalizationMap.setDataTypes(Optional.ofNullable(dataTypes).map(DataTypeDescription::getInternationalization).orElse(null)); + internationalizationMap.setReferences(Optional.ofNullable(references).map(ReferenceDescription::getInternationalization).orElse(null)); + return internationalizationMap; + } + public Optional<CompositeReferenceDescription> getCompositeReferencesUsing(String reference) { return getCompositeReferences().values().stream() .filter(compositeReferenceDescription -> compositeReferenceDescription.isDependentOfReference(reference)) @@ -82,13 +80,14 @@ public class Configuration { private void addRecursively(DependencyNode node, LinkedHashMap<String, ReferenceDescription> sortedReferences, LinkedHashMap<String, ReferenceDescription> references) { if (!node.dependsOn.isEmpty()) { node.dependsOn - .stream().filter(n ->!n.dependsOn.contains(node)) + .stream().filter(n -> !n.dependsOn.contains(node)) .forEach(dependencyNode -> addRecursively(dependencyNode, sortedReferences, references)); } sortedReferences.put(node.value, references.get(node.value)); } + public enum MigrationStrategy { ADD_VARIABLE } @@ -96,17 +95,31 @@ public class Configuration { @Getter @Setter @ToString - public static class ReferenceDescription { + public static class ReferenceDescription extends InternationalizationDisplayImpl { private char separator = ';'; private List<String> keyColumns = new LinkedList<>(); private LinkedHashMap<String, ColumnDescription> columns; private LinkedHashMap<String, LineValidationRuleDescription> validations = new LinkedHashMap<>(); + + public static Map<String, InternationalizationReferenceMap> getInternationalization(LinkedHashMap<String, ReferenceDescription> referenceDescriptionMap) { + Map<String, InternationalizationReferenceMap> internationalizationReferenceMap = new HashMap<>(); + for (Map.Entry<String, ReferenceDescription> entry : referenceDescriptionMap.entrySet()) { + final String reference = entry.getKey(); + final ReferenceDescription referenceDescription = entry.getValue(); + final InternationalizationReferenceMap internationalizationReference = new InternationalizationReferenceMap(); + internationalizationReference.setInternationalizationDisplay(referenceDescription.getInternationalizationDisplay()); + internationalizationReference.setInternationalizationName(referenceDescription.getInternationalizationName()); + internationalizationReference.setInternationalizedColumns(referenceDescription.getInternationalizedColumns()); + internationalizationReferenceMap.put(reference, internationalizationReference); + } + return internationalizationReferenceMap; + } } @Getter @Setter @ToString - public static class CompositeReferenceDescription { + public static class CompositeReferenceDescription extends InternationalizationImpl { List<CompositeReferenceComponentDescription> components = new LinkedList<>(); public boolean isDependentOfReference(String reference) { @@ -119,7 +132,7 @@ public class Configuration { @Getter @Setter @ToString - public static class CompositeReferenceComponentDescription { + public static class CompositeReferenceComponentDescription extends InternationalizationImpl { String reference; String parentKeyColumn; String parentRecursiveKey; @@ -128,13 +141,28 @@ public class Configuration { @Getter @Setter @ToString - public static class DataTypeDescription { + public static class DataTypeDescription extends InternationalizationMapDisplayImpl { FormatDescription format; LinkedHashMap<String, ColumnDescription> data = new LinkedHashMap<>(); LinkedHashMap<String, LineValidationRuleDescription> validations = new LinkedHashMap<>(); TreeMap<Integer, List<MigrationDescription>> migrations = new TreeMap<>(); AuthorizationDescription authorization; LinkedHashMap<String, String> repository = null; + + public static Map<String, InternationalizationDataTypeMap> getInternationalization(LinkedHashMap<String, DataTypeDescription> dataTypeDescriptionMap) { + Map<String, InternationalizationDataTypeMap> internationalizationDataTypeMapMap = new HashMap<>(); + for (Map.Entry<String, DataTypeDescription> entry : dataTypeDescriptionMap.entrySet()) { + final String datatype = entry.getKey(); + final DataTypeDescription dataTypeDescription = entry.getValue(); + final InternationalizationDataTypeMap internationalizationDataTypeMap = new InternationalizationDataTypeMap(); + internationalizationDataTypeMap.setInternationalizationDisplay(dataTypeDescription.getInternationalizationDisplays()); + internationalizationDataTypeMap.setInternationalizationName(dataTypeDescription.getInternationalizationName()); + internationalizationDataTypeMap.setInternationalizedColumns(dataTypeDescription.getInternationalizedColumns()); + internationalizationDataTypeMap.setAuthorization(Optional.ofNullable(dataTypeDescription.getAuthorization()).map(AuthorizationDescription::getInternationalization).orElse(null)); + internationalizationDataTypeMapMap.put(datatype, internationalizationDataTypeMap); + } + return internationalizationDataTypeMapMap; + } } @Getter @@ -152,6 +180,25 @@ public class Configuration { VariableComponentKey timeScope; LinkedHashMap<String, VariableComponentKey> authorizationScopes = new LinkedHashMap<>(); LinkedHashMap<String, DataGroupDescription> dataGroups = new LinkedHashMap<>(); + + public InternationalizationAuthorisationMap getInternationalization() { + final InternationalizationAuthorisationMap internationalizationAuthorisationMap = new InternationalizationAuthorisationMap(); + Map<String, InternationalizationAuthorisationName> authorizationScopesLocalization = new HashMap<>(); + for (Map.Entry<String, VariableComponentKey> entry : authorizationScopes.entrySet()) { + final InternationalizationAuthorisationName internationalizationAuthorisationName = new InternationalizationAuthorisationName(); + internationalizationAuthorisationName.setInternationalizationName(entry.getValue().getInternationalizationName()); + authorizationScopesLocalization.put(entry.getKey(), internationalizationAuthorisationName); + } + internationalizationAuthorisationMap.setAuthorizationScopes(authorizationScopesLocalization); + Map<String, InternationalizationAuthorisationName> datagroupsLocalization = new HashMap<>(); + for (Map.Entry<String, DataGroupDescription> entry : dataGroups.entrySet()) { + final InternationalizationAuthorisationName internationalizationAuthorisationName = new InternationalizationAuthorisationName(); + internationalizationAuthorisationName.setInternationalizationName(entry.getValue().getInternationalizationName()); + datagroupsLocalization.put(entry.getKey(), internationalizationAuthorisationName); + } + internationalizationAuthorisationMap.setDataGroups(datagroupsLocalization); + return internationalizationAuthorisationMap; + } } @Getter @@ -275,7 +322,7 @@ public class Configuration { @Getter @Setter @ToString - public static class DataGroupDescription { + public static class DataGroupDescription extends InternationalizationImpl { Internationalization internationalizationName; String label; Set<String> data = new LinkedHashSet<>(); @@ -284,11 +331,16 @@ public class Configuration { @Getter @Setter @ToString - public static class ApplicationDescription { + public static class ApplicationDescription extends InternationalizationImpl { String name; int version; String defaultLanguage; - Internationalization internationalization; + + public InternationalizationApplicationMap getInternationalization() { + final InternationalizationApplicationMap internationalizationApplicationMap = new InternationalizationApplicationMap(); + internationalizationApplicationMap.setInternationalizationName(getInternationalizationName()); + return internationalizationApplicationMap; + } } @Getter diff --git a/src/main/java/fr/inra/oresing/model/VariableComponentKey.java b/src/main/java/fr/inra/oresing/model/VariableComponentKey.java index f366fe13ecd1172c2438b93bf35ed0086c7b9888..ed1f028637543fd96aa59ee9a03b5ee528c7f108 100644 --- a/src/main/java/fr/inra/oresing/model/VariableComponentKey.java +++ b/src/main/java/fr/inra/oresing/model/VariableComponentKey.java @@ -1,10 +1,11 @@ package fr.inra.oresing.model; +import fr.inra.oresing.model.internationalization.InternationalizationImpl; import lombok.Value; import org.apache.commons.lang3.StringUtils; @Value -public class VariableComponentKey { +public class VariableComponentKey extends InternationalizationImpl { private static final String SEPARATOR = "_"; diff --git a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationApplicationMap.java b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationApplicationMap.java index 32f76e515f05a32ca8a64362d1d2647e7f28082f..e5e647b273aff0aabb5fdb2c826e36c4b30d0601 100644 --- a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationApplicationMap.java +++ b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationApplicationMap.java @@ -6,5 +6,5 @@ import lombok.Setter; @Getter @Setter public class InternationalizationApplicationMap { - Internationalization internationalization; + Internationalization internationalizationName; } \ No newline at end of file diff --git a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDataTypeMap.java b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDataTypeMap.java index cf421bb3da4a981ebf5d837892fe38dad9b3b891..28410175eb88735411ad9b1dca5faa8332614a0e 100644 --- a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDataTypeMap.java +++ b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDataTypeMap.java @@ -7,7 +7,7 @@ import java.util.Map; @Getter @Setter -public class InternationalizationDataTypeMap { +public class InternationalizationDataTypeMap { Internationalization internationalizationName; Map<String, Internationalization> internationalizedColumns; InternationalizationAuthorisationMap authorization; diff --git a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDisplayImpl.java b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDisplayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..25b223029ee498fd4f10b32c90d3a5227382b381 --- /dev/null +++ b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationDisplayImpl.java @@ -0,0 +1,12 @@ +package fr.inra.oresing.model.internationalization; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +public class InternationalizationDisplayImpl extends InternationalizationImpl{ + InternationalizationDisplay internationalizationDisplay; +} \ No newline at end of file diff --git a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationImpl.java b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c7fda5bb463c1c6a08ad6de99d27a5a1f4de541f --- /dev/null +++ b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationImpl.java @@ -0,0 +1,15 @@ +package fr.inra.oresing.model.internationalization; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Map; + +@Getter +@Setter +@ToString +public class InternationalizationImpl { + Internationalization internationalizationName; + Map<String, Internationalization> internationalizedColumns; +} \ No newline at end of file diff --git a/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationMapDisplayImpl.java b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationMapDisplayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d205f322e0f064b0ac979ba3625c46274c594053 --- /dev/null +++ b/src/main/java/fr/inra/oresing/model/internationalization/InternationalizationMapDisplayImpl.java @@ -0,0 +1,14 @@ +package fr.inra.oresing.model.internationalization; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Map; + +@Getter +@Setter +@ToString +public class InternationalizationMapDisplayImpl extends InternationalizationImpl{ + Map<String, InternationalizationDisplay> internationalizationDisplays; +} \ No newline at end of file diff --git a/src/main/java/fr/inra/oresing/rest/ApplicationConfigurationService.java b/src/main/java/fr/inra/oresing/rest/ApplicationConfigurationService.java index 98b3a1a1501069c7be1c4c4c88cea32d3922b5b6..5fee929991f87abcc3b2b7b2f94c5404740a9671 100644 --- a/src/main/java/fr/inra/oresing/rest/ApplicationConfigurationService.java +++ b/src/main/java/fr/inra/oresing/rest/ApplicationConfigurationService.java @@ -2,7 +2,6 @@ package fr.inra.oresing.rest; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.InvalidFormatException; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; @@ -18,9 +17,7 @@ import fr.inra.oresing.groovy.GroovyExpression; import fr.inra.oresing.model.Configuration; import fr.inra.oresing.model.LocalDateTimeRange; import fr.inra.oresing.model.VariableComponentKey; -import fr.inra.oresing.model.internationalization.Internationalization; import fr.inra.oresing.model.internationalization.InternationalizationDisplay; -import fr.inra.oresing.model.internationalization.InternationalizationMap; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -31,17 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -50,46 +37,7 @@ import java.util.stream.Stream; public class ApplicationConfigurationService { public static final List INTERNATIONALIZED_FIELDS = List.of("internationalization", "internationalizationName", "internationalizedColumns", "internationalizationDisplay"); - Map<String, Map> getInternationalizedSections(Map<String, Object> toParse, List<IllegalArgumentException> exceptions) { - Map<String, Map> parsedMap = new LinkedHashMap<>(); - Iterator<Map.Entry<String, Object>> iterator = toParse.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry<String, Object> entry = iterator.next(); - String key = entry.getKey(); - Object value = entry.getValue(); - if (INTERNATIONALIZED_FIELDS.contains(key)) { - value = formatSection((Map<String, Object>) value, exceptions); - parsedMap.put(key, (Map) value); - iterator.remove(); - } else if (value instanceof Map) { - Map<String, Map> internationalizedSections = getInternationalizedSections((Map<String, Object>) value, exceptions); - if (!internationalizedSections.isEmpty()) { - parsedMap.put(key, internationalizedSections); - } - } - } - return parsedMap; - } - private Object formatSection(Map<String, Object> value, List<IllegalArgumentException> exceptions) { - try { - return new ObjectMapper().convertValue(value, Internationalization.class); - } catch (IllegalArgumentException e) { - Map<String, Object> internationalizationMap = new HashMap<>(); - for (Map.Entry<String, Object> entry : value.entrySet()) { - try { - internationalizationMap.put(entry.getKey(), new ObjectMapper().convertValue(entry.getValue(), Internationalization.class)); - } catch (IllegalArgumentException e2) { - try { - internationalizationMap.put(entry.getKey(), new ObjectMapper().convertValue(entry.getValue(), InternationalizationDisplay.class)); - } catch (IllegalArgumentException e3) { - exceptions.add(e2); - } - } - } - return internationalizationMap; - } - } ConfigurationParsingResult unzipConfiguration(MultipartFile file){ return null; } @@ -125,26 +73,8 @@ public class ApplicationConfigurationService { Configuration configuration; try { YAMLMapper mapper = new YAMLMapper(); - Map<String, Object> mappedObject = (Map<String, Object>) mapper.readValue(bytes, Object.class); - List<IllegalArgumentException> exceptions = List.of(); - internationalizedSections = getInternationalizedSections(mappedObject, exceptions); - if (!exceptions.isEmpty()) { - return onMappingExceptions(exceptions); - } - try { - configuration = mapper.convertValue(mappedObject, Configuration.class); - configuration.setInternationalization(mapper.convertValue(internationalizedSections, InternationalizationMap.class)); - } catch (IllegalArgumentException e) { - if (e.getCause() instanceof UnrecognizedPropertyException) { - throw (UnrecognizedPropertyException) e.getCause(); - } else if (e.getCause() instanceof InvalidFormatException) { - throw (InvalidFormatException) e.getCause(); - } else if (e.getCause() instanceof JsonProcessingException) { - throw (JsonProcessingException) e.getCause(); - } else { - throw e; - } - } + configuration = mapper.readValue(bytes, Configuration.class); + } catch (UnrecognizedPropertyException e) { return onUnrecognizedPropertyException(e); } catch (InvalidFormatException e) { diff --git a/src/test/java/fr/inra/oresing/rest/ApplicationConfigurationServiceTest.java b/src/test/java/fr/inra/oresing/rest/ApplicationConfigurationServiceTest.java index 14184cf624aaa31f467a68d23275f32be967128a..41a32e3010bdb7f994e3976978dd61dbe9843ad9 100644 --- a/src/test/java/fr/inra/oresing/rest/ApplicationConfigurationServiceTest.java +++ b/src/test/java/fr/inra/oresing/rest/ApplicationConfigurationServiceTest.java @@ -352,6 +352,9 @@ public class ApplicationConfigurationServiceTest { ValidationCheckResult onlyError = Iterables.getOnlyElement(configurationParsingResult.getValidationCheckResults()); log.debug(onlyError.getMessage()); Assert.assertEquals("unrecognizedProperty", onlyError.getMessage()); + Assert.assertEquals(9, onlyError.getMessageParams().get("lineNumber")); + Assert.assertEquals(3, onlyError.getMessageParams().get("columnNumber")); + Assert.assertEquals("compositReference", onlyError.getMessageParams().get("unknownPropertyName")); } @Test @@ -439,8 +442,8 @@ public class ApplicationConfigurationServiceTest { @Test public void testUnknownReferenceInInternationalizationDisplayPatternInDatatype() { - ConfigurationParsingResult configurationParsingResult = parseYaml("internationalizationDisplay:\n" + - " sites:", "internationalizationDisplay:\n" + + ConfigurationParsingResult configurationParsingResult = parseYaml("internationalizationDisplays:\n" + + " sites:", "internationalizationDisplays:\n" + " plateforme:"); Assert.assertFalse(configurationParsingResult.isValid()); ValidationCheckResult onlyError = Iterables.getOnlyElement(configurationParsingResult.getValidationCheckResults()); diff --git a/src/test/resources/data/foret/foret_essai.yaml b/src/test/resources/data/foret/foret_essai.yaml index 42dbfb636c12a9a8b04d22acf8a943c5ee768535..8336fe46cd36c93bbde04cdeb71ddcf63f55183b 100644 --- a/src/test/resources/data/foret/foret_essai.yaml +++ b/src/test/resources/data/foret/foret_essai.yaml @@ -2,6 +2,9 @@ version: 0 application: name: foret version: 1 + internationalizationName: + fr: ORE F-ORE-T + en: ORE F-ORE-T compositeReferences: localizations: components: diff --git a/src/test/resources/data/monsore/monsore-with-repository.yaml b/src/test/resources/data/monsore/monsore-with-repository.yaml index 20e911205e874e85271eae706ebdcd9f637a3a39..93086b4577642f471f4e201f81c18807fc9c8c7e 100644 --- a/src/test/resources/data/monsore/monsore-with-repository.yaml +++ b/src/test/resources/data/monsore/monsore-with-repository.yaml @@ -1,7 +1,7 @@ version: 0 application: defaultLanguage: fr - internationalization: + internationalizationName: fr: SOERE mon SOERE avec dépôt en: SOERE my SOERE with repository name: MONSORE @@ -331,7 +331,7 @@ dataTypes: internationalizationName: fr: Piégeage en Montée en: Trap in ascent - internationalizationDisplay: + internationalizationDisplays: especes: pattern: fr: 'espèce :{esp_nom}' diff --git a/src/test/resources/data/monsore/monsore.yaml b/src/test/resources/data/monsore/monsore.yaml index e82a399252b3bc616d8ad50a3dd4709ddfd46786..22bbfa9de58767e8cb2fe751dd10f1015cf333b2 100644 --- a/src/test/resources/data/monsore/monsore.yaml +++ b/src/test/resources/data/monsore/monsore.yaml @@ -1,7 +1,7 @@ version: 0 application: defaultLanguage: fr - internationalization: + internationalizationName: fr: SOERE mon SOERE avec dépôt en: SOERE my SOERE with repository name: MONSORE @@ -331,7 +331,7 @@ dataTypes: internationalizationName: fr: Piégeage en Montée en: Trap in ascent - internationalizationDisplay: + internationalizationDisplays: especes: pattern: fr: 'espèce :{esp_nom}' diff --git a/src/test/resources/data/olac/olac.yaml b/src/test/resources/data/olac/olac.yaml index 57b21f13688e087d9c8421cc90cb92beb9563a29..18297bdc71365c4a2b842d655083d3278b9fd3d2 100644 --- a/src/test/resources/data/olac/olac.yaml +++ b/src/test/resources/data/olac/olac.yaml @@ -1,7 +1,7 @@ version: 0 application: defaultLanguage: fr - internationalization: + internationalizationName: fr: Observatoire des lacs en: Lake observatory name: ola diff --git a/src/test/resources/data/pros/pro.yaml b/src/test/resources/data/pros/pro.yaml index ca267b32d29904416d53eebbe61f85e7c09a5786..4817ccf35ffe7dc8d7da547bdd4ad6258055ae0a 100644 --- a/src/test/resources/data/pros/pro.yaml +++ b/src/test/resources/data/pros/pro.yaml @@ -1,7 +1,7 @@ version: 0 application: defaultLanguage: fr - internationalization: + internationalizationName: fr: SOERE Pros en: Pros SOERE name: Pros @@ -678,4 +678,4 @@ dataTypes: - header: "Code Expression Humidité" boundTo: variable: context - component: Code Expression Humidité + component: Code Expression Humidité \ No newline at end of file diff --git a/src/test/resources/data/recursivite/recusivite.yaml b/src/test/resources/data/recursivite/recusivite.yaml index 071c90a600ac74f2dc7299a811b553bad2d0ef03..217e5a9e3043a871d0079d6ed64853b1113b66ac 100644 --- a/src/test/resources/data/recursivite/recusivite.yaml +++ b/src/test/resources/data/recursivite/recusivite.yaml @@ -1,7 +1,7 @@ version: 0 application: defaultLanguage: fr - internationalization: + internationalizationName: fr: Récursivité en: recusivity name: recursivite diff --git a/src/test/resources/data/validation/fake-app.yaml b/src/test/resources/data/validation/fake-app.yaml index 208988dd0c3fe9fe9d85cbdc9309439247aa0767..46b627f229d91b5f0e96526caac916d63f1a55aa 100644 --- a/src/test/resources/data/validation/fake-app.yaml +++ b/src/test/resources/data/validation/fake-app.yaml @@ -2,6 +2,9 @@ version: 0 application: name: Sites version: 1 + internationalizationName: + fr: Fausse application + en: Fake application compositeReferences: localizations: components: @@ -85,7 +88,7 @@ dataTypes: internationalizationName: fr: Le site en: the good place - internationalizationDisplay: + internationalizationDisplays: sites: pattern: fr: 'le nom du site {nom du site_fr}'