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

Merge duplicated duration plurals and introduce new plurals for selected count #3230

Merged
merged 13 commits into from
Mar 19, 2020

Conversation

B0pol
Copy link
Member

@B0pol B0pol commented Mar 15, 2020

Follows the discussion we had on IRC, and this message

nautilusx and others added 6 commits March 15, 2020 00:36
Currently translated at 100.0% (535 of 535 strings)
Currently translated at 100.0% (535 of 535 strings)
Currently translated at 73.4% (393 of 535 strings)
Currently translated at 100.0% (535 of 535 strings)
Currently translated at 36.4% (195 of 535 strings)
Currently translated at 100.0% (535 of 535 strings)
@wb9688
Copy link
Contributor

wb9688 commented Mar 15, 2020

I'd prefer doing something like <string name="seconds" translatable="false">@string/dynamic_seek_duration_description</string> instead, if that's even possible with plurals.

@Stypox
Copy link
Member

Stypox commented Mar 15, 2020

Why not renaming dynamic_seek_duration_description to just seconds?

@B0pol
Copy link
Member Author

B0pol commented Mar 15, 2020

Because it will cause problems with Weblate

@Stypox
Copy link
Member

Stypox commented Mar 15, 2020

Oh, ok

@B0pol
Copy link
Member Author

B0pol commented Mar 15, 2020

I'd prefer doing something like <string name="seconds" translatable="false">@string/dynamic_seek_duration_description</string> instead.

I tested with subscribers to see what happens, it crashes, it's not possible with plurals. For that case, as we catch ResourcesNotFoundException, it will use English instead.

Copy link
Contributor

@mauriciocolli mauriciocolli left a comment

Choose a reason for hiding this comment

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

Because it will cause problems with Weblate

I think you just have to keep Weblate in sync by pulling the changes from Weblate's git repository and then make your changes on top of that (remove the dynamic_seek_duration_description and rename the translated ones to seconds).

Weblate seems to be configured to automatically follow this repository (pulling changes), so a manual pull from Weblate's side is not necessary (@TobiGr @Stypox do you guys have permissions in Weblate to do that if we need to?).

A optimal way of doing this would involve blocking translation from Weblate, doing the changes, and then unlocking. But I guess translations are pretty spaced right now, we should be fine.

@mauriciocolli
Copy link
Contributor

I missed this: dynamic_seek_duration_description was originally added missing cases, so the translations that followed it are broken.

Maybe we should just delete it and let people submit them correctly? Or will we just let Weblate flag them all out of date? We'd have to wait to release after they are fixed though.

Currently translated at 100.0% (535 of 535 strings)
Currently translated at 100.0% (535 of 535 strings)
@B0pol
Copy link
Member Author

B0pol commented Mar 18, 2020

I missed this: dynamic_seek_duration_description was originally added missing cases, so the translations that followed it are broken.

Maybe we should just delete it and let people submit them correctly? Or will we just let Weblate flag them all out of date? We'd have to wait to release after they are fixed though.

Yeah, you're right because 29edb8c broke it
But it was fixed in merged PR #3195

@B0pol B0pol requested a review from mauriciocolli March 18, 2020 17:43
@mauriciocolli
Copy link
Contributor

The fixes doesn't seem to be happening though, there's multiple languages that are broken yet.

What about the #3230 (review) comment, will you address it or there's something to it?

@B0pol
Copy link
Member Author

B0pol commented Mar 18, 2020

The fixes doesn't seem to be happening though, there's multiple languages that are broken yet.

It's not fixed yet, because it hasn't been synchronised yet, it will be fixed when synchronised.
That's one of the problem with Weblate, the way it works currently is long if problems occur, or even translations, they usually are shipped in the next update (and it can take months).

What about the #3230 (review) comment, will you address it or there's something to it?

A optimal way of doing this would involve blocking translation from Weblate, doing the changes, and then unlocking.

I can't do anything, I don't have weblate rights.

But I guess translations are pretty spaced right now, we should be fine.

Look at history, it's false. More than 800 Strings have been translated in the last 6 days.

@mauriciocolli
Copy link
Contributor

It's not fixed yet, because it hasn't been synchronised yet

🤦 I missed it, sorry. Yet another merge conflict.

Look at history, it's false. More than 800 Strings have been translated in the last 6 days.

I meant that people had stopped translating for +15 hours when I commented, so we could take advantage of that time window.

I can't do anything, I don't have Weblate rights.

I remembered about an old shared API key for Weblate and found it, so now I can issue commands to it.

As Weblate can't push here anymore (was disabled, some people thought that were too many frequent commits) and I think I can't push it to dev directly, we could use this PR to do the merge and fix it once and for all. @TobiGr already merged Weblate into dev 5 days ago (9f91043), the difference now is only something like 8 commits.

It should just follow the repo automatically then (if it doesn't I can trigger a Weblate pull then, but it really should).

Let me know if you're available to do it.

@mauriciocolli mauriciocolli changed the title Delete «seconds» plural string to avoid weblate conflicts Merge duplicated duration plurals and introduce new plurals for selected count Mar 19, 2020
@mauriciocolli mauriciocolli merged commit fb3290e into TeamNewPipe:dev Mar 19, 2020
@B0pol B0pol deleted the seconds branch March 19, 2020 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants