archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205432: Replace the placeholder Japanese era name

Browse source 
Reviewed-by: rriggs, chegar
This commit is contained in:
Naoto Sato 2019-04-01 08:19:21 -07:00
parent 2cc859d380
commit 2a510a6353
29 changed files with 134 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/java.base/share/classes/sun/text/resources/FormatData.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -106,7 +106,7 @@ public class FormatData extends ParallelListResourceBundle {
"T",
"S",
"H",
"N", // NewEra
"R",
};
// Japanese imperial calendar era strings
@ -116,7 +116,7 @@ public class FormatData extends ParallelListResourceBundle {
"Taisho",
"Showa",
"Heisei",
"NewEra", // NewEra
"Reiwa",
};
return new Object[][] {

4
src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -159,7 +159,7 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"Taisho",
"Showa",
"Heisei",
"NewEra", // New Era
"Reiwa",
};
final String[] sharedShortEras = {