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
+18 −21
Merged

fixes #911: add warning to encryption popup #838

Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 6 additions & 3 deletions src/components/project/enable-encryption.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ except according to the terms contained in the LICENSE file.
<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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's reasonable to remove this explanatory text. There are more items in the modal than there used to be, so I think it's a good idea to remove non-essential text. CC @lognaturel for a second opinion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do remove this explanatory text, we should also remove the i18n messages below.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m pro removing all “in future” text. I think it’s more confusing than helpful.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Existing Submissions will remain unencrypted." seems like a useful caveat to me, but I don't think we need "Encryption cannot be turned off once enabled."

</div>
<div class="info-item">
matthew-white marked this conversation as resolved.
Show resolved Hide resolved
<span class="icon-close"></span>
matthew-white marked this conversation as resolved.
Show resolved Hide resolved
<p>{{ $t('steps[0].introduction[1][3]') }} </p>
</div>
</div>
<i18n-t tag="p" keypath="steps[0].introduction[2].full">
Expand Down Expand Up @@ -298,7 +300,8 @@ export default {
[
"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."
]
],
"Draft Submissions from all Forms will be deleted."
matthew-white marked this conversation as resolved.
Show resolved Hide resolved
],
{
"full": "You can learn more about encryption {here}. If this sounds like something you want, press Next to proceed.",
Expand Down
3 changes: 3 additions & 0 deletions transifex/strings_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2931,6 +2931,9 @@
"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": "Draft Submissions from all Forms will be deleted."
}
},
"2": {
Expand Down