Skip to content

[Backport 2026.01.xx] NL translations update v2026.01.00#12436

Merged
tdipisa merged 3 commits into
2026.01.xxfrom
backport-12300-to-2026.01.xx
May 29, 2026
Merged

[Backport 2026.01.xx] NL translations update v2026.01.00#12436
tdipisa merged 3 commits into
2026.01.xxfrom
backport-12300-to-2026.01.xx

Conversation

@offtherailz
Copy link
Copy Markdown
Member

Description

Backport of #12300 to 2026.01.xx.

Fixes #

@offtherailz offtherailz added this to the 2026.01.02 milestone May 28, 2026
@cla-bot cla-bot Bot added the CLA Ready label May 28, 2026
@tdipisa tdipisa self-requested a review May 28, 2026 12:43
@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented May 28, 2026

@ygodaert can I kindly ask you to fix conflicts in this backport? Many thanks.

@ygodaert
Copy link
Copy Markdown
Contributor

@tdipisa my bad... There was still a reference to "<<<<<<< HEAD=======" after resolving the merge conflicts. I opened a new pull request to fix this issue >> #12438. I didn't saw a way to add the commit to the pull #12215.

@tdipisa tdipisa marked this pull request as ready for review May 28, 2026 14:30
@tdipisa tdipisa enabled auto-merge (squash) May 28, 2026 14:30
Copy link
Copy Markdown
Member

@tdipisa tdipisa left a comment

Choose a reason for hiding this comment

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

@ygodaert there are still ESLint issues due merge conflicts

@ygodaert
Copy link
Copy Markdown
Contributor

@tdipisa Apparently the visual merge conflict resolver introduced a couple of artefacts of conflict tags after resolving the conflicts. In #12442 I removed them, double checked through a JSON lint and everything should be resolved now.

@tdipisa tdipisa self-requested a review May 29, 2026 08:56
Copy link
Copy Markdown
Member

@tdipisa tdipisa left a comment

Choose a reason for hiding this comment

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

@ygodaert I'm sorry but there are still issues. Running an 'npm run lint' on this PR branch locally you should be able to see what is failing:

Image

@ygodaert
Copy link
Copy Markdown
Contributor

@tdipisa I fixed this in https://github.com/geosolutions-it/MapStore2/pull/12442/changes. Is there any other action I need to do or should have done?
In the future I will only use my IDE to make changes on merge conflicts, because it feels a bit buggy in GitHub UI.

@tdipisa tdipisa disabled auto-merge May 29, 2026 10:08
@tdipisa tdipisa self-requested a review May 29, 2026 10:18
@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented May 29, 2026

@ygodaert I've fixed this for you. Can you please check if ok before I merge? Thanks.

@ygodaert
Copy link
Copy Markdown
Contributor

@tdipisa looks good to me, thank you!

@tdipisa tdipisa merged commit 3cd46f4 into 2026.01.xx May 29, 2026
12 checks passed
@tdipisa tdipisa deleted the backport-12300-to-2026.01.xx branch May 29, 2026 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants