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

PM-13908 fixing copy on step2 and step3 and making vault url dynamic #4154

Merged
merged 3 commits into from
Oct 28, 2024

Conversation

dseverns-livefront
Copy link
Collaborator

@dseverns-livefront dseverns-livefront commented Oct 24, 2024

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-13908

📔 Objective

  • make the environment set the url used for instruction on step 2.
  • fix the copy on the help text.

📸 Screenshots

image

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

Copy link
Contributor

github-actions bot commented Oct 24, 2024

Logo
Checkmarx One – Scan Summary & Details6bb5fb3e-aaf4-4680-8317-34c860cabc07

No New Or Fixed Issues Found

Copy link

codecov bot commented Oct 24, 2024

Codecov Report

Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.

Project coverage is 88.95%. Comparing base (deb9eb8) to head (43e53bd).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...ault/feature/importlogins/ImportLoginsViewModel.kt 83.33% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4154      +/-   ##
==========================================
- Coverage   88.95%   88.95%   -0.01%     
==========================================
  Files         439      439              
  Lines       38099    38111      +12     
  Branches     5336     5338       +2     
==========================================
+ Hits        33891    33901      +10     
  Misses       2346     2346              
- Partials     1862     1864       +2     

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

@@ -1055,7 +1055,7 @@ Skift til denne konto?</string>
<string name="then_done_highlight">dernæst Færdig</string>
<string name="for_your_security_be_sure_to_delete_your_saved_password_file">Sørg af sikkerhedshensyn for at slette den gemte adgangskodefil.</string>
<string name="delete_your_saved_password_file">slet den gemte adgangskodefil.</string>
<string name="need_help_checkout_out_import_help">Behov for hjælp? Tjek import-hjælp ud.</string>
<string name="need_help_check_out_import_help">Behov for hjælp? Tjek import-hjælp ud.</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

You do not need to update these other files, just the base one.

The next Crowdin sync will take care of the rest.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

So I rolled this back, it does seem to be what is failing the build. Cause the that version of the string no longer exists in the default version. Are we ok to merge, crowdin is a black box to me.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmmm, @SaintPatrck do we have a good way of doing this?

Copy link
Contributor

Choose a reason for hiding this comment

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

We can ignore ExtraTranslation since Crowdin will be managing this. I opened #4176 to ignore it.

@dseverns-livefront dseverns-livefront added this pull request to the merge queue Oct 28, 2024
Merged via the queue into main with commit 05c7686 Oct 28, 2024
9 checks passed
@dseverns-livefront dseverns-livefront deleted the import-logins-small-fixes branch October 28, 2024 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants