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

Translations update from Weblate #3112

Merged

Conversation

xwikiorgci
Copy link
Contributor

Translations update from Weblate for XWiki Platform/XWiki Core Resources.

Current translation status:

Weblate translation status

If a new locale is introduced by this pull request make sure to follow https://dev.xwiki.org/xwiki/bin/view/Community/L10N/SupportedLocales/#HNewlocalechecklist before applying it.

@github-actions github-actions bot added the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label May 7, 2024
# License along with this software; if not, write to the Free
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
Copy link
Member

Choose a reason for hiding this comment

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

This is a surprising change... We need to understand why it's like that.

Copy link
Member

@tmortagne tmortagne May 13, 2024

Choose a reason for hiding this comment

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

This is a classic actually: it comes from the fact that realtime.editingAlone used to be the first key (to which the comment above was associated as a key comment).

Ideally, the header should be skipped when parsing the file and regenerated when generating the file.

Copy link
Member

Choose a reason for hiding this comment

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

This is a classic actually: it comes from the fact that realtime.editingAlone used to be the first key (to which the comment above was associated as a key comment).

Interesting, so the first key has been moved by adding new keys in the file above it. But then it means the comment on this key should have been removed in weblate: the source file should have been parsed again.

Ideally, the header should be skipped when parsing the file and regenerated when generating the file.

Yeah AFAIR it wasn't easy to do that in a generic way.

Copy link
Member

@tmortagne tmortagne May 14, 2024

Choose a reason for hiding this comment

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

the source file should have been parsed again.

It seems it does eventually (there is no comment on https://l10n.xwiki.org/translate/xwiki-platform/xwiki-platform-netflux-api/en/?checksum=20fe1ac3f204157c&sort_by=-priority,position#nearby) but there must be some race condition at some point. What is sure is every time we had this issue, the trigger was a first key moving down in the file.

Copy link
Member

Choose a reason for hiding this comment

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

ok, thanks for the hint.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe Weblate has different comments from the main key and the translation and since this commit is the one in which the key was moved down from de translation point of view it might have the comment of the previous version of the key and the serializer generating a new header.

SimpelMe and others added 6 commits May 16, 2024 20:27
Currently translated at 100.0% (4486 of 4486 strings)

Translation: XWiki Platform/XWiki Core Resources
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-core-resources/de/
Currently translated at 100.0% (14 of 14 strings)

Translation: XWiki Platform/Panels.Translations
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/panels-translations/de/
Currently translated at 100.0% (26 of 26 strings)

Translation: XWiki Platform/XWiki.UserProfileTranslations
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-userprofiletranslations/de/
Currently translated at 100.0% (66 of 66 strings)

Translation: XWiki Platform/xwiki-platform-netflux-api
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-netflux-api/de/
Currently translated at 56.0% (2516 of 4486 strings)

Translation: XWiki Platform/XWiki Core Resources
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-core-resources/gl/
Currently translated at 100.0% (4 of 4 strings)

Translation: XWiki Platform/Index.Translations
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/index-translations/gl/
@xwikiorgci xwikiorgci force-pushed the weblate-xwiki-platform-xwiki-core-resources branch from 861c0bf to 5b445d5 Compare May 16, 2024 18:27
Manually fix the wrong comments.
@surli surli merged commit 66239ec into xwiki:master May 17, 2024
1 check passed
Copy link

The backport to stable-15.10.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-stable-15.10.x stable-15.10.x
# Navigate to the new working tree
cd .worktrees/backport-stable-15.10.x
# Create a new branch
git switch --create backport-3112-to-stable-15.10.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 66239ec4e1c5110aa4180d5b091682e9b4662849
# Push it to GitHub
git push --set-upstream origin backport-3112-to-stable-15.10.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-stable-15.10.x

Then, create a pull request where the base branch is stable-15.10.x and the compare/head branch is backport-3112-to-stable-15.10.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport stable-15.10.x Used for automatic backport to 15.10.x branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants