Avoid broken masters on locale/gitlab.pot for automatic CE -> EE merges
Right now, we ignore the locale/gitlab.pot
file in the ee_compat_check
to avoid developers having to create an EE MR for all translations being updated.
This could sometimes cause issues on the automatic CE -> EE merge, as the merge conflicts would be resolved using --ours
, meaning externalisations could be missing from the gitlab.pot
file after a merge causing static-analysis
to fail.
The file in EE contains all strings from CE + the extra strings for EE. It is automatically generated based on the source code by running bundle exec rake gettext:regenerate
.
We should find a way to avoid this, suggestions were:
- split up the file for CE & EE so there would be no more conflicts
- make sure the file is up to date before the CE->EE takes place
- automatically regenerate the file on a merge