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.

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

NAS-130139 / 25.04 / Fix unlock children tooltip #10998

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Conversation

bvasilenko
Copy link
Contributor

Changes:

Updated the tooltip

Testing:

Please follow replication steps in the ticket.

Expected result: tooltip is displayed correctly

@bvasilenko bvasilenko requested a review from a team as a code owner November 8, 2024 06:27
@bvasilenko bvasilenko requested review from undsoft and removed request for a team November 8, 2024 06:27
@bugclerk bugclerk changed the title NAS-130139: Fix unlock children tooltip NAS-130139 / 25.04 / Fix unlock children tooltip Nov 8, 2024
@bugclerk
Copy link
Contributor

bugclerk commented Nov 8, 2024

Copy link

codecov bot commented Nov 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.04%. Comparing base (8a302b0) to head (885c0b0).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10998   +/-   ##
=======================================
  Coverage   82.04%   82.04%           
=======================================
  Files        1616     1616           
  Lines       57001    57014   +13     
  Branches     5894     5897    +3     
=======================================
+ Hits        46767    46778   +11     
- Misses      10234    10236    +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -6,7 +6,8 @@ export const helptextUnlock = {
unlock_key_file_placeholder: T('Unlock with Key file'),
unlock_key_file_tooltip: T('Use an exported encryption key file to unlock datasets.'),
unlock_children_placeholder: T('Unlock Child Encrypted Roots'),
unlock_children_tooltip: T('Also unlock any encrypted dataset stored within this dataset.'),
unlock_children_tooltip: T('Also unlock any encrypted dataset stored within this dataset. \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's change first line to "Also unlock any separate encryption roots that are children of this dataset".

@bvasilenko bvasilenko enabled auto-merge (squash) November 10, 2024 16:37
@bvasilenko bvasilenko merged commit 9d2424c into master Nov 11, 2024
13 checks passed
@bvasilenko bvasilenko deleted the NAS-130139 branch November 11, 2024 10:54
@bugclerk
Copy link
Contributor

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Nov 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants