From a4718a3b13b1e0cdbc0934e29a838de80f5bb9d0 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 10 Jun 2024 18:16:53 -0500
Subject: [PATCH 01/10] CLDR-16835 prepare for separate DDL phase

- add CLDR_DDL_PHASE configuration var
- add separate DDL phase, defaulting to CLDR_PHASE
- pass phase through to client
- add separate tc org parameter in the locales list
---
 tools/cldr-apps/js/src/esm/cldrStatus.mjs     | 13 ++++++++++++
 .../org/unicode/cldr/util/CLDRConfigImpl.java |  5 +++++
 .../java/org/unicode/cldr/web/SurveyAjax.java |  2 ++
 .../java/org/unicode/cldr/web/SurveyMain.java | 21 +++++++++++++++++++
 .../org/unicode/cldr/util/CLDRConfig.java     |  8 +++++++
 5 files changed, 49 insertions(+)

diff --git a/tools/cldr-apps/js/src/esm/cldrStatus.mjs b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
index da6b0d94d29..bdc35ba282d 100644
--- a/tools/cldr-apps/js/src/esm/cldrStatus.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
@@ -75,6 +75,9 @@ function updateAll(status) {
   if (status.phase) {
     setPhase(status.phase);
   }
+  if (status.ddlPhase) {
+    setDdlPhase(status.ddlPhase);
+  }
   if (status.specialHeader) {
     setSpecialHeader(status.specialHeader);
   }
@@ -296,9 +299,17 @@ function getPhase() {
   return phase;
 }
 
+let ddlPhase = "";
 function setPhase(p) {
   phase = p;
 }
+function getDdlPhase() {
+  return ddlPhase;
+}
+
+function setDdlPhase(p) {
+  ddlPhase = p;
+}
 
 /**
  * Is this a "beta" phase of Survey Tool? (Boolean)
@@ -479,6 +490,7 @@ export {
   getNewVersion,
   getOrganizationName,
   getPermissions,
+  getDdlPhase,
   getPhase,
   getRunningStamp,
   getSessionId,
@@ -507,6 +519,7 @@ export {
   setOrganizationName,
   setPermissions,
   setPhase,
+  setDdlPhase,
   setSessionId,
   setSessionMessage,
   setSpecialHeader,
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
index ac19827e85c..3f4bd0949fb 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
@@ -460,6 +460,11 @@ public CheckCLDR.Phase getPhase() {
         return SurveyMain.phase().getCPhase();
     }
 
+    @Override
+    public CheckCLDR.Phase getDDLPhase() {
+        return SurveyMain.getDDLPhase().getCPhase();
+    }
+
     @Override
     public CLDRURLS internalGetUrls() {
         if (contextUrl == null) contextUrl = CLDRURLS.DEFAULT_PATH;
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 71a9bce2f18..50b647f5b36 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -1092,6 +1092,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
         // locales will have info about each locale, including name
         JSONObject locales = new JSONObject();
         SupplementalDataInfo sdi = sm.getSupplementalDataInfo();
+        final StandardCodes sc = StandardCodes.make();
 
         Factory disk = sm.getDiskFactory();
 
@@ -1118,6 +1119,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
             locale.put("highestParent", loc.getHighestNonrootParent());
             locale.put("dcParent", dcParent);
             locale.put("dcChild", dcChild);
+            locale.put("tc", SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName()));
             locale.put(
                     "type",
                     Factory.getSourceTreeType(disk.getSourceDirectoryForLocale(loc.getBaseName())));
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index 3b162f5eafc..8c85cd52bf1 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -209,6 +209,7 @@ public String display() {
 
     // ===== Configuration state
     private static Phase currentPhase = Phase.VETTING;
+    private static Phase currentDdlPhase = Phase.VETTING;
     /** set by CLDR_PHASE property. * */
     private static String oldVersion = "OLDVERSION";
 
@@ -2823,6 +2824,20 @@ private void doStartup() {
                                     + phaseString);
                 }
                 currentPhase = newPhase;
+                String ddlPhaseString = survprops.getProperty("CLDR_DDL_PHASE", null);
+                Phase ddlPhase = null;
+                try {
+                    if (ddlPhaseString != null) {
+                        ddlPhase = (Phase.valueOf(ddlPhaseString));
+                    }
+                } catch (IllegalArgumentException iae) {
+                    logger.warning("Error trying to parse CLDR_DDL_PHASE: " + iae);
+                }
+                if (ddlPhase == null) {
+                    ddlPhase = newPhase;
+                    logger.warning("CLDR_DDL_PHASE matches main phase " + ddlPhase);
+                }
+                currentDdlPhase = ddlPhase;
             }
             logger.info("Phase: " + phase() + ", cPhase: " + phase().getCPhase());
             progress.update("Setup props..");
@@ -3570,6 +3585,10 @@ public static Phase phase() {
         return currentPhase;
     }
 
+    public static Phase getDDLPhase() {
+        return currentDdlPhase;
+    }
+
     public static String getOldVersion() {
         return oldVersion;
     }
@@ -3642,6 +3661,7 @@ private class StatusForFrontEnd implements JSONString {
         private final int pages = SurveyMain.pages;
         private Object permissions = null;
         private final Phase phase = phase();
+        private final Phase ddlPhase = getDDLPhase();
         private String sessionId = null;
         private final String specialHeader = getSpecialHeaderText();
         private final long surveyRunningStamp = SurveyMain.surveyRunningStamp.current();
@@ -3675,6 +3695,7 @@ private JSONObject toJSONObject() throws JSONException {
                     .put("pages", pages)
                     .put("permissions", permissions)
                     .put("phase", phase)
+                    .put("ddlPhase", ddlPhase)
                     .put("sessionId", sessionId)
                     .put("sessionMessage", sessionMessage)
                     .put("specialHeader", specialHeader)
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
index 3e0f7d17596..9d813ce37b4 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
@@ -400,6 +400,14 @@ public synchronized Phase getPhase() {
         return phase;
     }
 
+    /**
+     * @returns the phase for DDL (non-TC) locales. Defaults to same as main phase.
+     */
+    public Phase getDDLPhase() {
+        // by default, same as main phase.
+        return getPhase();
+    }
+
     @Override
     public String getProperty(String key, String d) {
         String result = getProperty(key);

From 8ece119b46290ccab2eb0604ec192676e48ddd37 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 10 Jun 2024 18:37:12 -0500
Subject: [PATCH 02/10] CLDR-16835 add SubmissionLocales.isTcLocale()

- includes test
- a TC locale includes those whose parents are TC locales.
---
 .../java/org/unicode/cldr/web/SurveyAjax.java |  2 +-
 .../unicode/cldr/test/SubmissionLocales.java  | 14 +++++++++++++
 .../cldr/test/TestSubmissionLocales.java      | 21 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 50b647f5b36..78b3bb218ba 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -1119,7 +1119,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
             locale.put("highestParent", loc.getHighestNonrootParent());
             locale.put("dcParent", dcParent);
             locale.put("dcChild", dcChild);
-            locale.put("tc", SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName()));
+            locale.put("tc", SubmissionLocales.isTcLocale(loc));
             locale.put(
                     "type",
                     Factory.getSourceTreeType(disk.getSourceDirectoryForLocale(loc.getBaseName())));
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
index a0ec4cc629b..471f25fb161 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
@@ -12,6 +12,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.unicode.cldr.util.CLDRLocale;
 import org.unicode.cldr.util.GrammarInfo;
 import org.unicode.cldr.util.Level;
 import org.unicode.cldr.util.Organization;
@@ -248,4 +249,17 @@ public static boolean pathAllowedInLimitedSubmission(String path) {
     public static Set<ReportId> getReportsAvailableInLimited() {
         return LIMITED_SUBMISSION_REPORTS;
     }
+
+    public static boolean isTcLocale(CLDRLocale loc) {
+        if (loc == CLDRLocale.ROOT
+                || SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName())) {
+            // root or explicitly listed locale is a TC locale
+            return true;
+        } else if (loc.isParentRoot()) {
+            // any sublocale of root not listed is not a tc locale
+            return false;
+        } else {
+            return isTcLocale(loc.getParent());
+        }
+    }
 }
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
index cd007c3cb2c..7880722db4d 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -10,6 +11,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.unicode.cldr.util.CLDRLocale;
 
 public class TestSubmissionLocales {
     @ParameterizedTest
@@ -69,4 +72,22 @@ void TestSubmissionLocale() {
     public static final boolean bool(final String s) {
         return Boolean.parseBoolean(s);
     }
+
+    @ParameterizedTest
+    @CsvSource({
+        // loc, isTc
+        "root, true",
+        "de, true",
+        "de_IT, true",
+        "csw, false",
+        "cho_US, false",
+        "zh, true",
+        "zh_Hant_MO, true",
+    })
+    public void testIsTcLocale(final String loc, final String tf) {
+        final CLDRLocale l = CLDRLocale.getInstance(loc);
+        assertNotNull(l, loc);
+        final Boolean isCldr = Boolean.parseBoolean(tf);
+        assertEquals(isCldr, SubmissionLocales.isTcLocale(l));
+    }
 }

From ef44a9d2caa891b2909fb243ece6e957af6a3c3d Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 10 Jun 2024 19:42:54 -0500
Subject: [PATCH 03/10] CLDR-16835 ddlLocale

- add notifier for locMap change
- add UI to show special phase for non-TC locales
---
 tools/cldr-apps/js/src/esm/cldrLoad.mjs     | 28 ++++++++++++++++-
 tools/cldr-apps/js/src/esm/cldrStatus.mjs   |  5 +++
 tools/cldr-apps/js/src/views/MainHeader.vue | 34 ++++++++++++++-------
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/tools/cldr-apps/js/src/esm/cldrLoad.mjs b/tools/cldr-apps/js/src/esm/cldrLoad.mjs
index 25fcaf2df04..1cdde412622 100644
--- a/tools/cldr-apps/js/src/esm/cldrLoad.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrLoad.mjs
@@ -1049,10 +1049,30 @@ function getLocaleDir(locale) {
   return localeDir;
 }
 
+/** @returns true if locmap has been loaded from data */
+function localeMapReady() {
+  return !!locmap.locmap;
+}
+
+/** event ID for localeMap changes */
+const LOCALEMAP_EVENT = "localeMapReady";
+
+/**
+ * Calls the callback when the localeMap is ready (with real data).
+ * Calls right away if the localeMap was already loaded.
+ */
+function onLocaleMapReady(callback) {
+  if (localeMapReady()) {
+    callback();
+  } else {
+    cldrStatus.on(LOCALEMAP_EVENT, callback);
+  }
+}
+
 function setTheLocaleMap(lm) {
   locmap = lm;
+  cldrStatus.dispatchEvent(new Event(LOCALEMAP_EVENT));
 }
-
 /**
  * Convenience for calling getTheLocaleMap().getLocaleName(loc)
  * @param {String} loc
@@ -1062,6 +1082,10 @@ function getLocaleName(loc) {
   return locmap.getLocaleName(loc);
 }
 
+function getLocaleInfo(loc) {
+  return locmap.getLocaleInfo(loc);
+}
+
 /**
  * Get the window location hash
  *
@@ -1145,6 +1169,7 @@ export {
   flipToOtherDiv,
   getHash,
   getLocaleDir,
+  getLocaleInfo,
   getLocaleName,
   getTheLocaleMap,
   handleCoverageChanged,
@@ -1152,6 +1177,7 @@ export {
   linkToLocale,
   localeSpecialNote,
   myLoad,
+  onLocaleMapReady,
   parseHashAndUpdate,
   reloadV,
   replaceHash,
diff --git a/tools/cldr-apps/js/src/esm/cldrStatus.mjs b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
index bdc35ba282d..98b1d0a9812 100644
--- a/tools/cldr-apps/js/src/esm/cldrStatus.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
@@ -49,6 +49,10 @@ function on(type, callback) {
   getStatusTarget().addEventListener(type, callback);
 }
 
+/**
+ * Fire off an event manually
+ * @param type the type to dispatch
+ */
 function dispatchEvent(type) {
   return getStatusTarget().dispatchEvent(type);
 }
@@ -477,6 +481,7 @@ function setAutoImportBusy(busy) {
 }
 
 export {
+  dispatchEvent,
   getAutoImportBusy,
   getContextPath,
   getCurrentId,
diff --git a/tools/cldr-apps/js/src/views/MainHeader.vue b/tools/cldr-apps/js/src/views/MainHeader.vue
index 3a8d4a7532c..6d1fca9269a 100644
--- a/tools/cldr-apps/js/src/views/MainHeader.vue
+++ b/tools/cldr-apps/js/src/views/MainHeader.vue
@@ -1,7 +1,8 @@
 <template>
   <header id="st-header">
+    <a-spin v-if="!loaded" :delay="250" />
     <ul>
-      <li>{{ stVersionPhase }}</li>
+      <li>{{ stVersion }} {{ stPhase }}</li>
       <li>
         <a href="#menu///"><span class="main-menu-icon">☰</span></a>
       </li>
@@ -79,6 +80,7 @@
 <script>
 import * as cldrAnnounce from "../esm/cldrAnnounce.mjs";
 import * as cldrCoverage from "../esm/cldrCoverage.mjs";
+import * as cldrLoad from "../esm/cldrLoad.mjs";
 import * as cldrMenu from "../esm/cldrMenu.mjs";
 import * as cldrStatus from "../esm/cldrStatus.mjs";
 import * as cldrText from "../esm/cldrText.mjs";
@@ -87,6 +89,7 @@ import * as cldrVote from "../esm/cldrVote.mjs";
 export default {
   data() {
     return {
+      loaded: false,
       announcementsTitle: null,
       coverageLevel: null,
       coverageMenu: [],
@@ -96,7 +99,9 @@ export default {
       orgCoverage: null,
       sessionMessage: null,
       specialHeader: null,
-      stVersionPhase: null,
+      stPhase: null,
+      stVersion: null,
+      tcLocale: true,
       unreadAnnouncementCount: 0,
       userName: null,
       voteCountMenu: null,
@@ -105,7 +110,12 @@ export default {
   },
 
   mounted() {
-    this.updateData();
+    // load after the localemap is ready
+    cldrLoad.onLocaleMapReady(() => {
+      this.updateData();
+    });
+    // reload if locale changes
+    cldrStatus.on("locale", () => this.updateData());
   },
 
   methods: {
@@ -114,9 +124,9 @@ export default {
      * This function is called both locally, to initialize, and from other module(s), to update.
      */
     updateData() {
-      const orgCoverage = cldrCoverage.getSurveyOrgCov(
-        cldrStatus.getCurrentLocale()
-      );
+      this.loaded = true;
+      const loc = cldrStatus.getCurrentLocale();
+      const orgCoverage = cldrCoverage.getSurveyOrgCov(loc);
       if (orgCoverage != this.orgCoverage) {
         this.orgCoverage = orgCoverage;
       }
@@ -155,11 +165,13 @@ export default {
       }
       this.sessionMessage = cldrStatus.getSessionMessage();
       this.specialHeader = cldrStatus.getSpecialHeader();
-      this.stVersionPhase =
-        "Survey Tool " +
-        cldrStatus.getNewVersion() +
-        " " +
-        cldrStatus.getPhase();
+      this.stVersion = "Survey Tool " + cldrStatus.getNewVersion();
+      this.tcLocale = cldrLoad?.getLocaleInfo(loc)?.tc;
+      if (!loc || this.tcLocale) {
+        this.stPhase = cldrStatus.getPhase();
+      } else {
+        this.stPhase = cldrStatus.getDdlPhase();
+      }
       cldrAnnounce.getUnreadCount(this.setUnreadCount);
     },
 

From c9f8908efd2c105de032f0b02d6d5f889bcee5f6 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 11 Jun 2024 08:34:44 -0500
Subject: [PATCH 04/10] CLDR-16835 ddlLocale

- add UI to show special phase for non-TC locales
---
 tools/cldr-apps/js/src/views/MainHeader.vue | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/cldr-apps/js/src/views/MainHeader.vue b/tools/cldr-apps/js/src/views/MainHeader.vue
index 6d1fca9269a..cc8017417ed 100644
--- a/tools/cldr-apps/js/src/views/MainHeader.vue
+++ b/tools/cldr-apps/js/src/views/MainHeader.vue
@@ -2,7 +2,11 @@
   <header id="st-header">
     <a-spin v-if="!loaded" :delay="250" />
     <ul>
-      <li>{{ stVersion }} {{ stPhase }}</li>
+      <li>{{ stVersion }} {{ stPhase }}
+        <span class="ddlException" v-if="ddlException" title="Note: As a non-TC DDL locale, this phase has been extended.">
+          (extended)
+        </span>
+      </li>
       <li>
         <a href="#menu///"><span class="main-menu-icon">☰</span></a>
       </li>
@@ -102,6 +106,7 @@ export default {
       stPhase: null,
       stVersion: null,
       tcLocale: true,
+      ddlException: false,
       unreadAnnouncementCount: 0,
       userName: null,
       voteCountMenu: null,
@@ -169,8 +174,14 @@ export default {
       this.tcLocale = cldrLoad?.getLocaleInfo(loc)?.tc;
       if (!loc || this.tcLocale) {
         this.stPhase = cldrStatus.getPhase();
+        this.ddlException = false;
       } else {
         this.stPhase = cldrStatus.getDdlPhase();
+        if (cldrStatus.getDdlPhase() != cldrStatus.getPhase()) {
+          this.ddlException = true;
+        } else {
+          this.ddlException = false;
+        }
       }
       cldrAnnounce.getUnreadCount(this.setUnreadCount);
     },
@@ -273,4 +284,9 @@ label {
 #coverageLevel {
   width: 16ch;
 }
+
+.ddlException {
+  background-color: yellow;
+}
+
 </style>

From 86af6e40ca2b0f4adf7bf6d919018e1ef38ba5e5 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 11 Jun 2024 09:27:22 -0500
Subject: [PATCH 05/10] CLDR-16835 ddl phase - back end changes for separate
 ddl phase

- back end changes supporting a separate ddl phase
---
 .../java/org/unicode/cldr/web/DataPage.java   |  3 +-
 .../java/org/unicode/cldr/web/SurveyAjax.java |  2 +-
 .../java/org/unicode/cldr/web/SurveyMain.java | 28 +++++++++++++++----
 .../org/unicode/cldr/web/UserRegistry.java    |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
index 767ecee8cba..232d76d2c51 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
@@ -988,8 +988,7 @@ public Map<String, String> getNonDistinguishingAttributes() {
          */
         public StatusAction getStatusAction(InputMethod inputMethod) {
             // null because this is for display.
-            return SurveyMain.phase()
-                    .getCPhase()
+            return SurveyMain.getCPhase(locale)
                     .getShowRowAction(this, inputMethod, getPathHeader(), userForVotelist);
         }
 
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 78b3bb218ba..720a3e85bef 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -2658,7 +2658,7 @@ public static void handleBulkSubmit(
         final List<CheckCLDR.CheckStatus> checkResult = new ArrayList<>();
         TestCache.TestResultBundle cc = stf.getTestResult(loc, DataPage.getOptions(cs, loc));
         UserRegistry.User u = theirU;
-        CheckCLDR.Phase cPhase = CLDRConfig.getInstance().getPhase();
+        CheckCLDR.Phase cPhase = SurveyMain.getCPhase(loc);
         Set<String> allValidPaths = stf.getPathsForFile(loc);
         CLDRProgressTask progress = sm.openProgress("Bulk:" + loc, all.size());
         CLDRFile cldrUnresolved = cf.getUnresolved();
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index 8c85cd52bf1..b633a42f6b5 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -65,6 +65,7 @@
 import org.unicode.cldr.test.CheckCLDR;
 import org.unicode.cldr.test.ExampleGenerator;
 import org.unicode.cldr.test.HelpMessages;
+import org.unicode.cldr.test.SubmissionLocales;
 import org.unicode.cldr.util.CLDRCacheDir;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfigImpl;
@@ -2078,9 +2079,9 @@ public String getLocaleLink(WebContext ctx, CLDRLocale locale, String n) {
         if (canModify) {
             rv = rv + (modifyThing(ctx));
             int odisp;
-            if ((SurveyMain.phase() == Phase.VETTING
-                            || SurveyMain.phase() == Phase.SUBMIT
-                            || isPhaseVettingClosed())
+            if ((SurveyMain.phase(locale) == Phase.VETTING
+                            || SurveyMain.phase(locale) == Phase.SUBMIT
+                            || isPhaseVettingClosed(locale))
                     && ((odisp = DisputePageManager.getOrgDisputeCount(ctx)) > 0)) {
                 rv = rv + ctx.iconHtml("disp", "(" + odisp + " org disputes)");
             }
@@ -2827,7 +2828,11 @@ private void doStartup() {
                 String ddlPhaseString = survprops.getProperty("CLDR_DDL_PHASE", null);
                 Phase ddlPhase = null;
                 try {
-                    if (ddlPhaseString != null) {
+                    if (ddlPhaseString != null && !ddlPhaseString.isEmpty()) {
+                        if (currentPhase == Phase.READONLY) {
+                            busted(
+                                    "Error: Cannot have a CLDR_DDL_PHASE when CLDR_PHASE=READONLY. Remove the CLDR_DDL_PHASE.");
+                        }
                         ddlPhase = (Phase.valueOf(ddlPhaseString));
                     }
                 } catch (IllegalArgumentException iae) {
@@ -3569,8 +3574,8 @@ public static String localhost() {
 
     // ============= Following have to do with phases
 
-    public static boolean isPhaseVettingClosed() {
-        return phase() == Phase.VETTING_CLOSED;
+    public static boolean isPhaseVettingClosed(CLDRLocale locale) {
+        return phase(locale) == Phase.VETTING_CLOSED;
     }
 
     public static boolean isPhaseReadonly() {
@@ -3585,6 +3590,17 @@ public static Phase phase() {
         return currentPhase;
     }
 
+    public static Phase phase(CLDRLocale locale) {
+        return (SubmissionLocales.isTcLocale(locale) ? phase() : getDDLPhase());
+    }
+
+    /**
+     * @returns the current phase for the locale. This is the preferred API.
+     */
+    public static CheckCLDR.Phase getCPhase(CLDRLocale loc) {
+        return phase(loc).getCPhase();
+    }
+
     public static Phase getDDLPhase() {
         return currentDdlPhase;
     }
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
index d7a2f67ef45..f4f56b5e9a4 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
@@ -1978,7 +1978,7 @@ public static ModifyDenial userCanModifyLocaleWhy(User u, CLDRLocale locale) {
         if (userIsAdmin(u) || userIsTC(u)) return null;
 
         // Otherwise, if closed, deny
-        if (SurveyMain.isPhaseVettingClosed()) return ModifyDenial.DENY_PHASE_CLOSED;
+        if (SurveyMain.isPhaseVettingClosed(locale)) return ModifyDenial.DENY_PHASE_CLOSED;
         if (SurveyMain.isPhaseReadonly()) return ModifyDenial.DENY_PHASE_READONLY;
 
         return null;

From 44e0b0197b3bdf74c09b4fd50f7c073bd1fb442d Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 11 Jun 2024 10:59:07 -0500
Subject: [PATCH 06/10] CLDR-16835 ddl phase - prettier

---
 tools/cldr-apps/js/src/views/MainHeader.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/cldr-apps/js/src/views/MainHeader.vue b/tools/cldr-apps/js/src/views/MainHeader.vue
index cc8017417ed..637526f2e1a 100644
--- a/tools/cldr-apps/js/src/views/MainHeader.vue
+++ b/tools/cldr-apps/js/src/views/MainHeader.vue
@@ -2,8 +2,13 @@
   <header id="st-header">
     <a-spin v-if="!loaded" :delay="250" />
     <ul>
-      <li>{{ stVersion }} {{ stPhase }}
-        <span class="ddlException" v-if="ddlException" title="Note: As a non-TC DDL locale, this phase has been extended.">
+      <li>
+        {{ stVersion }} {{ stPhase }}
+        <span
+          class="ddlException"
+          v-if="ddlException"
+          title="Note: As a non-TC DDL locale, this phase has been extended."
+        >
           (extended)
         </span>
       </li>
@@ -288,5 +293,4 @@ label {
 .ddlException {
   background-color: yellow;
 }
-
 </style>

From 701415f3c7c8834902a416263fc9ef7dafba0897 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 11 Jun 2024 12:36:46 -0500
Subject: [PATCH 07/10] CLDR-16835 ddl phase - update per locale comments

- replaced phase() and getCPhase() with getSurveyPhase() and toCheckCLDRPhase() for more clarity
- renamed the non-locale calls to getOverallSurveyPhase(), and reviewed.

See also CLDR-8196 for merging SurveyTool.Phase and CheckCLDR.Phase
---
 .../org/unicode/cldr/util/CLDRConfigImpl.java |  4 +-
 .../java/org/unicode/cldr/web/DBUtils.java    |  7 +--
 .../java/org/unicode/cldr/web/DataPage.java   |  2 +-
 .../java/org/unicode/cldr/web/SurveyAjax.java |  3 +-
 .../java/org/unicode/cldr/web/SurveyMain.java | 48 ++++++++++++-------
 .../org/unicode/cldr/web/UserRegistry.java    |  2 +-
 .../java/org/unicode/cldr/web/WebContext.java |  2 +-
 .../org/unicode/cldr/web/api/Summary.java     |  2 +-
 .../org/unicode/cldr/web/TestUserLevel.java   |  3 +-
 9 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
index 3f4bd0949fb..35138d194f5 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
@@ -457,12 +457,12 @@ public JSONObject toJSONObject() throws JSONException {
 
     @Override
     public CheckCLDR.Phase getPhase() {
-        return SurveyMain.phase().getCPhase();
+        return SurveyMain.getOverallSurveyPhase().toCheckCLDRPhase();
     }
 
     @Override
     public CheckCLDR.Phase getDDLPhase() {
-        return SurveyMain.getDDLPhase().getCPhase();
+        return SurveyMain.getOverallDDLPhase().toCheckCLDRPhase();
     }
 
     @Override
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
index 841fcb0b4ba..a62b47a2ba3 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
@@ -53,7 +53,6 @@
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.PathHeader;
 import org.unicode.cldr.util.StackTracker;
-import org.unicode.cldr.web.SurveyMain.Phase;
 
 /** Singleton utility class for simple(r) DB access. */
 public class DBUtils {
@@ -963,8 +962,7 @@ public static StringBuilder appendVersionString(
 
     /** Append a versioned string */
     public static StringBuilder appendVersionString(StringBuilder sb) {
-        return appendVersionString(
-                sb, SurveyMain.getNewVersion(), SurveyMain.phase() == SurveyMain.Phase.BETA);
+        return appendVersionString(sb, SurveyMain.getNewVersion(), SurveyMain.isPhaseBeta());
     }
 
     private static String[] arrayOfResult(ResultSet rs) throws SQLException {
@@ -1380,8 +1378,7 @@ public synchronized String toString() {
                             "Error: don't use Table.toString before CLDRConfig is setup.");
                 }
                 defaultString =
-                        forVersion(SurveyMain.getNewVersion(), SurveyMain.phase() == Phase.BETA)
-                                .toString();
+                        forVersion(SurveyMain.getNewVersion(), SurveyMain.isPhaseBeta()).toString();
             }
             return defaultString;
         }
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
index 232d76d2c51..607c126658f 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
@@ -988,7 +988,7 @@ public Map<String, String> getNonDistinguishingAttributes() {
          */
         public StatusAction getStatusAction(InputMethod inputMethod) {
             // null because this is for display.
-            return SurveyMain.getCPhase(locale)
+            return SurveyMain.checkCLDRPhase(locale)
                     .getShowRowAction(this, inputMethod, getPathHeader(), userForVotelist);
         }
 
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 720a3e85bef..5d92275b499 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -1092,7 +1092,6 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
         // locales will have info about each locale, including name
         JSONObject locales = new JSONObject();
         SupplementalDataInfo sdi = sm.getSupplementalDataInfo();
-        final StandardCodes sc = StandardCodes.make();
 
         Factory disk = sm.getDiskFactory();
 
@@ -2658,7 +2657,7 @@ public static void handleBulkSubmit(
         final List<CheckCLDR.CheckStatus> checkResult = new ArrayList<>();
         TestCache.TestResultBundle cc = stf.getTestResult(loc, DataPage.getOptions(cs, loc));
         UserRegistry.User u = theirU;
-        CheckCLDR.Phase cPhase = SurveyMain.getCPhase(loc);
+        CheckCLDR.Phase cPhase = SurveyMain.checkCLDRPhase(loc);
         Set<String> allValidPaths = stf.getPathsForFile(loc);
         CLDRProgressTask progress = sm.openProgress("Bulk:" + loc, all.size());
         CLDRFile cldrUnresolved = cf.getUnresolved();
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index b633a42f6b5..95076d37a27 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -177,7 +177,7 @@ public String toString() {
          * @see org.unicode.cldr.test.CheckCLDR.Phase
          * @return the CheckCLDR.Phase
          */
-        public CheckCLDR.Phase getCPhase() {
+        public CheckCLDR.Phase toCheckCLDRPhase() {
             return cphase;
         }
     }
@@ -2079,8 +2079,8 @@ public String getLocaleLink(WebContext ctx, CLDRLocale locale, String n) {
         if (canModify) {
             rv = rv + (modifyThing(ctx));
             int odisp;
-            if ((SurveyMain.phase(locale) == Phase.VETTING
-                            || SurveyMain.phase(locale) == Phase.SUBMIT
+            if ((SurveyMain.surveyPhase(locale) == Phase.VETTING
+                            || SurveyMain.surveyPhase(locale) == Phase.SUBMIT
                             || isPhaseVettingClosed(locale))
                     && ((odisp = DisputePageManager.getOrgDisputeCount(ctx)) > 0)) {
                 rv = rv + ctx.iconHtml("disp", "(" + odisp + " org disputes)");
@@ -2446,7 +2446,7 @@ private synchronized String getDirectionalityFor(CLDRLocale id) {
      * @see org.unicode.cldr.test.CheckCoverage#check(String, String, String, Map, List)
      */
     public static org.unicode.cldr.test.CheckCLDR.Phase getTestPhase() {
-        return phase().getCPhase();
+        return getOverallSurveyPhase().toCheckCLDRPhase();
     }
 
     /**
@@ -2844,7 +2844,11 @@ private void doStartup() {
                 }
                 currentDdlPhase = ddlPhase;
             }
-            logger.info("Phase: " + phase() + ", cPhase: " + phase().getCPhase());
+            logger.info(
+                    "Phase: "
+                            + getOverallSurveyPhase()
+                            + ", CheckCLDR Phase: "
+                            + getOverallSurveyPhase().toCheckCLDRPhase());
             progress.update("Setup props..");
             newVersion = survprops.getProperty(CLDR_NEWVERSION, CLDR_NEWVERSION);
             oldVersion = survprops.getProperty(CLDR_OLDVERSION, CLDR_OLDVERSION);
@@ -3575,33 +3579,43 @@ public static String localhost() {
     // ============= Following have to do with phases
 
     public static boolean isPhaseVettingClosed(CLDRLocale locale) {
-        return phase(locale) == Phase.VETTING_CLOSED;
+        return surveyPhase(locale) == Phase.VETTING_CLOSED;
     }
 
     public static boolean isPhaseReadonly() {
-        return phase() == Phase.READONLY;
+        return getOverallSurveyPhase() == Phase.READONLY;
     }
 
     public static boolean isPhaseBeta() {
-        return phase() == Phase.BETA;
+        return getOverallSurveyPhase() == Phase.BETA;
     }
 
-    public static Phase phase() {
+    /** Internal- returns the overall phase. Not locale specific. */
+    public static Phase getOverallSurveyPhase() {
         return currentPhase;
     }
 
-    public static Phase phase(CLDRLocale locale) {
-        return (SubmissionLocales.isTcLocale(locale) ? phase() : getDDLPhase());
+    /**
+     * @returns the SurveyTool Phase for the locale
+     */
+    public static Phase surveyPhase(CLDRLocale locale) {
+        return (SubmissionLocales.isTcLocale(locale)
+                ? getOverallSurveyPhase()
+                : getOverallDDLPhase());
     }
 
     /**
-     * @returns the current phase for the locale. This is the preferred API.
+     * @returns the current CheckCLDR phase for the locale. This is the preferred API.
      */
-    public static CheckCLDR.Phase getCPhase(CLDRLocale loc) {
-        return phase(loc).getCPhase();
+    public static CheckCLDR.Phase checkCLDRPhase(CLDRLocale loc) {
+        return surveyPhase(loc).toCheckCLDRPhase();
     }
 
-    public static Phase getDDLPhase() {
+    /**
+     * the DDL (non-TC) overall phase. It is preferred to use one of the phase functions which takes
+     * a locale.
+     */
+    public static Phase getOverallDDLPhase() {
         return currentDdlPhase;
     }
 
@@ -3676,8 +3690,8 @@ private class StatusForFrontEnd implements JSONString {
         private String organizationName = null;
         private final int pages = SurveyMain.pages;
         private Object permissions = null;
-        private final Phase phase = phase();
-        private final Phase ddlPhase = getDDLPhase();
+        private final Phase phase = getOverallSurveyPhase();
+        private final Phase ddlPhase = getOverallDDLPhase();
         private String sessionId = null;
         private final String specialHeader = getSpecialHeaderText();
         private final long surveyRunningStamp = SurveyMain.surveyRunningStamp.current();
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
index f4f56b5e9a4..36f0575f96b 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
@@ -1821,7 +1821,7 @@ public static boolean userCanCreateUsers(User u) {
     }
 
     static boolean userCanSubmit(User u, SurveyMain.Phase phase) {
-        return (u != null) && u.getLevel().canSubmit(phase.getCPhase());
+        return (u != null) && u.getLevel().canSubmit(phase.toCheckCLDRPhase());
     }
 
     /**
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
index 2500d12590f..423c178d78e 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
@@ -1089,7 +1089,7 @@ public static HTMLDirection fromCldr(String dir) {
      * @return true if the user can modify this locale
      */
     public Boolean canModify() {
-        if (STFactory.isReadOnlyLocale(locale) || SurveyMain.phase() == Phase.READONLY)
+        if (STFactory.isReadOnlyLocale(locale) || SurveyMain.surveyPhase(locale) == Phase.READONLY)
             return (canModify = false);
         if (canModify == null) {
             if (session != null && session.user != null) {
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
index 22ca409ae1b..468e8d13e32 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
@@ -336,7 +336,7 @@ public void run() {
     private void makeAutoPriorityItemsSnapshot() throws IOException, JSONException {
         boolean summarizeAllLocales = false;
         if (ENABLE_ALL_LOCALE_SUMMARY) {
-            final SurveyMain.Phase phase = SurveyMain.phase();
+            final SurveyMain.Phase phase = SurveyMain.getOverallSurveyPhase();
             summarizeAllLocales =
                     (phase == SurveyMain.Phase.VETTING || phase == SurveyMain.Phase.VETTING_CLOSED);
         }
diff --git a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
index 12f9417538a..cc26378d3cb 100644
--- a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
+++ b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
@@ -302,7 +302,8 @@ void TestVoteResolverLevel(
                 assertEquals(expected, l.canUseVettingSummary(), onFail);
                 break;
             case "userCanSubmit_SUBMIT":
-                assertEquals(expected, l.canSubmit(SurveyMain.Phase.SUBMIT.getCPhase()), onFail);
+                assertEquals(
+                        expected, l.canSubmit(SurveyMain.Phase.SUBMIT.toCheckCLDRPhase()), onFail);
                 break;
             case "userCanCreateSummarySnapshot":
                 assertEquals(expected, l.canCreateSummarySnapshot(), onFail);

From b90be949db37cdb493525ba2596b942169d96644 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 12 Jun 2024 08:55:42 -0500
Subject: [PATCH 08/10] CLDR-16835 Extended Submission Phase

- formerly ddlPhase
- New configuration parameters:
    - CLDR_EXTENDED_PHASE - the phase for non-TC and for specific extended locales
    - CLDR_EXTENDED_SUBMISSION - a separated list of TC locales that are additionally given the extended phase.
- Renamed API functions to reflect names such as getExtendedPhase()
---
 tools/cldr-apps/js/src/esm/cldrStatus.mjs     | 20 ++++----
 tools/cldr-apps/js/src/views/MainHeader.vue   | 24 ++++------
 .../org/unicode/cldr/util/CLDRConfigImpl.java |  4 +-
 .../java/org/unicode/cldr/web/SurveyAjax.java |  1 +
 .../java/org/unicode/cldr/web/SurveyMain.java | 39 +++++++++-------
 .../unicode/cldr/test/SubmissionLocales.java  | 37 +++++++++++++++
 .../org/unicode/cldr/util/CLDRConfig.java     |  5 +-
 .../cldr/test/TestSubmissionLocales.java      | 46 +++++++++++++++++++
 8 files changed, 131 insertions(+), 45 deletions(-)

diff --git a/tools/cldr-apps/js/src/esm/cldrStatus.mjs b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
index 98b1d0a9812..862b875c6ec 100644
--- a/tools/cldr-apps/js/src/esm/cldrStatus.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
@@ -79,8 +79,8 @@ function updateAll(status) {
   if (status.phase) {
     setPhase(status.phase);
   }
-  if (status.ddlPhase) {
-    setDdlPhase(status.ddlPhase);
+  if (status.extendedPhase) {
+    setExtendedPhase(status.extendedPhase);
   }
   if (status.specialHeader) {
     setSpecialHeader(status.specialHeader);
@@ -303,16 +303,18 @@ function getPhase() {
   return phase;
 }
 
-let ddlPhase = "";
 function setPhase(p) {
   phase = p;
 }
-function getDdlPhase() {
-  return ddlPhase;
+
+let extendedPhase = "";
+
+function getExtendedPhase() {
+  return extendedPhase;
 }
 
-function setDdlPhase(p) {
-  ddlPhase = p;
+function setExtendedPhase(p) {
+  extendedPhase = p;
 }
 
 /**
@@ -490,12 +492,12 @@ export {
   getCurrentPage,
   getCurrentSection,
   getCurrentSpecial,
+  getExtendedPhase,
   getIsPhaseBeta,
   getIsUnofficial,
   getNewVersion,
   getOrganizationName,
   getPermissions,
-  getDdlPhase,
   getPhase,
   getRunningStamp,
   getSessionId,
@@ -517,6 +519,7 @@ export {
   setCurrentPage,
   setCurrentSection,
   setCurrentSpecial,
+  setExtendedPhase,
   setIsDisconnected,
   setIsPhaseBeta,
   setIsUnofficial,
@@ -524,7 +527,6 @@ export {
   setOrganizationName,
   setPermissions,
   setPhase,
-  setDdlPhase,
   setSessionId,
   setSessionMessage,
   setSpecialHeader,
diff --git a/tools/cldr-apps/js/src/views/MainHeader.vue b/tools/cldr-apps/js/src/views/MainHeader.vue
index 637526f2e1a..46b77c9e032 100644
--- a/tools/cldr-apps/js/src/views/MainHeader.vue
+++ b/tools/cldr-apps/js/src/views/MainHeader.vue
@@ -5,9 +5,9 @@
       <li>
         {{ stVersion }} {{ stPhase }}
         <span
-          class="ddlException"
-          v-if="ddlException"
-          title="Note: As a non-TC DDL locale, this phase has been extended."
+          class="extendedException"
+          v-if="extendedException"
+          title="Note: This phase has been extended for this locale."
         >
           (extended)
         </span>
@@ -111,7 +111,7 @@ export default {
       stPhase: null,
       stVersion: null,
       tcLocale: true,
-      ddlException: false,
+      extendedException: false,
       unreadAnnouncementCount: 0,
       userName: null,
       voteCountMenu: null,
@@ -176,17 +176,11 @@ export default {
       this.sessionMessage = cldrStatus.getSessionMessage();
       this.specialHeader = cldrStatus.getSpecialHeader();
       this.stVersion = "Survey Tool " + cldrStatus.getNewVersion();
-      this.tcLocale = cldrLoad?.getLocaleInfo(loc)?.tc;
-      if (!loc || this.tcLocale) {
+      this.extendedException = cldrLoad.getLocaleInfo(loc)?.extended;
+      if (!loc || !this.extendedException) {
         this.stPhase = cldrStatus.getPhase();
-        this.ddlException = false;
-      } else {
-        this.stPhase = cldrStatus.getDdlPhase();
-        if (cldrStatus.getDdlPhase() != cldrStatus.getPhase()) {
-          this.ddlException = true;
-        } else {
-          this.ddlException = false;
-        }
+      } else if (this.extendedException) {
+        this.stPhase = cldrStatus.getExtendedPhase();
       }
       cldrAnnounce.getUnreadCount(this.setUnreadCount);
     },
@@ -290,7 +284,7 @@ label {
   width: 16ch;
 }
 
-.ddlException {
+.extendedException {
   background-color: yellow;
 }
 </style>
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
index 35138d194f5..83d9f379857 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
@@ -461,8 +461,8 @@ public CheckCLDR.Phase getPhase() {
     }
 
     @Override
-    public CheckCLDR.Phase getDDLPhase() {
-        return SurveyMain.getOverallDDLPhase().toCheckCLDRPhase();
+    public CheckCLDR.Phase getExtendedPhase() {
+        return SurveyMain.getOverallExtendedPhase().toCheckCLDRPhase();
     }
 
     @Override
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 5d92275b499..b743b70c393 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -1119,6 +1119,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
             locale.put("dcParent", dcParent);
             locale.put("dcChild", dcChild);
             locale.put("tc", SubmissionLocales.isTcLocale(loc));
+            locale.put("extended", SubmissionLocales.isOpenForExtendedSubmission(loc));
             locale.put(
                     "type",
                     Factory.getSourceTreeType(disk.getSourceDirectoryForLocale(loc.getBaseName())));
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index 95076d37a27..ecc92b56372 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -210,7 +210,7 @@ public String display() {
 
     // ===== Configuration state
     private static Phase currentPhase = Phase.VETTING;
-    private static Phase currentDdlPhase = Phase.VETTING;
+    private static Phase currentExtendedPhase = Phase.VETTING;
     /** set by CLDR_PHASE property. * */
     private static String oldVersion = "OLDVERSION";
 
@@ -2825,30 +2825,35 @@ private void doStartup() {
                                     + phaseString);
                 }
                 currentPhase = newPhase;
-                String ddlPhaseString = survprops.getProperty("CLDR_DDL_PHASE", null);
-                Phase ddlPhase = null;
+                String extendedPhaseString = survprops.getProperty("CLDR_EXTENDED_PHASE", null);
+                Phase extendedPhase = null;
                 try {
-                    if (ddlPhaseString != null && !ddlPhaseString.isEmpty()) {
+                    if (extendedPhaseString != null && !extendedPhaseString.isEmpty()) {
                         if (currentPhase == Phase.READONLY) {
                             busted(
-                                    "Error: Cannot have a CLDR_DDL_PHASE when CLDR_PHASE=READONLY. Remove the CLDR_DDL_PHASE.");
+                                    "Error: Cannot have a CLDR_EXTENDED_PHASE when CLDR_PHASE=READONLY. Remove the CLDR_EXTENDED_PHASE.");
                         }
-                        ddlPhase = (Phase.valueOf(ddlPhaseString));
+                        extendedPhase = (Phase.valueOf(extendedPhaseString));
                     }
                 } catch (IllegalArgumentException iae) {
-                    logger.warning("Error trying to parse CLDR_DDL_PHASE: " + iae);
+                    logger.warning("Error trying to parse CLDR_EXTENDED_PHASE: " + iae);
                 }
-                if (ddlPhase == null) {
-                    ddlPhase = newPhase;
-                    logger.warning("CLDR_DDL_PHASE matches main phase " + ddlPhase);
+                if (extendedPhase == null) {
+                    extendedPhase = newPhase;
+                    logger.warning("CLDR_EXTENDED_PHASE unset, so will use main phase " + newPhase);
                 }
-                currentDdlPhase = ddlPhase;
+                currentExtendedPhase = extendedPhase;
             }
             logger.info(
                     "Phase: "
                             + getOverallSurveyPhase()
                             + ", CheckCLDR Phase: "
-                            + getOverallSurveyPhase().toCheckCLDRPhase());
+                            + getOverallSurveyPhase().toCheckCLDRPhase()
+                            + ", Extended Phase: "
+                            + currentExtendedPhase);
+            logger.info(
+                    "CLDR_EXTENDED_SUBMISSION="
+                            + String.join(" ", SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION));
             progress.update("Setup props..");
             newVersion = survprops.getProperty(CLDR_NEWVERSION, CLDR_NEWVERSION);
             oldVersion = survprops.getProperty(CLDR_OLDVERSION, CLDR_OLDVERSION);
@@ -3601,7 +3606,7 @@ public static Phase getOverallSurveyPhase() {
     public static Phase surveyPhase(CLDRLocale locale) {
         return (SubmissionLocales.isTcLocale(locale)
                 ? getOverallSurveyPhase()
-                : getOverallDDLPhase());
+                : getOverallExtendedPhase());
     }
 
     /**
@@ -3615,8 +3620,8 @@ public static CheckCLDR.Phase checkCLDRPhase(CLDRLocale loc) {
      * the DDL (non-TC) overall phase. It is preferred to use one of the phase functions which takes
      * a locale.
      */
-    public static Phase getOverallDDLPhase() {
-        return currentDdlPhase;
+    public static Phase getOverallExtendedPhase() {
+        return currentExtendedPhase;
     }
 
     public static String getOldVersion() {
@@ -3691,7 +3696,7 @@ private class StatusForFrontEnd implements JSONString {
         private final int pages = SurveyMain.pages;
         private Object permissions = null;
         private final Phase phase = getOverallSurveyPhase();
-        private final Phase ddlPhase = getOverallDDLPhase();
+        private final Phase extendedPhase = getOverallExtendedPhase();
         private String sessionId = null;
         private final String specialHeader = getSpecialHeaderText();
         private final long surveyRunningStamp = SurveyMain.surveyRunningStamp.current();
@@ -3725,7 +3730,7 @@ private JSONObject toJSONObject() throws JSONException {
                     .put("pages", pages)
                     .put("permissions", permissions)
                     .put("phase", phase)
-                    .put("ddlPhase", ddlPhase)
+                    .put("extendedPhase", extendedPhase)
                     .put("sessionId", sessionId)
                     .put("sessionMessage", sessionMessage)
                     .put("specialHeader", specialHeader)
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
index 471f25fb161..11a8a19650e 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
@@ -12,6 +12,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRLocale;
 import org.unicode.cldr.util.GrammarInfo;
 import org.unicode.cldr.util.Level;
@@ -70,6 +71,16 @@ public final class SubmissionLocales {
     /** Subset of CLDR_LOCALES, minus special which are only those which are TC orgs */
     public static final Set<String> TC_ORG_LOCALES;
 
+    /** Space-separated list of TC locales to extend submission */
+    public static final String DEFAULT_EXTENDED_SUBMISSION = "";
+
+    /** Additional TC locales which have extended submission. Do not add non-tc locales here. */
+    public static final Set<String> ADDITIONAL_EXTENDED_SUBMISSION =
+            ImmutableSet.copyOf(
+                    CLDRConfig.getInstance()
+                            .getProperty("CLDR_EXTENDED_SUBMISSION", "")
+                            .split(" "));
+
     /**
      * Set to true iff ONLY grammar locales should be limited submission {@link
      * GrammarInfo#getGrammarLocales()}
@@ -250,6 +261,10 @@ public static Set<ReportId> getReportsAvailableInLimited() {
         return LIMITED_SUBMISSION_REPORTS;
     }
 
+    /**
+     * @returns true if the locale or its parent is considered a TC Org Locale. Returns true for
+     *     ROOT.
+     */
     public static boolean isTcLocale(CLDRLocale loc) {
         if (loc == CLDRLocale.ROOT
                 || SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName())) {
@@ -262,4 +277,26 @@ public static boolean isTcLocale(CLDRLocale loc) {
             return isTcLocale(loc.getParent());
         }
     }
+
+    /**
+     * @returns true if the locale or its parent is considered a TC Org Locale. Returns true for
+     *     ROOT.
+     */
+    public static boolean isOpenForExtendedSubmission(CLDRLocale loc) {
+        if (loc == CLDRLocale.ROOT) {
+            return false; // root is never open
+        } else if (SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION.contains(loc.getBaseName())) {
+            // explicitly listed locale is a open for additional
+            return true;
+        } else if (SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName())) {
+            // TC locale but not listed as extended - NOT open for extended submission.
+            return false;
+        } else if (loc.isParentRoot()) {
+            // Not a TC locale, so it's open.
+            return true;
+        } else {
+            // child locale of an open locale is open
+            return isOpenForExtendedSubmission(loc.getParent());
+        }
+    }
 }
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
index 9d813ce37b4..4d1f1131908 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
@@ -401,9 +401,10 @@ public synchronized Phase getPhase() {
     }
 
     /**
-     * @returns the phase for DDL (non-TC) locales. Defaults to same as main phase.
+     * @returns the phase for extended submission locales. Defaults to same as main phase. {@link
+     *     SubmissionLocales#isOpenForExtendedSubmission}
      */
-    public Phase getDDLPhase() {
+    public Phase getExtendedPhase() {
         // by default, same as main phase.
         return getPhase();
     }
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
index 7880722db4d..5fc20a5bdf5 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
@@ -8,6 +8,8 @@
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
@@ -80,9 +82,13 @@ public static final boolean bool(final String s) {
         "de, true",
         "de_IT, true",
         "csw, false",
+        "csw_CA, false",
         "cho_US, false",
         "zh, true",
         "zh_Hant_MO, true",
+        "smj, false",
+        "smj_NO, false",
+        "smj_SE, false",
     })
     public void testIsTcLocale(final String loc, final String tf) {
         final CLDRLocale l = CLDRLocale.getInstance(loc);
@@ -90,4 +96,44 @@ public void testIsTcLocale(final String loc, final String tf) {
         final Boolean isCldr = Boolean.parseBoolean(tf);
         assertEquals(isCldr, SubmissionLocales.isTcLocale(l));
     }
+
+    @ParameterizedTest
+    @CsvSource({
+        // loc, isTc
+        "root, true",
+        "de, true",
+        "de_IT, true",
+        "csw, false",
+        "csw_CA, false",
+        "cho_US, false",
+        "zh, true",
+        "zh_Hant_MO, true",
+        "smj, false",
+        "smj_NO, false",
+        "smj_SE, false",
+    })
+    public void testIsExtendedSubmissionLocale(final String loc, final String tf) {
+        final CLDRLocale l = CLDRLocale.getInstance(loc);
+        assertNotNull(l, loc);
+        final Boolean isExtendedSubmission = Boolean.parseBoolean(tf);
+        assertEquals(isExtendedSubmission, SubmissionLocales.isOpenForExtendedSubmission(l));
+    }
+
+    @Test
+    public void textAdditionalVsTcLocale() {
+        final List<CLDRLocale> extendedSubmissionButNotTcLocales =
+                SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION.stream()
+                        .map(l -> CLDRLocale.getInstance(l))
+                        .filter(l -> !SubmissionLocales.isTcLocale(l))
+                        .collect(Collectors.toList());
+        assertTrue(
+                extendedSubmissionButNotTcLocales.isEmpty(),
+                () ->
+                        "Locales in SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION that should be removed as they are not TC locales: "
+                                + String.join(
+                                        " ",
+                                        extendedSubmissionButNotTcLocales.stream()
+                                                .map(l -> l.getBaseName())
+                                                .collect(Collectors.toList())));
+    }
 }

From ad7d40876f7410bead8646a23c4c4d8cc14cec3a Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 12 Jun 2024 09:30:51 -0500
Subject: [PATCH 09/10] CLDR-16835 Extended Submission Phase - bugfix

- code was still using TC locale instead of extended locale for the phase test
---
 .../src/main/java/org/unicode/cldr/web/SurveyMain.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index ecc92b56372..08c09c31f02 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -3604,9 +3604,9 @@ public static Phase getOverallSurveyPhase() {
      * @returns the SurveyTool Phase for the locale
      */
     public static Phase surveyPhase(CLDRLocale locale) {
-        return (SubmissionLocales.isTcLocale(locale)
-                ? getOverallSurveyPhase()
-                : getOverallExtendedPhase());
+        return (SubmissionLocales.isOpenForExtendedSubmission(locale)
+                ? getOverallExtendedPhase()
+                : getOverallSurveyPhase());
     }
 
     /**

From 9c197a87e974d9a032330e72ec8834677dbe6e94 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 12 Jun 2024 10:04:01 -0500
Subject: [PATCH 10/10] CLDR-16835 Extended Submission Phase - bugfix

- test needed to be updated
---
 .../cldr/test/TestSubmissionLocales.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
index 5fc20a5bdf5..702dd517b76 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
@@ -99,18 +99,18 @@ public void testIsTcLocale(final String loc, final String tf) {
 
     @ParameterizedTest
     @CsvSource({
-        // loc, isTc
-        "root, true",
-        "de, true",
-        "de_IT, true",
-        "csw, false",
-        "csw_CA, false",
-        "cho_US, false",
-        "zh, true",
-        "zh_Hant_MO, true",
-        "smj, false",
-        "smj_NO, false",
-        "smj_SE, false",
+        // loc, isExtended
+        "root, false",
+        "de, false",
+        "de_IT, false",
+        "csw, true",
+        "csw_CA, true",
+        "cho_US, true",
+        "zh, false",
+        "zh_Hant_MO, false",
+        "smj, true",
+        "smj_NO, true",
+        "smj_SE, true",
     })
     public void testIsExtendedSubmissionLocale(final String loc, final String tf) {
         final CLDRLocale l = CLDRLocale.getInstance(loc);