[hop] branch master updated: Add additonal Date Format Mask for AM/PM #2476

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9268b79848 Add additonal Date Format Mask for AM/PM #2476
     new ff67e88f9e Merge pull request #2552 from nadment/2476
9268b79848 is described below

commit 9268b7984856acd63f3ea33eeb66401dc9ae35e7
Author: Nicolas Adment <39568358+nadm...@users.noreply.github.com>
AuthorDate: Fri Mar 10 22:42:43 2023 +0100

    Add additonal Date Format Mask for AM/PM #2476
---
 core/src/main/java/org/apache/hop/core/Const.java                   | 1 +
 .../org/apache/hop/core/messages/messages_en_US.properties          | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/hop/core/Const.java 
b/core/src/main/java/org/apache/hop/core/Const.java
index fade3e330a..a8fb2a690e 100644
--- a/core/src/main/java/org/apache/hop/core/Const.java
+++ b/core/src/main/java/org/apache/hop/core/Const.java
@@ -2381,6 +2381,7 @@ public class Const {
       for (int i = 1; i <= dateFormatsCount; i++) {
         dateFormats[i - 1] = BaseMessages.getString(PKG, "Const.DateFormat" + 
Integer.toString(i));
       }
+      Arrays.sort(dateFormats);
     }
     return dateFormats;
   }
diff --git 
a/core/src/main/resources/org/apache/hop/core/messages/messages_en_US.properties
 
b/core/src/main/resources/org/apache/hop/core/messages/messages_en_US.properties
index 9047d3bb69..60f8ea6be2 100644
--- 
a/core/src/main/resources/org/apache/hop/core/messages/messages_en_US.properties
+++ 
b/core/src/main/resources/org/apache/hop/core/messages/messages_en_US.properties
@@ -23,7 +23,7 @@ CheckResult.Remark=Remark
 CheckResult.Warning=Warning
 Const.BaseDocUrl=https://hop.apache.org/manual/
 Const.Candidate.HelpAboutText=Release Candidate 1
-Const.DateFormat.Count=20
+Const.DateFormat.Count=24
 Const.DateFormat10=yyyyMMdd
 Const.DateFormat11=MM/dd/yyyy
 Const.DateFormat12=MM/dd/yyyy HH\:mm\:ss
@@ -36,6 +36,10 @@ Const.DateFormat18=dd-MM-yyyy
 Const.DateFormat19=yyyy-MM-dd''T''HH\:mm\:ss.SSSXXX
 Const.DateFormat1=yyyy/MM/dd HH\:mm\:ss.SSS
 Const.DateFormat20=yyyy-MM-dd HH\:mm\:ss.SSS
+Const.DateFormat21=yyyy-MM-dd HH:mm:ss aa
+Const.DateFormat22=yyyy/MM/dd HH:mm:ss aa
+Const.DateFormat23=MM/dd/yyyy HH:mm:ss aa
+Const.DateFormat24=MM-dd-yyyy HH:mm:ss aa
 Const.DateFormat2=yyyy/MM/dd HH\:mm\:ss.SSS XXX
 Const.DateFormat3=yyyy/MM/dd HH\:mm\:ss
 Const.DateFormat4=yyyy/MM/dd HH\:mm\:ss XXX