fhirsmith 0.9.5 → 0.9.7

package/CHANGELOG.md

@@ -6,11 +6,49 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v0.9.7] - 2026-06-12
+
+### Added
+
+- Support for tx modele to load resources directly 
+- Missing overwork protection processing ECL
+
+### Fixed
+
+- Fix bug validating secondary displays across languages
+- Fix CORS issue (double headers)
+- Fix czech code in snomed import
+- Many minor validation fixes
+- ECL processing bugs
+- Publishing: better logging, and fix timeout & restart error
+
+### Tx Conformance Statement
+
+FHIRsmith passed all 2503 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.10)
+
+## [v0.9.6] - 2026-05-21
+
+### Added
+
+- increase timeout when publishing IGs (for US Core)
+
+### Fixed
+
+- Replace re2-wasm with re2js in library/regex-utilities.js to eliminate the underlying WASM-heap leak
+- Fix async problem loading OMOP
+- Fix memory leaks
+- Don't leak database connections
+
+### Tx Conformance Statement
+
+FHIRsmith passed all 1649 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.7)
+
 ## [v0.9.5] - 2026-05-16
 
 ### Fixed
 
 - Workaround for memory leak in re2-wasm library that reduces it's severity
+- Replace re2-wasm with re2js in library/regex-utilities.js to eliminate the underlying WASM-heap leak
 
 ### Tx Conformance Statement
 

package/config-template.json

@@ -63,7 +63,8 @@
       "enabled": true,
       "database": "/absolute/path/to/publisher.db",
       "sessionSecret": "change-this-to-a-secure-random-string",
-      "workspaceRoot": "/absolute/path/to/workspaces"
+      "workspaceRoot": "/absolute/path/to/workspaces",
+      "igPublisherTimeoutMinutes": 60
     },
     "npmprojector": {
       "enabled": true,

package/library/folder-content-loader.js

@@ -0,0 +1,91 @@
+const fs = require('fs').promises;
+const path = require('path');
+const { PackageContentLoader } = require('./package-manager');
+
+/**
+ * A content loader that scans a folder for JSON FHIR terminology resources
+ * (CodeSystem, ValueSet, ConceptMap). It synthesizes the package layout that
+ * PackageContentLoader expects so the existing PackageValueSetProvider /
+ * PackageConceptMapProvider machinery can be reused without modification.
+ *
+ * The user's source folder is treated as read-only. Any SQLite caches built
+ * by the Package*Provider classes are written to the cacheFolder passed in,
+ * not to the source folder.
+ */
+class FolderContentLoader extends PackageContentLoader {
+  /**
+   * @param {string} sourceFolder - Folder to scan for JSON resources
+   * @param {string} cacheFolder - Folder where Package*Provider DBs may live
+   */
+  constructor(sourceFolder, cacheFolder) {
+    super(cacheFolder);
+    this.sourceFolder = sourceFolder;
+    // Resources are read directly from the source folder rather than from
+    // <packageFolder>/package as PackageContentLoader assumes.
+    this.packageSubfolder = sourceFolder;
+  }
+
+  /**
+   * Replaces the standard initialize: there is no package.json or .index.json
+   * to read, so we synthesize an index from the JSON files in the folder.
+   */
+  async initialize() {
+    if (this.loaded) {
+      return;
+    }
+
+    try {
+      const stat = await fs.stat(this.sourceFolder);
+      if (!stat.isDirectory()) {
+        throw new Error(`Folder source path is not a directory: ${this.sourceFolder}`);
+      }
+    } catch (err) {
+      if (err.code === 'ENOENT') {
+        throw new Error(`Folder source path does not exist: ${this.sourceFolder}`);
+      }
+      throw err;
+    }
+
+    // Synthesize package metadata so id()/version()/pid() return something usable.
+    this.package = {
+      name: 'folder.' + path.basename(this.sourceFolder),
+      version: '0.0.0',
+      fhirVersions: ['5.0.0']
+    };
+
+    const files = [];
+    const entries = await fs.readdir(this.sourceFolder, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (!entry.name.toLowerCase().endsWith('.json')) continue;
+
+      const fullPath = path.join(this.sourceFolder, entry.name);
+      let json;
+      try {
+        const content = await fs.readFile(fullPath, 'utf8');
+        json = JSON.parse(content);
+      } catch {
+        // Skip unreadable / non-JSON files rather than failing the whole load.
+        continue;
+      }
+
+      if (!json || typeof json !== 'object') continue;
+      const rt = json.resourceType;
+      if (rt !== 'CodeSystem' && rt !== 'ValueSet' && rt !== 'ConceptMap') continue;
+
+      files.push({
+        filename: entry.name,
+        resourceType: rt,
+        id: json.id,
+        url: json.url,
+        version: json.version
+      });
+    }
+
+    this.index = { files, 'index-version': 2 };
+    this.buildIndexes();
+    this.loaded = true;
+  }
+}
+
+module.exports = { FolderContentLoader };

package/library/regex-utilities.js

@@ -1,27 +1,64 @@
-const { RE2 } = require('re2-wasm');
+const { RE2JS } = require('re2js');
+
+// Translate a JS-style flags string ("i", "im", "is", etc.) into the bit-flag
+// integer that RE2JS.compile() expects. Only the flags actually used by callers
+// (and their natural counterparts) are mapped; anything else is ignored.
+function toRE2JSFlags(flags) {
+  if (!flags) return 0;
+  let bits = 0;
+  if (flags.includes('i')) bits |= RE2JS.CASE_INSENSITIVE;
+  if (flags.includes('m')) bits |= RE2JS.MULTILINE;
+  if (flags.includes('s')) bits |= RE2JS.DOTALL;
+  // The 'u' flag was a re2-wasm workaround; re2js is pure JS and handles
+  // unicode natively, so it's a no-op here.
+  return bits;
+}
+
+// Thin wrapper that exposes the only method the rest of the codebase uses
+// against compiled regexes: a JS-RegExp-style `.test(input)` that returns
+// true if the pattern is found anywhere in `input`.
+class CompiledRegex {
+  constructor(pattern, flags) {
+    this._pattern = RE2JS.compile(pattern, toRE2JSFlags(flags));
+  }
+
+  test(input) {
+    if (input == null) return false;
+    return this._pattern.matcher(String(input)).find();
+  }
+}
 
 class RegExUtilities {
 
+  // re2js doesn't have re2-wasm's WASM-heap leak, so the cache here is
+  // purely a performance optimisation. We cap it with a simple LRU so a
+  // workload with many distinct regex patterns can't grow it without bound.
+  static MAX_CACHE_SIZE = 1000;
+
   constructor() {
     this._cache = new Map();
   }
 
   compile(pattern, flags) {
-    // re2-wasm has a fixed 16 MB WASM heap with no real free(): every
-    // new RE2(...) permanently consumes a few KB. Cache by (pattern, flags)
-    // so the same regex compiles at most once.
-    // TODO: replace re2-wasm with native re2 to eliminate the underlying leak.
-    const re2Flags = flags && flags.includes('u') ? flags : (flags || '') + 'u';
-    const key = pattern + '|' + re2Flags;
-    let compiled = this._cache.get(key);
-    if (!compiled) {
-      compiled = new RE2(pattern, re2Flags);
-      this._cache.set(key, compiled);
+    const key = pattern + '|' + (flags || '');
+    const cached = this._cache.get(key);
+    if (cached) {
+      // Move to most-recently-used position by re-inserting.
+      this._cache.delete(key);
+      this._cache.set(key, cached);
+      return cached;
+    }
+    const compiled = new CompiledRegex(pattern, flags);
+    if (this._cache.size >= RegExUtilities.MAX_CACHE_SIZE) {
+      // Evict the oldest entry. Map iteration order is insertion order, so
+      // the first key is the least-recently-used.
+      const oldest = this._cache.keys().next().value;
+      this._cache.delete(oldest);
     }
+    this._cache.set(key, compiled);
     return compiled;
   }
 
 }
 
 module.exports = new RegExUtilities();
- 

package/npmprojector/npmprojector.js

@@ -127,12 +127,8 @@ class NpmProjectorModule {
    * Set up Express routes
    */
   setupRoutes() {
-    // CORS for browser access
-    this.router.use((req, res, next) => {
-      res.header('Access-Control-Allow-Origin', '*');
-      res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
-      next();
-    });
+    // CORS is handled once at the app level (server.js, from config.server.cors).
+    // Do not set Access-Control-* headers here.
 
     // Root - module info
     this.router.get('/', (req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirsmith",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "txVersion": "1.9.1",
   "description": "A Node.js server that provides a collection of tools to serve the FHIR ecosystem",
   "main": "server.js",
@@ -61,7 +61,7 @@
     "passport-github2": "^0.1.12",
     "passport-google-oauth20": "^2.0.0",
     "properties-file": "^3.6.4",
-    "re2-wasm": "^1.0.2",
+    "re2js": "^2.8.0",
     "rimraf": "^5.0.10",
     "sqlite3": "^5.1.7",
     "tar": "^7.5.7",

package/publisher/publisher.js

@@ -17,6 +17,7 @@ class PublisherModule {
     this.logger = null;
     this.taskProcessor = null;
     this.isProcessing = false;
+    this.activeTaskIds = new Set();
     this.shutdownRequested = false;
     this.stats = stats;
   }
@@ -308,13 +309,19 @@ class PublisherModule {
       if (this.shutdownRequested) return;
 
       if (this.isProcessing) {
+        // A publication can legitimately run for longer than an hour (go-publish on a
+        // large IG), so never reset isProcessing while a task is in flight — doing so
+        // lets the poller start a second, concurrent run of the same task, which then
+        // fails on 'ig-registry already exists' and stomps the real run's status.
+        // Recovery from a genuinely hung IG Publisher is handled by the
+        // igPublisherTimeoutMinutes kill in runIgPublisher/runPublisherGoPublish.
         const stuckMs = this.isProcessingStarted ? Date.now() - this.isProcessingStarted : 0;
-        if (stuckMs > 60 * 60 * 1000) {
-          this.logger.warn('Task processor appears stuck (' + Math.round(stuckMs / 60000) + ' min) — resetting');
-          this.isProcessing = false;
-        } else {
-          return;
+        const warnAfterMs = ((this.config.igPublisherTimeoutMinutes || 60) + 30) * 60 * 1000;
+        if (stuckMs > warnAfterMs) {
+          this.logger.warn('Task processor still busy after ' + Math.round(stuckMs / 60000) + ' min (tasks: ' +
+            Array.from(this.activeTaskIds).join(', ') + ') — possible hang, not starting new work');
         }
+        return;
       }
 
       await this.processNextTask();
@@ -325,10 +332,14 @@ class PublisherModule {
     this.isProcessing = true;
     this.isProcessingStarted = Date.now();
 
+    let claimedTaskId = null;
     try {
       // Look for queued tasks first (draft builds)
       let task = await this.getNextQueuedTask();
       if (task) {
+        if (this.activeTaskIds.has(task.id)) return; // already being processed
+        claimedTaskId = task.id;
+        this.activeTaskIds.add(task.id);
         this.stats.task('Publisher', 'Building ' + task.npm_package_id + '#' + task.version);
         await this.processDraftBuild(task);
         this.stats.taskDone('Publisher', 'Built ' + task.npm_package_id + '#' + task.version);
@@ -338,6 +349,9 @@ class PublisherModule {
       // Then look for approved tasks (publishing)
       task = await this.getNextApprovedTask();
       if (task) {
+        if (this.activeTaskIds.has(task.id)) return; // already being processed
+        claimedTaskId = task.id;
+        this.activeTaskIds.add(task.id);
         this.stats.task('Publisher', 'Publishing ' + task.npm_package_id + '#' + task.version);
         await this.processPublication(task);
         this.stats.taskDone('Publisher', 'Published ' + task.npm_package_id + '#' + task.version);
@@ -349,6 +363,9 @@ class PublisherModule {
       this.logger.error('Error in task processor:', error);
       this.stats.taskError('Publisher', 'Error: ' + error.message);
     } finally {
+      if (claimedTaskId !== null) {
+        this.activeTaskIds.delete(claimedTaskId);
+      }
       this.isProcessing = false;
     }
   }
@@ -390,6 +407,9 @@ class PublisherModule {
       fields.push('waiting_approval_at = CURRENT_TIMESTAMP');
     } else if (status === 'complete') {
       fields.push('completed_at = CURRENT_TIMESTAMP');
+      // A successful completion invalidates any earlier failure (e.g. from a
+      // superseded duplicate run) — don't let a stale message outlive success.
+      fields.push('failure_reason = NULL');
     } else if (status === 'failed') {
       fields.push('failed_at = CURRENT_TIMESTAMP');
     }
@@ -414,6 +434,28 @@ class PublisherModule {
     });
   }
 
+  // Update arbitrary task fields WITHOUT touching status. Use this from long-running
+  // work (e.g. saving the announcement mid-publication) — writing back the in-memory
+  // task.status can resurrect a stale status and cause the poller to re-run the task.
+  async updateTaskFields(taskId, fields) {
+    const keys = Object.keys(fields);
+    if (keys.length === 0) return;
+    const assignments = keys.map(key => key + ' = ?');
+    const values = keys.map(key => fields[key]);
+    values.push(taskId);
+
+    return new Promise((resolve, reject) => {
+      this.db.run(
+          'UPDATE tasks SET ' + assignments.join(', ') + ' WHERE id = ?',
+          values,
+          (err) => {
+            if (err) reject(err);
+            else resolve();
+          }
+      );
+    });
+  }
+
   async logTaskMessage(taskId, level, message) {
     return new Promise((resolve) => {
       this.db.run(
@@ -622,14 +664,38 @@ class PublisherModule {
       // Create log file stream
       const logStream = fs.createWriteStream(logFile);
 
+      const buildStart = Date.now();
+      let lastDataAt = Date.now();
+
       java.stdout.on('data', (data) => {
+        lastDataAt = Date.now();
         logStream.write(data);
       });
 
       java.stderr.on('data', (data) => {
+        lastDataAt = Date.now();
         logStream.write(data);
       });
 
+      // Heartbeat: emit a status line every 60s regardless of stdout activity,
+      // so silent phases of the Publisher (e.g. "Validating Resources") still
+      // surface a signal-of-life in the task log.
+      const heartbeat = setInterval(async () => {
+        const elapsedMs = Date.now() - buildStart;
+        const sinceDataMs = Date.now() - lastDataAt;
+        let logKb = 0;
+        try { logKb = Math.round(fs.statSync(logFile).size / 1024); } catch (_) {}
+        const elapsedMin = Math.floor(elapsedMs / 60000);
+        const elapsedSec = Math.floor(elapsedMs / 1000) % 60;
+        const idleSec = Math.floor(sinceDataMs / 1000);
+        await this.logTaskMessage(
+          taskId,
+          'info',
+          'IG Publisher heartbeat: elapsed ' + elapsedMin + 'm' + elapsedSec + 's, ' +
+          'log ' + logKb + ' KB, last output ' + idleSec + 's ago'
+        );
+      }, 60 * 1000);
+
       java.on('close', async (code) => {
         logStream.end();
 
@@ -649,16 +715,18 @@ class PublisherModule {
         reject(error);
       });
 
-      // Timeout after 30 minutes
+      // Timeout configurable via publisher.igPublisherTimeoutMinutes (default: 60 minutes)
+      const timeoutMinutes = this.config.igPublisherTimeoutMinutes || 60;
       const timeout = setTimeout(async () => {
         java.kill();
         logStream.end();
-        await this.logTaskMessage(taskId, 'error', 'IG Publisher timed out after 30 minutes');
+        await this.logTaskMessage(taskId, 'error', 'IG Publisher timed out after ' + timeoutMinutes + ' minutes');
         reject(new Error('IG Publisher timed out'));
-      }, 30 * 60 * 1000);
+      }, timeoutMinutes * 60 * 1000);
 
       java.on('close', () => {
         clearTimeout(timeout);
+        clearInterval(heartbeat);
       });
     });
   }
@@ -788,7 +856,7 @@ class PublisherModule {
     if (fs.existsSync(announcementPath)) {
       try {
         const announcement = fs.readFileSync(announcementPath, 'utf8');
-        await this.updateTaskStatus(task.id, task.status, { announcement: announcement });
+        await this.updateTaskFields(task.id, { announcement: announcement });
         await this.logTaskMessage(task.id, 'info', 'Announcement text saved (' + announcement.length + ' chars)');
       } catch (err) {
         await this.logTaskMessage(task.id, 'warn', 'Failed to read announcement file: ' + err.message);
@@ -829,14 +897,37 @@ class PublisherModule {
 
       const logStream = fs.createWriteStream(logFile);
 
+      const buildStart = Date.now();
+      let lastDataAt = Date.now();
+
       java.stdout.on('data', (data) => {
+        lastDataAt = Date.now();
         logStream.write(data);
       });
 
       java.stderr.on('data', (data) => {
+        lastDataAt = Date.now();
         logStream.write(data);
       });
 
+      // Heartbeat: emit a status line every 60s regardless of stdout activity,
+      // so silent phases of the Publisher still surface a signal-of-life.
+      const heartbeat = setInterval(async () => {
+        const elapsedMs = Date.now() - buildStart;
+        const sinceDataMs = Date.now() - lastDataAt;
+        let logKb = 0;
+        try { logKb = Math.round(fs.statSync(logFile).size / 1024); } catch (_) {}
+        const elapsedMin = Math.floor(elapsedMs / 60000);
+        const elapsedSec = Math.floor(elapsedMs / 1000) % 60;
+        const idleSec = Math.floor(sinceDataMs / 1000);
+        await this.logTaskMessage(
+          taskId,
+          'info',
+          'IG Publisher go-publish heartbeat: elapsed ' + elapsedMin + 'm' + elapsedSec + 's, ' +
+          'log ' + logKb + ' KB, last output ' + idleSec + 's ago'
+        );
+      }, 60 * 1000);
+
       java.on('close', async (code) => {
         logStream.end();
         if (code === 0) {
@@ -855,16 +946,18 @@ class PublisherModule {
         reject(error);
       });
 
-      // Timeout after 60 minutes for publication (longer than draft build)
+      // Timeout configurable via publisher.igPublisherTimeoutMinutes (default: 60 minutes)
+      const timeoutMinutes = this.config.igPublisherTimeoutMinutes || 60;
       const timeout = setTimeout(async () => {
         java.kill();
         logStream.end();
-        await this.logTaskMessage(taskId, 'error', 'IG Publisher go-publish timed out after 60 minutes');
+        await this.logTaskMessage(taskId, 'error', 'IG Publisher go-publish timed out after ' + timeoutMinutes + ' minutes');
         reject(new Error('IG Publisher go-publish timed out'));
-      }, 60 * 60 * 1000);
+      }, timeoutMinutes * 60 * 1000);
 
       java.on('close', () => {
         clearTimeout(timeout);
+        clearInterval(heartbeat);
       });
     });
   }

package/registry/registry.js

@@ -758,7 +758,7 @@ class RegistryModule {
       case '11000267109': edition = 'KR'; break;
       case '900000001000122104': edition = 'ES-ES'; break;
       case '2011000195101': edition = 'CH'; break;
-      case '11000279109': edition = 'CX'; break;
+      case '11000279109': edition = 'CZ'; break;
       case '999000021000000109': edition = 'UK+Clinical'; break;
       case '5631000179106': edition = 'UY'; break;
       case '21000325107': edition = 'CL'; break;
@@ -1233,7 +1233,7 @@ class RegistryModule {
     // FHIR Version field
     html += '<p>';
     html += '<label for="fhirVersion" class="form-label fw-bold">FHIR Version <span class="text-danger">*</span></label>';
-    html += `<input type="text" class="form-control" id="fhirVersion" name="fhirVersion" size="8" 
+    html += `<input type="text" class="form-control" id="fhirVersion" name="fhirVersion" size="8"
            value="${escape(fhirVersion)}" required>`;
     html += '</p>';
     html += '<p class="text-muted small">Examples: R4, 4.0.1, 5.0.0, etc.</p>';
@@ -1241,7 +1241,7 @@ class RegistryModule {
     html += '<div class="alert alert-info">Either Code System URL or Value Set URL must be provided:</div>';
     html += '<p>';
     html += '<label for="url" class="form-label fw-bold">Code System URL</label>';
-    html += `<input type="url" class="form-control" id="url" name="url" 
+    html += `<input type="url" class="form-control" id="url" name="url"
            value="${escape(url)}">`;
     html += '</p>';
     html += '<p class="text-muted small">Example: http://loinc.org</p>';
@@ -1249,7 +1249,7 @@ class RegistryModule {
     // ValueSet URL field - now vertical
     html += '<p>';
     html += '<label for="valueSet" class="form-label fw-bold">Value Set URL</label>';
-    html += `<input type="url" class="form-control" id="valueSet" name="valueSet" 
+    html += `<input type="url" class="form-control" id="valueSet" name="valueSet"
            value="${escape(valueSet)}">`;
     html += '</p>';
     html += '<p class="text-muted small">Example: http://hl7.org/fhir/ValueSet/observation-codes</p>';
@@ -1257,7 +1257,7 @@ class RegistryModule {
 
     // Authoritative Only checkbox
     html += '<p>';
-    html += `<input type="checkbox" class="form-check-input" id="authoritativeOnly" 
+    html += `<input type="checkbox" class="form-check-input" id="authoritativeOnly"
            name="authoritativeOnly" value="true" ${authoritativeOnly ? 'checked' : ''}>`;
     html += '<label class="form-check-label" for="authoritativeOnly">&nbsp;Show only authoritative servers</label>';
     html += '</p>';
@@ -1276,7 +1276,7 @@ class RegistryModule {
     document.querySelector('form').addEventListener('submit', function(e) {
       const url = document.getElementById('url').value.trim();
       const valueSet = document.getElementById('valueSet').value.trim();
-      
+
       if (!url && !valueSet) {
         e.preventDefault();
         alert('You must provide either a Code System URL or a Value Set URL');

package/server.js

@@ -7,7 +7,7 @@
 //
 
 const express = require('express');
-// const cors = require('cors');
+const cors = require('cors');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
@@ -82,7 +82,11 @@ app.use((req, res, next) => {
   next();
 });
 
-// app.use(cors(config.server.cors));
+// Single, app-level CORS policy for all modules, driven by config.server.cors.
+// This also handles OPTIONS preflight, so modules must NOT set their own
+// Access-Control-* headers (doing so stacks a second CORS layer and produces
+// duplicate, conflicting headers that browsers reject).
+app.use(cors(config.server.cors));
 
 // Module instances
 const modules = {};

package/test-scripts/repro-re2-wasm-leak.js

@@ -1,14 +1,15 @@
-// Manual reproducer for the re2-wasm WASM heap leak.
-// See library/regex-utilities.js for the workaround.
+// Historical reproducer for the re2-wasm WASM heap leak.
+// regex-utilities.js now sits on top of re2js (a pure-JS RE2 port), so the
+// underlying leak is gone. Kept as a stress test for the compile cache:
 //
 //   node test-scripts/repro-re2-wasm-leak.js            # same-pattern stress
 //   node test-scripts/repro-re2-wasm-leak.js --unique   # unique-pattern stress
 //
-// Without the cache, same-pattern OOMs at ~2965 iterations.
-// With the cache, same-pattern runs indefinitely.
-// Unique-pattern still OOMs (each pattern is a real compile and the underlying
-// re2-wasm heap leak still applies). A proper fix is to replace re2-wasm with
-// the native `re2` package.
+// Background (re2-wasm era): without the cache, same-pattern OOMed at ~2965
+// iterations; with the cache, same-pattern ran indefinitely but unique-pattern
+// still OOMed because every distinct pattern was a real compile and re2-wasm
+// could not free its WASM heap. Under re2js both modes now run indefinitely
+// (unique-pattern is bounded only by ordinary V8 heap growth from the cache).
 
 const re = require('../library/regex-utilities');
 

package/translations/Messages.properties

@@ -544,7 +544,7 @@ NO_VALID_DISPLAY_FOUND_LANG_NONE_other = ''{5}'' is the default display; the cod
 NO_VALID_DISPLAY_FOUND_LANG_SOME_one = ''{5}'' is the default display; no valid Display Names found for {1}#{2} in the language {4}
 NO_VALID_DISPLAY_FOUND_LANG_SOME_other = ''{5}'' is the default display; no valid Display Names found for {1}#{2} in the language {4}
 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_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}'' which is the default language display
+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 ''{0}'' which is a valid display for the default language
 NO_VALID_DISPLAY_FOUND_one = No valid Display Names found for {1}#{2} in the language {4}
 NO_VALID_DISPLAY_FOUND_other = No valid Display Names found for {1}#{2} in the languages {4}
 No_validator_configured = No validator configured