diff --git a/exec/pack/Messages.properties b/exec/pack/Messages.properties index aa8a725c8..4c4e156d9 100644 --- a/exec/pack/Messages.properties +++ b/exec/pack/Messages.properties @@ -1140,7 +1140,8 @@ TYPE_SPECIFIC_CHECKS_DT_XHTML_LITERAL_HREF = Hyperlink scheme ''{3}'' in ''{0}'' SM_TARGET_TYPE_UNKNOWN = The type of the target variable is not known: {0} XHTML_XHTML_ATTRIBUTE_XML_SPACE = The attribute 'xml:space' is legal but has a fixed value of 'preserve'. It''s use is discouraged VALIDATION_HL7_PUBLISHER_MULTIPLE_WGS = This resource has more than workgroup extension (http://hl7.org/fhir/StructureDefinition/structuredefinition-wg) -NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG = Wrong Display Name ''{0}'' for {1}#{2}. There are no valid display names found for language(s) ''{3}''. Default display is ''{4}'' +NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK = There are no valid display names found for the code {1}#{2} for language(s) ''{3}''. The display is ''{4}'' the default language display +NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_ERR = Wrong Display Name ''{0}'' for {1}#{2}. There are no valid display names found for language(s) ''{3}''. Default display is ''{4}'' NO_VALID_DISPLAY_AT_ALL = Cannot validate display Name ''{0}'' for {1}#{2}: No displays are known SD_BASE_EXPERIMENTAL = The definition builds on ''{0}'' which is experimental, but this definition is not labeled as experimental SD_ED_EXPERIMENTAL_BINDING = The definition for the element ''{0}'' binds to the value set ''{1}'' which is experimental, but this structure is not labeled as experimental diff --git a/install/install-tk.iss b/install/install-tk.iss index 2b9cb9e29..cf39c1d2e 100644 --- a/install/install-tk.iss +++ b/install/install-tk.iss @@ -3,11 +3,11 @@ ; AppID can never be changed as subsequent installations require the same installation ID each time AppID=FHIRToolkit AppName=Health Intersections FHIR Toolkit -AppVerName=FHIRToolkit v3.4.12 +AppVerName=FHIRToolkit v3.4.13 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirtoolkit-win64-3.4.12 +OutputBaseFilename=fhirtoolkit-win64-3.4.13 Compression=lzma2/ultra64 ; 64 bit @@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall ; win2000+ add/remove programs support AppPublisher=Health Intersections P/L AppPublisherURL=http://www.healthintersections.com.au -AppVersion=3.4.12 +AppVersion=3.4.13 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+ -VersionInfoVersion=3.4.12.0 +VersionInfoVersion=3.4.13.0 ; dialog support LicenseFile=..\license diff --git a/install/install.iss b/install/install.iss index 0552a7788..b088dc192 100644 --- a/install/install.iss +++ b/install/install.iss @@ -3,11 +3,11 @@ ; AppID can never be changed as subsequent installations require the same installation ID each time AppID=FHIRServer AppName=Health Intersections FHIR Server -AppVerName=FHIRServer v3.4.12 +AppVerName=FHIRServer v3.4.13 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirserver-win64-3.4.12 +OutputBaseFilename=fhirserver-win64-3.4.13 Compression=lzma2/ultra64 ; 64 bit @@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall ; win2000+ add/remove programs support AppPublisher=Health Intersections P/L AppPublisherURL=http://www.healthintersections.com.au -AppVersion=3.4.12 +AppVersion=3.4.13 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+ -VersionInfoVersion=3.4.12.0 +VersionInfoVersion=3.4.13.0 ; dialog support LicenseFile=..\license diff --git a/library/ftx/fhir_valuesets.pas b/library/ftx/fhir_valuesets.pas index c9ed7c585..38043aa8b 100644 --- a/library/ftx/fhir_valuesets.pas +++ b/library/ftx/fhir_valuesets.pas @@ -1604,8 +1604,16 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW; m := FI18n.translate('NO_VALID_DISPLAY_AT_ALL', FParams.HTTPLanguages, [c.display, c.systemUri, c.code]) else begin - m := FI18n.translate('NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG', FParams.HTTPLanguages, [c.display, c.systemUri, c.code, FParams.langSummary, ds]); - severity := isError; + if ds = c.display then + begin + m := FI18n.translate('NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK', FParams.HTTPLanguages, [c.display, c.systemUri, c.code, FParams.langSummary, ds]); + severity := isInformation; + end + else + begin + m := FI18n.translate('NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_ERR', FParams.HTTPLanguages, [c.display, c.systemUri, c.code, FParams.langSummary, ds]); + severity := isError; + end; end; end else if dc = 1 then diff --git a/library/version.inc b/library/version.inc index 9a482fa65..0f5227e13 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ - FHIR_CODE_FULL_VERSION = '3.4.12'; - FHIR_CODE_RELEASE_DATE = '2024-09-22'; - FHIR_CODE_RELEASE_DATETIME = '20240922062714.947Z'; + FHIR_CODE_FULL_VERSION = '3.4.13'; + FHIR_CODE_RELEASE_DATE = '2024-09-23'; + FHIR_CODE_RELEASE_DATETIME = '20240923092555.964Z'; diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi index 2294028f9..5859bcf4b 100644 --- a/server/fhirconsole.lpi +++ b/server/fhirconsole.lpi @@ -18,7 +18,7 @@ - + diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj index becc88251..25e25ae54 100644 --- a/server/fhirserver.dproj +++ b/server/fhirserver.dproj @@ -92,7 +92,7 @@ true 3 4 - 12 + 13 false @@ -167,7 +167,7 @@ true false 3 - 12 + 13 none 4 false diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 31af0f95a..61100e80c 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -19,7 +19,7 @@ - + diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi index 77321e078..3cd06b13f 100644 --- a/toolkit2/fhirtoolkit.lpi +++ b/toolkit2/fhirtoolkit.lpi @@ -17,7 +17,7 @@ - +