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.

Sign up for GitHub

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

Jump to bottom

Translations update from ioBroker Translation System #2372

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Translations update from ioBroker Translation System #2372

merged 1 commit into from
Mar 7, 2024

Conversation

ioBrokerTranslator
Copy link
Contributor

Translations update from ioBroker Translation System for ioBroker Adapters/admin.

It also includes following components:

Current translation status:

Weblate translation status

@mcm1957
Copy link
Contributor

mcm1957 commented Feb 19, 2024

@Apollon77

Not sure why this PR has been created. I definitly did NOT change anything at weblate within the last hours. Last action was adding solaredge - three days ago. So I have no clue why weblate lists those old commits again ...

Maybe this is caused by updates done externally (= new text added due to license infos). Those additions change the complete german file due to diffenrences in whitespaces if I'm corre ct reading that commit.

@foxriver76
Copy link
Collaborator

Probably really a problem with the squash merges..

@foxriver76
Copy link
Collaborator

would this maybe help us @Apollon77 https://docs.weblate.org/en/latest/admin/addons.html#squash-git-commits

I have never looked into weblate tbh

@mcm1957
Copy link
Contributor

mcm1957 commented Feb 19, 2024

Looks like that addon will sqash outgoing commits (commits issued from weblate). As this will delete the change log inside the PR I'm not sure wether this will be a desired feature.

@foxriver76
Copy link
Collaborator

hm expected that.. then we would need to activate normal merge commits at least for weblate PRs

@mcm1957
Copy link
Contributor

mcm1957 commented Feb 19, 2024

I'm still not sure wethe rthe squash merge is the main problem.

Currently admin is locke due to merge conflict.
I'n not sure whether the first weblate PR has been merger BEFORE the changes done by license translations.

Maybe the problem is only caused by the fact that admin changes whitespaces in an incompatible way during translation. Normal nopm run translate does not seem to do this. So mayby the admin tool used fpor translations could be adjusted to matching indention and this would fix it too.

@foxriver76
Copy link
Collaborator

okay fyi I also merged a noop commit previously that day

@ioBrokerTranslator ioBrokerTranslator force-pushed the weblate-adapters-admin branch 11 times, most recently from 028db53 to e5c5e7a Compare March 4, 2024 12:00
@mcm1957 @weblate
Translated using Weblate (German)
ec1d90f 
Currently translated at 0.8% (14 of 1566 strings)

Translation: ioBroker Adapters/admin-web
Translate-URL: https://weblate.iobroker.net/projects/adapters/admin-web/de/
@Apollon77 Apollon77 merged commit 1fe4b2f into ioBroker:master Mar 7, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@foxriver76 foxriver76 foxriver76 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ioBrokerTranslator @mcm1957 @foxriver76 @Apollon77