CLDR-14571 json: improve format of metazone short alias (#1489)

- omit _deprecated:false (the default) - use _deprecated: true (a boolean instead of string) - remove debugging string Also: - CLDR-14607: whitespace fix in DTD
unicode-org · Sep 8, 2021 · 4b121e3 · 4b121e3
1 parent 2875bb6
commit 4b121e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd
@@ -1168,7 +1168,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST metazoneId longId CDATA #IMPLIED >
     <!--@MATCH:metazone-->
     <!--@VALUE-->
-    <!ATTLIST metazoneId deprecated (true | false) "false" >
+<!ATTLIST metazoneId deprecated (true | false) "false" >
     <!--@VALUE-->
 <!ATTLIST metazoneId preferred NMTOKEN #IMPLIED >
     <!--@MATCH:metazone-->

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
@@ -1251,7 +1251,6 @@ private void startNonleafNode(JsonWriter out, CldrNode node, int level)
                     out.name(attrAsKey).value(v);
                 } // else, omit
             } else {
-                System.err.println(node.getUntransformedPath()+ "@BOOOOL@"+ node.getName() +":"+ node.getParent() +":"+ key+"="+rawAttrValue);
                 out.name(attrAsKey).value(value);
             }
         }

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java b/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java
@@ -597,15 +597,15 @@ public static final boolean valueIsSpacesepArray(final String nodeName, String p
             || (parent!=null && CHILD_VALUE_IS_SPACESEP_ARRAY.contains(parent));
     }
 
-    static final Set<String> BCP47_BOOLEAN_OMIT_FALSE = ImmutableSet.of(
+    static final Set<String> BOOLEAN_OMIT_FALSE = ImmutableSet.of(
         // attribute names within bcp47 that are booleans, but omitted if false.
         "deprecated"
     );
 
     // These attributes are booleans, and should be omitted if false
     public static final boolean attrIsBooleanOmitFalse(final String fullPath, final String nodeName, final String parent, final String key) {
         return (fullPath != null &&
-            (fullPath.startsWith("//ldmlBCP47/keyword/key") &&
-            BCP47_BOOLEAN_OMIT_FALSE.contains(key)));
+            (fullPath.startsWith("//supplementalData/metaZones/metazoneIds") &&
+            BOOLEAN_OMIT_FALSE.contains(key)));
     }
 }