Skip to content

Commit c27b51c

Browse files
authored
change default date formats to fix am/pm format, fixes #5949 (#5951)
1 parent 8054ff4 commit c27b51c

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

core/src/main/resources/org/apache/hop/core/messages/messages_en_US.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ Const.DateFormat18=dd-MM-yyyy
3737
Const.DateFormat19=yyyy-MM-dd''T''HH\:mm\:ss.SSSXXX
3838
Const.DateFormat2=yyyy/MM/dd HH\:mm\:ss.SSS XXX
3939
Const.DateFormat20=yyyy-MM-dd HH\:mm\:ss.SSS
40-
Const.DateFormat21=yyyy-MM-dd HH:mm:ss aa
41-
Const.DateFormat22=yyyy/MM/dd HH:mm:ss aa
42-
Const.DateFormat23=MM/dd/yyyy HH:mm:ss aa
43-
Const.DateFormat24=MM-dd-yyyy HH:mm:ss aa
40+
Const.DateFormat21=yyyy-MM-dd hh:mm:ss aa
41+
Const.DateFormat22=yyyy/MM/dd hh:mm:ss aa
42+
Const.DateFormat23=MM/dd/yyyy hh:mm:ss aa
43+
Const.DateFormat24=MM-dd-yyyy hh:mm:ss aa
4444
Const.DateFormat3=yyyy/MM/dd HH\:mm\:ss
4545
Const.DateFormat4=yyyy/MM/dd HH\:mm\:ss XXX
4646
Const.DateFormat5=yyyyMMddHHmmss

core/src/main/resources/org/apache/hop/core/messages/messages_pt_BR.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ Const.DateFormat18=dd-MM-yyyy
3838
Const.DateFormat19=yyyy-MM-dd''T''HH:mm:ss.SSSXXX
3939
Const.DateFormat2=yyyy/MM/dd HH:mm:ss.SSS XXX
4040
Const.DateFormat20=yyyy-MM-dd HH:mm:ss.SSS
41-
Const.DateFormat21=yyyy-MM-dd HH:mm:ss aa
42-
Const.DateFormat22=yyyy/MM/dd HH:mm:ss aa
43-
Const.DateFormat23=MM/dd/yyyy HH:mm:ss aa
44-
Const.DateFormat24=MM-dd-yyyy HH:mm:ss aa
41+
Const.DateFormat21=yyyy-MM-dd hh:mm:ss aa
42+
Const.DateFormat22=yyyy/MM/dd hh:mm:ss aa
43+
Const.DateFormat23=MM/dd/yyyy hh:mm:ss aa
44+
Const.DateFormat24=MM-dd-yyyy hh:mm:ss aa
4545
Const.DateFormat3=yyyy/MM/dd HH:mm:ss
4646
Const.DateFormat4=yyyy/MM/dd HH:mm:ss XXX
4747
Const.DateFormat5=yyyyMMddHHmmss

core/src/main/resources/org/apache/hop/core/messages/messages_zh_CN.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ Const.DateFormat18=dd-MM-yyyy
3636
Const.DateFormat19=yyyy-MM-dd''T''HH:mm:ss.SSSXXX
3737
Const.DateFormat2=yyyy/MM/dd HH:mm:ss.SSS XXX
3838
Const.DateFormat20=yyyy-MM-dd HH:mm:ss.SSS
39-
Const.DateFormat21=yyyy-MM-dd HH:mm:ss aa
40-
Const.DateFormat22=yyyy/MM/dd HH:mm:ss aa
41-
Const.DateFormat23=MM/dd/yyyy HH:mm:ss aa
39+
Const.DateFormat21=yyyy-MM-dd hh:mm:ss aa
40+
Const.DateFormat22=yyyy/MM/dd hh:mm:ss aa
41+
Const.DateFormat23=MM/dd/yyyy hh:mm:ss aa
42+
Const.DateFormat24=MM-dd-yyyy hh:mm:ss aa
4243
Const.Deprecated=\uFF08\u5DF2\u5F03\u7528\uFF09
4344
Const.GA.HelpAboutText=\u6B63\u5F0F\u53D1\u5E03\u7248
4445
Const.Milestone.HelpAboutText=\u5F00\u53D1\u8005\u53D1\u5E03\u7248

0 commit comments

Comments
 (0)