Skip to content

Extract Diff File translations to shared Diffs I18N file

Thomas Randolph requested to merge feature/collapsed-diff-files/i18n into master

What does this MR do?

For #16047 (closed)

This is one MR in a sequence to improve the way collapsed files are handled in Merge Request diffs.

To create the smallest impact possible, it's broken up into a few steps.

Step MR Description
1 !43296 (merged) Refactor the existing collapsed flags into something more accurate, like automaticallyCollapsed
This will leave a small inconsistency where user-collapsed files will be toggling the automaticallyCollapsed property.
2 !43911 (merged) Add a flag like userCollapsed alongside the auto flag
This will require Vuex actions, mutations, getters ("how many of each type?"), etc.
Update the UI to use both flags
This will require some resolution code ("which flag wins?"), and various tweaks to the UI code
Modify collapsed files to hide the body on userCollapsed and show the warning on automaticallyCollapsed
3.1 We're here 👉🏻 Extract translations to the shared i18n file for Diffs
3.2 This includes making the warning orange and swapping the text to indicate it was performed automatically.

This MR moves out all of the localized strings in the diff_file.vue file to live in the shared / common i18n.js for all of Diffs.

Screenshots

N/A (all backstage)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team

Merge request reports

Loading