From b2da4180cf7321e352a8269f44516c13e5ce63c6 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 4 Dec 2024 13:10:51 -0600
Subject: [PATCH 1/5] CLDR-17612 cla: update text and buttons

---
 tools/cldr-apps/js/src/md/cla.md         | 13 +++-
 tools/cldr-apps/js/src/views/SignCla.vue | 84 ++++++++++--------------
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/tools/cldr-apps/js/src/md/cla.md b/tools/cldr-apps/js/src/md/cla.md
index 2057b8ddf40..9a5e066b8db 100644
--- a/tools/cldr-apps/js/src/md/cla.md
+++ b/tools/cldr-apps/js/src/md/cla.md
@@ -1,4 +1,11 @@
-# CLA not needed
+# Contributor License Agreement (CLA)
+
+Hello. We need your permission to use the data and information that you submit to the Unicode CLDR Survey Tool. To do this, we need a contributor license agreement (CLA) on file for you or your employer so that Unicode has the required permissions to use your contributions in our products and services. If you are seeing this message, it means we do not have such a CLA on file.
+
+If you would like to sign Unicode’s standard CLA so that you may contribute to other Unicode projects as well as Survey Tool, please refer to our [IP Policies](https://www.unicode.org/policies/licensing_policy.html) to find out how to get a standard CLA in place.
+
+*Alternatively*, if you do not wish to sign Unicode’s standard CLA and you wish to contribute only to the CLDR Survey Tool, you may agree to the following terms for your Survey Tool contributions:
+
+1. You represent and agree that the contributed matter is not proprietary or confidential to you or your employer or any third party; and/or
+2. You grant to Unicode and to recipients of products distributed by Unicode a perpetual, irrevocable, unrestricted, worldwide, nonexclusive, no-charge, royalty-free license, without obligation for accounting, to reproduce, prepare derivative works of, publicly display, publicly perform, distribute, make, use, sell, offer to sell, or import that matter for any purpose, with the unrestricted right to sublicense those rights.
 
-The SurveyTool is not currently requiring a CLA.
-For more details about the CLA, see [policy](https://www.unicode.org/policies/licensing_policy.html)
diff --git a/tools/cldr-apps/js/src/views/SignCla.vue b/tools/cldr-apps/js/src/views/SignCla.vue
index 3f3def5191c..ff39caa5bc0 100644
--- a/tools/cldr-apps/js/src/views/SignCla.vue
+++ b/tools/cldr-apps/js/src/views/SignCla.vue
@@ -1,23 +1,10 @@
 <template>
   <div>
-    <a-alert
-      v-if="needCla"
-      type="warning"
-      message="Please read and sign the below CLA to begin contributing."
-      show-icon
-    />
-    <a-alert
-      v-else-if="readonlyCla"
-      type="info"
-      message="Your organization has signed the CLA, it may not be modified."
-      show-icon
-    />
-    <a-alert
-      v-else
-      type="success"
-      message="The CLA has been signed"
-      show-icon
-    />
+    <a-alert v-if="needCla" type="warning" message="Please read and sign the below CLA to begin contributing."
+      show-icon />
+    <a-alert v-else-if="readonlyCla" type="info" message="Your organization has signed the CLA, it may not be modified."
+      show-icon />
+    <a-alert v-else type="success" message="The CLA has been signed" show-icon />
 
     <!-- CLA text -->
     <a-spin v-if="loading" />
@@ -36,60 +23,61 @@
           <i class="glyphicon glyphicon-envelope" />
         </template>
       </a-input>
-      Your Employer (or 'none'):<a-input
-        :disabled="!needCla"
-        v-model:value="userEmployer"
-      >
+      Your Employer (or 'none'):<a-input :disabled="!needCla" v-model:value="userEmployer">
         <template #prefix>
           <i class="glyphicon glyphicon-briefcase" />
         </template>
       </a-input>
-      <i class="pleaseChoose" v-if="needCla && userSign == 0"
-        >Please choose one:</i
-      ><br />
+      <i class="pleaseChoose" v-if="needCla && userSign == 0">Please check the applicable box below (only one) to
+        indicate your agreement.</i><br />
       <a-radio-group :disabled="!needCla" v-model:value="userSign">
+        <a-radio :style="radioStyle" :value="2">
+          I am contributing as an individual because I am self-employed or unemployed. I have read and agree to the
+          foregoing terms.
+        </a-radio>
+        <a-radio :style="radioStyle" :value="3">
+          I am contributing as an individual because, even though I am employed, my employer has no rights and claims no
+          rights to my contributions. I have read and agree to the foregoing terms.
+        </a-radio>
+        <a-radio :style="radioStyle" :value="4">
+          I am employed and my employer has or may have rights in my contributions under my employment agreement and/or
+          the work for hire doctrine or similar legal principles.
+        </a-radio>
         <a-radio :style="radioStyle" :value="1">
           My employer has already signed the CLA and is listed on Unicode’s
-          <a href="https://www.unicode.org/policies/corporate-cla-list/"
-            >List of Corporate CLAs</a
-          >.
-        </a-radio>
-        <a-radio :style="radioStyle" :value="2">
-          I am a self-employed or unemployed individual and I have read and
-          agree to the CLA.
+          <a href="https://www.unicode.org/policies/corporate-cla-list/">List of Corporate CLAs</a>.
         </a-radio>
       </a-radio-group>
       <br />
-      <button
-        @click="sign"
-        v-if="
+      <button @click="sign" v-if="
           needCla &&
           userSign != 0 &&
+          userSign != 4 &&
           userName &&
           userEmail &&
           userEmployer &&
           !readonlyCla
-        "
-      >
+        ">
         Sign
       </button>
-      <a-alert
-        type="info"
-        v-else-if="needCla"
-        message="Please fill in the above fields."
-      />
+      <div v-else-if="userSign == 4">
+        <a-alert type="error" message="Please request that your employer sign the Unicode Corporate CLA." />
+        &nbsp;<a href="https://www.unicode.org/policies/licensing_policy.html#signing">How to sign the Corporate CLA…</a>
+      </div>
+      <a-alert type="info" v-else-if="needCla" message="Please fill in the above fields." />
       <hr />
     </div>
-    <div v-if="!needCla">
-      <a-alert
-        v-if="!readonlyCla"
-        type="warning"
-        message="If the CLA is revoked, you will not be able to continue contributing to CLDR. You will have an opportunity to re-sign if corrections are needed."
-      />
+    <div v-if="false && !needCla"> <!-- revocation is not allowed at present -->
+      <a-alert v-if="!readonlyCla" type="warning"
+        message="If the CLA is revoked, you will not be able to continue contributing to CLDR. You will have an opportunity to re-sign if corrections are needed." />
       <button v-if="!readonlyCla" @click="revoke">Revoke</button>
     </div>
     <a-spin v-if="loading" />
   </div>
+  <div>
+    <p>If you would like further information regarding contributing to Unicode, please see our <a target="_blank" href="https://www.unicode.org/policies/licensing_policy.html">IP Policies</a>. </p>
+    <p>If you believe you are already under a Unicode CLA and are seeing this message in error, or if you have further questions, please contact <a target="_blank" href="mailto:cldr-cla@unicode.org"><code>cldr-cla@unicode.org</code></a>.</p>
+  </div>
 </template>
 
 <script setup>

From e3eb21f1a0348ecad89395c62e5474a2fd3f0c68 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 6 Dec 2024 13:15:27 -0600
Subject: [PATCH 2/5] CLDR-17612 cla: update per discussion

- remove the self-sign for corp cla
---
 tools/cldr-apps/js/src/views/SignCla.vue | 105 +++++++++++++++++------
 1 file changed, 79 insertions(+), 26 deletions(-)

diff --git a/tools/cldr-apps/js/src/views/SignCla.vue b/tools/cldr-apps/js/src/views/SignCla.vue
index ff39caa5bc0..c31e76bdf55 100644
--- a/tools/cldr-apps/js/src/views/SignCla.vue
+++ b/tools/cldr-apps/js/src/views/SignCla.vue
@@ -1,10 +1,23 @@
 <template>
   <div>
-    <a-alert v-if="needCla" type="warning" message="Please read and sign the below CLA to begin contributing."
-      show-icon />
-    <a-alert v-else-if="readonlyCla" type="info" message="Your organization has signed the CLA, it may not be modified."
-      show-icon />
-    <a-alert v-else type="success" message="The CLA has been signed" show-icon />
+    <a-alert
+      v-if="needCla"
+      type="warning"
+      message="Please read and sign the below CLA to begin contributing."
+      show-icon
+    />
+    <a-alert
+      v-else-if="readonlyCla"
+      type="info"
+      message="Your organization has signed the CLA, it may not be modified."
+      show-icon
+    />
+    <a-alert
+      v-else
+      type="success"
+      message="The CLA has been signed"
+      show-icon
+    />
 
     <!-- CLA text -->
     <a-spin v-if="loading" />
@@ -23,33 +36,44 @@
           <i class="glyphicon glyphicon-envelope" />
         </template>
       </a-input>
-      Your Employer (or 'none'):<a-input :disabled="!needCla" v-model:value="userEmployer">
+      Your Employer (or 'none'):<a-input
+        :disabled="!needCla"
+        v-model:value="userEmployer"
+      >
         <template #prefix>
           <i class="glyphicon glyphicon-briefcase" />
         </template>
       </a-input>
-      <i class="pleaseChoose" v-if="needCla && userSign == 0">Please check the applicable box below (only one) to
-        indicate your agreement.</i><br />
+      <i class="pleaseChoose" v-if="needCla && userSign == 0"
+        >Please check the applicable box below (only one) to indicate your
+        agreement.</i
+      ><br />
       <a-radio-group :disabled="!needCla" v-model:value="userSign">
         <a-radio :style="radioStyle" :value="2">
-          I am contributing as an individual because I am self-employed or unemployed. I have read and agree to the
-          foregoing terms.
+          I am contributing as an individual because I am self-employed or
+          unemployed. I have read and agree to the foregoing terms.
         </a-radio>
         <a-radio :style="radioStyle" :value="3">
-          I am contributing as an individual because, even though I am employed, my employer has no rights and claims no
-          rights to my contributions. I have read and agree to the foregoing terms.
+          I am contributing as an individual because, even though I am employed,
+          my employer has no rights and claims no rights to my contributions. I
+          have read and agree to the foregoing terms.
         </a-radio>
         <a-radio :style="radioStyle" :value="4">
-          I am employed and my employer has or may have rights in my contributions under my employment agreement and/or
-          the work for hire doctrine or similar legal principles.
+          I am employed and my employer has or may have rights in my
+          contributions under my employment agreement and/or the work for hire
+          doctrine or similar legal principles.
         </a-radio>
-        <a-radio :style="radioStyle" :value="1">
+        <a-radio v-if="false" :style="radioStyle" :value="1">
           My employer has already signed the CLA and is listed on Unicode’s
-          <a href="https://www.unicode.org/policies/corporate-cla-list/">List of Corporate CLAs</a>.
+          <a href="https://www.unicode.org/policies/corporate-cla-list/"
+            >List of Corporate CLAs</a
+          >.
         </a-radio>
       </a-radio-group>
       <br />
-      <button @click="sign" v-if="
+      <button
+        @click="sign"
+        v-if="
           needCla &&
           userSign != 0 &&
           userSign != 4 &&
@@ -57,26 +81,55 @@
           userEmail &&
           userEmployer &&
           !readonlyCla
-        ">
+        "
+      >
         Sign
       </button>
       <div v-else-if="userSign == 4">
-        <a-alert type="error" message="Please request that your employer sign the Unicode Corporate CLA." />
-        &nbsp;<a href="https://www.unicode.org/policies/licensing_policy.html#signing">How to sign the Corporate CLA…</a>
+        <a-alert
+          type="error"
+          message="Please request that your employer sign the Unicode Corporate CLA."
+        />
+        &nbsp;<a
+          href="https://www.unicode.org/policies/licensing_policy.html#signing"
+          >How to sign the Corporate CLA…</a
+        >
       </div>
-      <a-alert type="info" v-else-if="needCla" message="Please fill in the above fields." />
+      <a-alert
+        type="info"
+        v-else-if="needCla"
+        message="Please fill in the above fields."
+      />
       <hr />
     </div>
-    <div v-if="false && !needCla"> <!-- revocation is not allowed at present -->
-      <a-alert v-if="!readonlyCla" type="warning"
-        message="If the CLA is revoked, you will not be able to continue contributing to CLDR. You will have an opportunity to re-sign if corrections are needed." />
+    <div v-if="false && !needCla">
+      <!-- revocation is not allowed at present -->
+      <a-alert
+        v-if="!readonlyCla"
+        type="warning"
+        message="If the CLA is revoked, you will not be able to continue contributing to CLDR. You will have an opportunity to re-sign if corrections are needed."
+      />
       <button v-if="!readonlyCla" @click="revoke">Revoke</button>
     </div>
     <a-spin v-if="loading" />
   </div>
   <div>
-    <p>If you would like further information regarding contributing to Unicode, please see our <a target="_blank" href="https://www.unicode.org/policies/licensing_policy.html">IP Policies</a>. </p>
-    <p>If you believe you are already under a Unicode CLA and are seeing this message in error, or if you have further questions, please contact <a target="_blank" href="mailto:cldr-cla@unicode.org"><code>cldr-cla@unicode.org</code></a>.</p>
+    <p>
+      If you would like further information regarding contributing to Unicode,
+      please see our
+      <a
+        target="_blank"
+        href="https://www.unicode.org/policies/licensing_policy.html"
+        >IP Policies</a
+      >.
+    </p>
+    <p>
+      If you believe you are already under a Unicode CLA and are seeing this
+      message in error, or if you have further questions, please contact
+      <a target="_blank" href="mailto:cldr-cla@unicode.org"
+        ><code>cldr-cla@unicode.org</code></a
+      >.
+    </p>
   </div>
 </template>
 

From 092a7ec3cf1e0c94f3dfa09e5dc4844e1f60db9a Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 9 Dec 2024 12:13:18 -0600
Subject: [PATCH 3/5] CLDR-17612 cla: update text per discussion

- also, form cleanup
---
 tools/cldr-apps/js/src/views/SignCla.vue | 176 +++++++++++++----------
 1 file changed, 97 insertions(+), 79 deletions(-)

diff --git a/tools/cldr-apps/js/src/views/SignCla.vue b/tools/cldr-apps/js/src/views/SignCla.vue
index c31e76bdf55..f15f6256a3e 100644
--- a/tools/cldr-apps/js/src/views/SignCla.vue
+++ b/tools/cldr-apps/js/src/views/SignCla.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="clapage">
     <a-alert
       v-if="needCla"
       type="warning"
@@ -22,86 +22,98 @@
     <!-- CLA text -->
     <a-spin v-if="loading" />
     <div class="cla" v-html="claHtml" />
-    <hr />
-    <div>
-      Your Name:
-      <a-input :disabled="!needCla" v-model:value="userName">
-        <template #prefix>
-          <i class="glyphicon glyphicon-user" />
-        </template>
-      </a-input>
-      Your Email:
-      <a-input :disabled="!needCla" v-model:value="userEmail">
-        <template #prefix>
-          <i class="glyphicon glyphicon-envelope" />
-        </template>
-      </a-input>
-      Your Employer (or 'none'):<a-input
-        :disabled="!needCla"
-        v-model:value="userEmployer"
-      >
-        <template #prefix>
-          <i class="glyphicon glyphicon-briefcase" />
-        </template>
-      </a-input>
+
+    <a-form
+      name="claform"
+      :label-col="{ span: 6 }"
+      :wrapper-col="{ span: 19 }"
+      autocomplete="off"
+    >
+      <a-form-item label="Your Name">
+        <a-input :disabled="!needCla" v-model:value="userName">
+          <template #prefix>
+            <i class="glyphicon glyphicon-user" />
+          </template>
+        </a-input>
+      </a-form-item>
+      <a-form-item label="Your Email">
+        <a-input :disabled="!needCla" v-model:value="userEmail">
+          <template #prefix>
+            <i class="glyphicon glyphicon-envelope" />
+          </template>
+        </a-input>
+      </a-form-item>
+      <a-form-item label="Your Employer (or 'none')">
+        <a-input :disabled="!needCla" v-model:value="userEmployer">
+          <template #prefix>
+            <i class="glyphicon glyphicon-briefcase" />
+          </template>
+        </a-input>
+      </a-form-item>
+
+      <!-- non form item -->
       <i class="pleaseChoose" v-if="needCla && userSign == 0"
         >Please check the applicable box below (only one) to indicate your
         agreement.</i
-      ><br />
-      <a-radio-group :disabled="!needCla" v-model:value="userSign">
-        <a-radio :style="radioStyle" :value="2">
-          I am contributing as an individual because I am self-employed or
-          unemployed. I have read and agree to the foregoing terms.
-        </a-radio>
-        <a-radio :style="radioStyle" :value="3">
-          I am contributing as an individual because, even though I am employed,
-          my employer has no rights and claims no rights to my contributions. I
-          have read and agree to the foregoing terms.
-        </a-radio>
-        <a-radio :style="radioStyle" :value="4">
-          I am employed and my employer has or may have rights in my
-          contributions under my employment agreement and/or the work for hire
-          doctrine or similar legal principles.
-        </a-radio>
-        <a-radio v-if="false" :style="radioStyle" :value="1">
-          My employer has already signed the CLA and is listed on Unicode’s
-          <a href="https://www.unicode.org/policies/corporate-cla-list/"
-            >List of Corporate CLAs</a
-          >.
-        </a-radio>
-      </a-radio-group>
-      <br />
-      <button
-        @click="sign"
-        v-if="
-          needCla &&
-          userSign != 0 &&
-          userSign != 4 &&
-          userName &&
-          userEmail &&
-          userEmployer &&
-          !readonlyCla
-        "
       >
-        Sign
-      </button>
-      <div v-else-if="userSign == 4">
+
+      <a-form-item>
+        <a-radio-group :disabled="!needCla" v-model:value="userSign">
+          <a-radio :style="radioStyle" :value="2">
+            I am contributing as an individual because I am self-employed or
+            unemployed. I have read and agree to the foregoing terms.
+          </a-radio>
+          <a-radio :style="radioStyle" :value="3">
+            I am contributing as an individual because, even though I am
+            employed, my employer has no rights and claims no rights to my
+            contributions. I have read and agree to the foregoing terms.
+          </a-radio>
+          <a-radio :style="radioStyle" :value="4">
+            I am employed and my employer has or may have rights in my
+            contributions under my employment agreement and/or the work for hire
+            doctrine or similar legal principles.
+          </a-radio>
+          <a-radio v-if="false" :style="radioStyle" :value="1">
+            My employer has already signed the CLA and is listed on Unicode’s
+            <a href="https://www.unicode.org/policies/corporate-cla-list/"
+              >List of Corporate CLAs</a
+            >.
+          </a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item>
+        <button
+          @click="sign"
+          v-if="
+            needCla &&
+            userSign != 0 &&
+            userSign != 4 &&
+            userName &&
+            userEmail &&
+            userEmployer &&
+            !readonlyCla
+          "
+        >
+          Sign
+        </button>
+        <div v-else-if="userSign == 4">
+          <a-alert
+            type="error"
+            message="Please request that your employer sign the Unicode Corporate CLA."
+          />
+          &nbsp;<a
+            href="https://www.unicode.org/policies/licensing_policy.html#signing"
+            >How to sign the Corporate CLA…</a
+          >
+        </div>
         <a-alert
-          type="error"
-          message="Please request that your employer sign the Unicode Corporate CLA."
+          type="info"
+          v-else-if="needCla"
+          message="Please fill in the above fields."
         />
-        &nbsp;<a
-          href="https://www.unicode.org/policies/licensing_policy.html#signing"
-          >How to sign the Corporate CLA…</a
-        >
-      </div>
-      <a-alert
-        type="info"
-        v-else-if="needCla"
-        message="Please fill in the above fields."
-      />
-      <hr />
-    </div>
+      </a-form-item>
+    </a-form>
+    <hr />
     <div v-if="false && !needCla">
       <!-- revocation is not allowed at present -->
       <a-alert
@@ -112,8 +124,7 @@
       <button v-if="!readonlyCla" @click="revoke">Revoke</button>
     </div>
     <a-spin v-if="loading" />
-  </div>
-  <div>
+
     <p>
       If you would like further information regarding contributing to Unicode,
       please see our
@@ -124,8 +135,9 @@
       >.
     </p>
     <p>
-      If you believe you are already under a Unicode CLA and are seeing this
-      message in error, or if you have further questions, please contact
+      If you believe you are already under a Unicode CLA (either your own or
+      your employer’s) and are seeing this message in error, or if you have
+      further questions, please contact
       <a target="_blank" href="mailto:cldr-cla@unicode.org"
         ><code>cldr-cla@unicode.org</code></a
       >.
@@ -157,6 +169,7 @@ let userEmployer = ref(user?.org);
 let userSign = ref(0);
 const radioStyle = {
   display: "flex",
+  "padding-bottom": "1em",
 };
 
 async function loadData() {
@@ -252,4 +265,9 @@ async function revoke() {
   background-color: bisque;
   font-size: small;
 }
+
+.clapage {
+  padding-left: 2em;
+  padding-right: 2em;
+}
 </style>

From 3815f863211b71b1de565cc9a7a71191828155f0 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 9 Dec 2024 13:18:55 -0600
Subject: [PATCH 4/5] CLDR-17612 cla: record CLDR version with CLA

- also, fix date serialization issue in UserSettings (Gson setting issue) for the signed date
---
 .../main/java/org/unicode/cldr/web/ClaSignature.java  |  5 +++++
 .../main/java/org/unicode/cldr/web/UserRegistry.java  | 11 ++++++++++-
 .../main/java/org/unicode/cldr/web/UserSettings.java  |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ClaSignature.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ClaSignature.java
index 8778c22b831..95a07d3644c 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ClaSignature.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ClaSignature.java
@@ -18,6 +18,9 @@ public final class ClaSignature {
     public String employer; // May be different than org!
     public boolean corporate; // signed as corporate
 
+    @Schema(required = false, description = "Version of CLDR signed in, or * for n/a")
+    public String version; // which CLDR version was it signed in?
+
     @Schema(required = false)
     public Date signed;
 
@@ -59,6 +62,7 @@ public ClaSignature(Organization o) {
         this.corporate = true;
         this.signed = new Date(0);
         this.readonly = true;
+        this.version = "*";
     }
 
     public ClaSignature(String string) {
@@ -68,5 +72,6 @@ public ClaSignature(String string) {
         this.corporate = true;
         this.signed = new Date(0);
         this.readonly = true;
+        this.version = "*";
     }
 }
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 937307c905b..eabfca162c1 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
@@ -12,7 +12,15 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.json.JSONException;
@@ -568,6 +576,7 @@ public void signCla(ClaSignature cla) {
             }
             if (!cla.valid()) throw new IllegalArgumentException("Invalid CLA");
             cla.signed = new Date();
+            cla.version = SurveyMain.getNewVersion();
             settings().setJson(ClaSignature.CLA_KEY, cla);
             claSigned = true;
         }
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserSettings.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserSettings.java
index 7193bebabcb..79a4a2c4026 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserSettings.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserSettings.java
@@ -3,6 +3,7 @@
 package org.unicode.cldr.web;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 public abstract class UserSettings implements Comparable<UserSettings> {
     /**
@@ -92,7 +93,7 @@ public boolean persistent() {
     }
 
     public void setJson(String name, Object o) {
-        final Gson gson = new Gson();
+        final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create();
         set(name, gson.toJson(o));
     }
 

From ccf3c536b969922304d642e9a6a266fa8223b422 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 9 Dec 2024 15:32:22 -0600
Subject: [PATCH 5/5] CLDR-17612 cla: update text per discussion

- move "please contact" text up
---
 tools/cldr-apps/js/src/md/cla.md         | 3 +--
 tools/cldr-apps/js/src/views/SignCla.vue | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tools/cldr-apps/js/src/md/cla.md b/tools/cldr-apps/js/src/md/cla.md
index 9a5e066b8db..c1b478aef8b 100644
--- a/tools/cldr-apps/js/src/md/cla.md
+++ b/tools/cldr-apps/js/src/md/cla.md
@@ -1,6 +1,6 @@
 # Contributor License Agreement (CLA)
 
-Hello. We need your permission to use the data and information that you submit to the Unicode CLDR Survey Tool. To do this, we need a contributor license agreement (CLA) on file for you or your employer so that Unicode has the required permissions to use your contributions in our products and services. If you are seeing this message, it means we do not have such a CLA on file.
+Hello. We need your permission to use the data and information that you submit to the Unicode CLDR Survey Tool. To do this, we need a contributor license agreement (CLA) on file for you or your employer so that Unicode has the required permissions to use your contributions in our products and services. If you are seeing this message, it means we do not have such a CLA on file. If you believe you are already under a Unicode CLA (either your own or your employer’s) and are seeing this message in error, or if you have further questions, please contact [`cldr-cla@unicode.org`](mailto:cldr-cla@unicode.org).
 
 If you would like to sign Unicode’s standard CLA so that you may contribute to other Unicode projects as well as Survey Tool, please refer to our [IP Policies](https://www.unicode.org/policies/licensing_policy.html) to find out how to get a standard CLA in place.
 
@@ -8,4 +8,3 @@ If you would like to sign Unicode’s standard CLA so that you may contribute to
 
 1. You represent and agree that the contributed matter is not proprietary or confidential to you or your employer or any third party; and/or
 2. You grant to Unicode and to recipients of products distributed by Unicode a perpetual, irrevocable, unrestricted, worldwide, nonexclusive, no-charge, royalty-free license, without obligation for accounting, to reproduce, prepare derivative works of, publicly display, publicly perform, distribute, make, use, sell, offer to sell, or import that matter for any purpose, with the unrestricted right to sublicense those rights.
-
diff --git a/tools/cldr-apps/js/src/views/SignCla.vue b/tools/cldr-apps/js/src/views/SignCla.vue
index f15f6256a3e..e18323424d8 100644
--- a/tools/cldr-apps/js/src/views/SignCla.vue
+++ b/tools/cldr-apps/js/src/views/SignCla.vue
@@ -134,14 +134,6 @@
         >IP Policies</a
       >.
     </p>
-    <p>
-      If you believe you are already under a Unicode CLA (either your own or
-      your employer’s) and are seeing this message in error, or if you have
-      further questions, please contact
-      <a target="_blank" href="mailto:cldr-cla@unicode.org"
-        ><code>cldr-cla@unicode.org</code></a
-      >.
-    </p>
   </div>
 </template>