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

Ability to pull a single language file from upstream #7103

Open
emanuele-f opened this issue Jan 14, 2022 · 2 comments
Open

Ability to pull a single language file from upstream #7103

emanuele-f opened this issue Jan 14, 2022 · 2 comments
Labels
backlog This is not on the Weblate roadmap for now. Can be prioritized by sponsorship. enhancement Adding or requesting a new feature.

Comments

@emanuele-f
Copy link

Describe the problem

Solving conflicts in Weblate is a nightmare. This is evident when you try to mix Weblate translation with git based translation. It seems like the current options are:

  • Merge Weblate upstream and fix the conflicts, but this forces users to commit possibly unwanted localization and make the upstream history dirty
  • Hard reset Weblate from upstream, which requires a manual selection of the files to copy upstream before doing the reset

Both #98 and #5915 would definitely help with this issue, but since it seems like they won't be fixed any time soon, I propose what I think it's a simple solution which hopefully can be implemented without any particular implications.

Describe the solution you'd like

Right now we have the ability to reset a Weblate component from upstream, but the impact of this is too broad. What I propose is to add the ability to pull a single language from upstream, by creating a new commit on the Weblate git head. This simple action would help solving conflicts on specific language files without affecting the other languages.

Describe alternatives you've considered

No response

Screenshots

No response

Additional context

No response

@nijel nijel added backlog This is not on the Weblate roadmap for now. Can be prioritized by sponsorship. enhancement Adding or requesting a new feature. labels Jan 18, 2022
@github-actions
Copy link

This issue has been added to the backlog. It is not scheduled on the Weblate roadmap, but it eventually might be implemented.

In case you need this feature soon, please consider helping or push it by funding the development.

@nijel
Copy link
Member

nijel commented Oct 16, 2023

Reading this again (because #10200) brought me here, I'm not really convinced this is a viable approach. Taking a file from upstream and committing it on top of Weblate changes will not make the conflict on that file disappear. Git will still try to apply the upstream change, as it is not the same change as happened on top of Weblate changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backlog This is not on the Weblate roadmap for now. Can be prioritized by sponsorship. enhancement Adding or requesting a new feature.
Projects
None yet
Development

No branches or pull requests

2 participants