Project

General

Profile

Cleanup #38003

mgr/dashboard: Avoid merge conflicts in messages.xlf by auto-generating it at build time?

Added by Lenz Grimmer almost 2 years ago. Updated over 1 year ago.

Status:
Resolved
Priority:
Normal
Category:
dashboard/i18n
Target version:
% Done:

0%

Tags:
Backport:
nautilus
Reviewed:

Description

Currently, the file ./src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf needs to be updated by running "npm run i18n" every time when changes to the UI have been made that affect translatable strings. The modified messages.xlf file then needs to be commited and is part of the changeset. This approach has several issues:

  • As this file potentially gets modified by many pull requests, it becomes a "hot spot", requiring lots of rebasing and resolving of conflicts
  • Including the messages.xlf file in the same commit as other changes makes it more difficult to back-port such a change to older releases, where the messages.xlf might differ significantly

Would it make sense to treat this file as an asset that gets generated at build time instead, taking it out of git revision control?


Related issues

Duplicated by mgr - Cleanup #39627: mgr/dashboard: Remove messages.xlf file Duplicate 05/08/2019
Copied to mgr - Backport #39658: nautilus: mgr/dashboard: Avoid merge conflicts in messages.xlf by auto-generating it at build time? Resolved

History

#1 Updated by Lenz Grimmer over 1 year ago

  • Duplicated by Cleanup #39627: mgr/dashboard: Remove messages.xlf file added

#2 Updated by Lenz Grimmer over 1 year ago

  • Assignee set to Sebastian Krah
  • Backport set to nautilus

#3 Updated by Sebastian Krah over 1 year ago

  • Status changed from New to Fix Under Review

#4 Updated by Sebastian Krah over 1 year ago

  • Pull request ID set to 28020

#5 Updated by Lenz Grimmer over 1 year ago

  • Status changed from Fix Under Review to Pending Backport

#6 Updated by Ricardo Marques over 1 year ago

  • Copied to Backport #39658: nautilus: mgr/dashboard: Avoid merge conflicts in messages.xlf by auto-generating it at build time? added

#7 Updated by Lenz Grimmer over 1 year ago

  • Target version set to v15.0.0
  • Affected Versions v14.0.0, v14.2.0, v14.2.1, v15.0.0 added

#8 Updated by Tiago Melo over 1 year ago

  • Status changed from Pending Backport to Resolved

Also available in: Atom PDF