PO updates - again

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java

@@ -373,9 +373,9 @@ public class POGenerator {
     }
     b.append("\r\n");
     for (POObject o : objects) {
-      b.append("#: "+o.id+"\r\n");
       // for POEdit
       b.append("# "+o.comment+"\r\n");
+      b.append("#: "+o.id+"\r\n");
       if (!tfxMode && o.oldMsgId != null) {
         b.append("#| "+o.oldMsgId+"\r\n");        
       }
@@ -472,15 +472,21 @@ public class POGenerator {
       if (Utilities.noString(line)) {
         // else 
       } else if (line.startsWith("#:")) {
-        obj = new POObject();
-        obj.id = line.substring(2).trim();
-        list.add(obj);
+        if (obj == null || obj.id != null) {
+          obj = new POObject();
+          list.add(obj);
+        }
+        obj.id = line.substring(2).trim();  
+      } else if (line.startsWith("# ")) {
+        if (obj == null || obj.comment != null) {
+          obj = new POObject();
+          list.add(obj);
+        }
+        obj.comment = line.substring(1).trim();
       } else if (obj == null) {
         prefixes.add(line);  
       } else if (line.startsWith("#|")) {
         obj.oldMsgId = line.substring(2).trim();
-      } else if (line.startsWith("# ")) {
-        obj.comment = line.substring(1).trim();
       } else if (line.startsWith("msgid ")) {
         obj.msgid = trimQuotes(line.substring(5).trim());
         if (obj.msgid.endsWith("("+obj.id+")")) {

org.hl7.fhir.utilities/src/main/resources/Messages.properties

@@ -351,7 +351,7 @@ LIQUID_SYNTAX_NOTERM = Script {0}: Unterminated Liquid statement {1}
 LIQUID_SYNTAX_NUMBER = Exception evaluating {0}: limit is not followed by a number
 LIQUID_SYNTAX_UNEXPECTED = Exception evaluating {0}: unexpected content at {1}
 LIQUID_SYNTAX_UNTERMINATED = Script {0}: Found unterminated string parsing cycle
-LIQUID_UNKNOWN_FILTER = Unknown Liquid filter '''{0}''
+LIQUID_UNKNOWN_FILTER = Unknown Liquid filter ''{0}''
 LIQUID_UNKNOWN_FLOW_STMT = Script {0}: Unknown flow control statement ''{1}''
 LIQUID_UNKNOWN_NOEND = Script {0}: Found end of script looking for {1}
 LIQUID_UNKNOWN_SYNTAX = Unexpected syntax parsing liquid statement
@@ -872,7 +872,7 @@ Type_Specific_Checks_DT_URI_WS = URI values cannot have whitespace(''{0}'')
 Type_Specific_Checks_DT_URL_Resolve = URL value ''{0}'' does not resolve
 Type_Specific_Checks_DT_UUID_Strat = UUIDs must start with urn:uuid:
 Type_Specific_Checks_DT_UUID_Valid = UUIDs must be valid and lowercase ({0})
-Type_Specific_Checks_DT_XHTML_Resolve = Hyperlink ''{0}'' at ''{1}'' for ''{2}''' does not resolve
+Type_Specific_Checks_DT_XHTML_Resolve = Hyperlink ''{0}'' at ''{1}'' for ''{2}'' does not resolve
 Type_Specific_Checks_DT_XHTML_Resolve_Img = Image source ''{0}'' at ''{1}'' does not resolve
 UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ = Unable to check whether the code is in the value set ''{0}''
 UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_CS = Unable to check whether the code is in the value set ''{0}'' because the code system {1} was not found

org.hl7.fhir.utilities/src/main/resources/Messages_ja.properties

@@ -282,7 +282,7 @@ LIQUID_SYNTAX_NOTERM = スクリプト {0}: 終了していないLiquidステー
 LIQUID_SYNTAX_NUMBER = {0}の評価例外: limitの後に数字が続いていません
 LIQUID_SYNTAX_UNEXPECTED = {0}の評価例外: {1}で予期しない内容があります
 LIQUID_SYNTAX_UNTERMINATED = スクリプト {0}: 解析サイクルで終了していない文字列を見つけました
-LIQUID_UNKNOWN_FILTER = 未知のLiquidフィルター '''{0}'''
+LIQUID_UNKNOWN_FILTER = !!未知のLiquidフィルター '''{0}'''
 LIQUID_UNKNOWN_FLOW_STMT = スクリプト {0}: 未知のフローコントロールステートメント ''{1}''
 LIQUID_UNKNOWN_NOEND = スクリプト {0}: {1}を探しているときにスクリプトの終了を見つけました
 LIQUID_UNKNOWN_SYNTAX = Liquidステートメントの解析中に予期しない構文がありました

org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties

@@ -56,7 +56,7 @@ BUNDLE_SEARCH = Search:
 BUNDLE_SEARCH_MODE = Mode = {0}
 BUNDLE_SEARCH_SCORE = Score = {0}
 BUND_REND_GEN_NARR = generating narrative
-BUND_REND_INVALID_DOC = Invalid document ''''{0}'''' - first entry is not a Composition ({0})
+BUND_REND_INVALID_DOC = Invalid document ''{0}'' - first entry is not a Composition ({0})
 CANON_REND_COMMITTEE = Committee
 GENERAL_COPYRIGHT = Copyright
 GENERAL_DEFINITION = Definition
@@ -455,12 +455,12 @@ QUEST_VALUE = Value Set:
 REND_ADDED = Added:
 REND_CHANGED = Changed:
 REND_REMOVED = Removed:
-REND_ROW_CHANGED_SINCE_WAS = This row of content has been changed since {0} (was ''''{1}'''')
+REND_ROW_CHANGED_SINCE_WAS = This row of content has been changed since {0} (was ''{1}'')
 GENERAL_REMOVED_SINCE = This content has been removed since {0}
 REND_ROW_SINCE = This row of content has been added since {0}
 REND_SINCE_ADDED = This content has been added since {0}
 REND_SINCE_CHANGED = This content has been changed since {0}
-REND_SINCE_CHANGED_WAS = This content has been changed since {0} (was ''''{1}'''')
+REND_SINCE_CHANGED_WAS = This content has been changed since {0} (was ''{1}'')
 REND_STANDARDS = Standards Status = {0}
 REQ_ACTOR = These requirements apply to the actor
 REQ_DERIVE = These requirements derive from

org.hl7.fhir.utilities/src/main/resources/rendering-phrases_nl.properties

@@ -47,7 +47,7 @@ BUNDLE_SEARCH = Zoeken:
 BUNDLE_SEARCH_MODE = Mode = {0}
 BUNDLE_SEARCH_SCORE = Score = {0}
 BUND_REND_GEN_NARR = narrative maken
-BUND_REND_INVALID_DOC = !!Ongeldig document ''{0}'' - eerste entry is geen Composition ({0})
+BUND_REND_INVALID_DOC = !!!!Ongeldig document ''{0}'' - eerste entry is geen Composition ({0})
 CANON_REND_COMMITTEE = Werkgroep
 CANON_REND_JSON = JSON
 CANON_REND_MATURITY = Volwassenheid
@@ -404,11 +404,11 @@ QUEST_VALUE = Waardelijst:
 REND_ADDED = Toegevoegd:
 REND_CHANGED = Gewijzigd:
 REND_REMOVED = Verwijderd:
-REND_ROW_CHANGED_SINCE_WAS = !!De rij met content is gewijzigd op {0} (was ''{1}'')
+REND_ROW_CHANGED_SINCE_WAS = !!!!De rij met content is gewijzigd op {0} (was ''{1}'')
 REND_ROW_SINCE = Deze rij met content is toegevoegd op {0}
 REND_SINCE_ADDED = Deze content is toegevoegd op {0}
 REND_SINCE_CHANGED = Deze content is gewijzigd op {0}
-REND_SINCE_CHANGED_WAS = !!Deze content is gewijzigd op {0} (was ''{1}'')
+REND_SINCE_CHANGED_WAS = !!!!Deze content is gewijzigd op {0} (was ''{1}'')
 REND_STANDARDS = Standaard status = {0}"
 REQ_ACTOR = Deze requirements zijn van toepassing op de actor
 REQ_DERIVE = Deze requirements zijn afgeleid van