Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #911: add warning to encryption popup #838

Merged
merged 2 commits into from
Aug 9, 2023
Merged

fixes #911: add warning to encryption popup #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14bc54f
fixes #911: add warning to encryption popup
sadiqkhoja Aug 2, 2023
8d84f4b
update text
sadiqkhoja Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/components/project/enable-encryption.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -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.",
Expand Down
12 changes: 5 additions & 7 deletions transifex/strings_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down