fixes #911: add warning to encryption popup (#838)

* fixes #911: add warning to encryption popup * update text
getodk · Aug 9, 2023 · 5ccb2ed · 5ccb2ed
1 parent b12ce76
commit 5ccb2ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/components/project/enable-encryption.vue b/src/components/project/enable-encryption.vue
@@ -40,6 +40,14 @@ except according to the terms contained in the LICENSE file.
                 </template>
               </i18n-t>
             </div>
+            <div class="info-item">
+              <span class="icon-circle-o"></span>
+              <p>{{ $t('steps[0].introduction[1][1][0]') }}</p>
+            </div>
+            <div class="info-item">
+              <span class="icon-circle-o"></span>
+              <p>{{ $t('steps[0].introduction[1][3]') }} </p>
+            </div>
             <div class="info-item">
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[0][4]') }}</p>
@@ -56,18 +64,9 @@ except according to the terms contained in the LICENSE file.
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[0][7]') }}</p>
             </div>
-          </div>
-          <div class="info-block">
-            <p>{{ $t('steps[0].introduction[1][0]') }}</p>
-            <div class="info-item">
-              <span class="icon-circle-o"></span>
-              <p>{{ $t('steps[0].introduction[1][1][0]') }}</p>
-              <p>{{ $t('steps[0].introduction[1][1][1]') }}</p>
-            </div>
             <div class="info-item">
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[1][2][0]') }}</p>
-              <p>{{ $t('steps[0].introduction[1][2][1]') }}</p>
             </div>
           </div>
           <i18n-t tag="p" keypath="steps[0].introduction[2].full">
@@ -290,15 +289,15 @@ export default {
             "New Submissions will no longer be processed into Entities."
           ],
           [
+            // don't translate this sentence, it is not used anywhere
             "In addition, the following are true in this version of ODK Central:",
             [
-              "Existing Submissions will remain unencrypted.",
-              "In a future version, you will have the option to encrypt existing data."
+              "Existing Submissions will remain unencrypted."
             ],
             [
-              "Encryption cannot be turned off once enabled.",
-              "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
-            ]
+              "Encryption cannot be turned off once enabled."
+            ],
+            "Test Submissions to existing Draft Forms will be permanently removed."
           ],
           {
             "full": "You can learn more about encryption {here}. If this sounds like something you want, press Next to proceed.",

diff --git a/transifex/strings_en.json b/transifex/strings_en.json
@@ -2914,23 +2914,21 @@
             },
             "1": {
               "0": {
-                "string": "In addition, the following are true in this version of ODK Central:"
+                "string": "In addition, the following are true in this version of ODK Central:",
+                "developer_comment": "don't translate this sentence, it is not used anywhere"
               },
               "1": {
                 "0": {
                   "string": "Existing Submissions will remain unencrypted."
-                },
-                "1": {
-                  "string": "In a future version, you will have the option to encrypt existing data."
                 }
               },
               "2": {
                 "0": {
                   "string": "Encryption cannot be turned off once enabled."
-                },
-                "1": {
-                  "string": "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
                 }
+              },
+              "3": {
+                "string": "Test Submissions to existing Draft Forms will be permanently removed."
               }
             },
             "2": {