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

Use correct plural implementation for upload estimation #3251

Merged
merged 1 commit into from
Feb 9, 2017

Conversation

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen added 3. to review Waiting for reviews bug labels Jan 25, 2017
@nickvergessen nickvergessen added this to the Nextcloud 11.0.2 milestone Jan 25, 2017
@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @butonic, @luckydonald and @vincchan to be potential reviewers.

@MorrisJobke
Copy link
Member

MorrisJobke commented Jan 26, 2017

This is fixed on master?

@nickvergessen
Copy link
Member Author

Master uses completly different code it seems, at least I couldn't find the strings.

@LukasReschke LukasReschke merged commit 201055b into stable11 Feb 9, 2017
@LukasReschke LukasReschke deleted the fix-upload-estimation-translation branch February 9, 2017 13:45
@rakekniven
Copy link
Member

@LukasReschke Old code is still present at transifex.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91001440

@MorrisJobke
Copy link
Member

@LukasReschke Old code is still present at transifex.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91001440

Yes, because we combine stable10, stable11 and master. But maybe we should remove stable10 form the list now, as it should be translated quite well now.

@rakekniven
Copy link
Member

Ah, ok. Would you enlighten me on how to do this? Transifex magic?

@MorrisJobke
Copy link
Member

Ah, ok. Would you enlighten me on how to do this? Transifex magic?

Not that much magic: https://github.com/nextcloud/docker-ci/blob/master/translations/handleTranslations.sh#L14-L36

We iterate over "stable10 stable11 master" and extract the l10n files, concatenate them with msgcat (which does de-duplication) and use this as resource for transifex.

And the reverse works similar: fetch the translations and then play in the translation into stable10 stable11 and master git branches: https://github.com/nextcloud/docker-ci/blob/master/translations/handleTranslations.sh#L51-L53

@MorrisJobke
Copy link
Member

@LukasReschke Old code is still present at transifex.

Next night they will be gone nextcloud/docker-ci@87ab8c1 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants