src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java

rev 57965 : 8234347: "Turkey" meta time zone does not generate composed localized names
8236548: Localized time zone name inconsistency between English and other locales
Reviewed-by:

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2020, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 4258,4270 ****
--- 4258,4276 ----
                  return parseOffsetBased(context, text, position, position, OffsetIdPrinterParser.INSTANCE_ID_Z);
              } else if (length >= position + 2) {
                  char nextNextChar = text.charAt(position + 1);
                  if (context.charEquals(nextChar, 'U') && context.charEquals(nextNextChar, 'T')) {
                      if (length >= position + 3 && context.charEquals(text.charAt(position + 2), 'C')) {
+                         // There are localized zone texts that start with "UTC", e.g.
+                         // "UTC\u221210:00" (MINUS SIGN instead of HYPHEN-MINUS) in French.
+                         // Exclude those ZoneText cases.
+                         if (!(this instanceof ZoneTextPrinterParser)) {
                              return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
                          }
+                     } else {
                          return parseOffsetBased(context, text, position, position + 2, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
+                     }
                  } else if (context.charEquals(nextChar, 'G') && length >= position + 3 &&
                          context.charEquals(nextNextChar, 'M') && context.charEquals(text.charAt(position + 2), 'T')) {
                      if (length >= position + 4 && context.charEquals(text.charAt(position + 3), '0')) {
                          context.setParsed(ZoneId.of("GMT0"));
                          return position + 4;