honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #402 from hapifhir/gg-v5.2.11 

Gg v5.2.11
This commit is contained in:
Grahame Grieve 2020-12-15 17:12:30 +11:00 committed by GitHub
parent b43431a65c 7260b9751d
commit a220981c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RELEASE_NOTES.md
View File

@ -0,0 +1,9 @@
Validator:
* fix bad eror message in german messages (issue 399)
* better error messages when FHIRPath discriminators are invalid
* clean up error messages
Other code changes:
* remove unnecessary (& problem causing) Fragment-Host from OSGi manifest
* move structuremap utilities to a package

2
org.hl7.fhir.utilities/src/main/resources/Messages_de.properties
View File

@ -205,7 +205,7 @@ Validation_VAL_Content_Unknown=Unerkannter Inhalt {0}
Validation_VAL_NoType=Unbekannter Typ {0}
Validation_VAL_Profile_MatchMultiple=Profil {0}, Element stimmt mit mehr als einem Slice überein - {1}, {2}
Validation_VAL_Profile_Maximum={0}: maximal erlaubt = {1}, aber gefunden {2}
Validation_VAL_Profile_Minimum={0}: mindestens erforderlich = {1}, aber nur gefunden {2}
Validation_VAL_Profile_Minimum={2}: mindestens erforderlich = {6}, aber nur gefunden {7}
Validation_VAL_Profile_MultipleMatches=Es wurden mehrere passende Profile unter den Auswahlmöglichkeiten gefunden: {0}
Validation_VAL_Profile_NoCheckMax={0}: Kann die maximal zulässige Anzahl ({1}) aufgrund fehlender Slicing-Validierung nicht überprüfen.
Validation_VAL_Profile_NoCheckMin={0}": Kann das erforderliche Minimum ({1}) aufgrund fehlender Slicing-Validierung nicht überprüfen

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -772,7 +772,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
return true;
if (s.isOk()) {
if (s.getMessage() != null)
throw new Error("Internal error: ok, but has error message '"+s.getMessage()+"'");
txWarning(errors, s.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, s == null, I18nConstants.TERMINOLOGY_PASSTHROUGH_TX_MESSAGE, s.getMessage(), system, code);
return true;
}
if (s.getErrorClass() != null && s.getErrorClass().isInfrastructure())