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

Fix #6821: i18n: some translation messages has been broken #6883

Merged
merged 2 commits into from Dec 2, 2019

Conversation

tk0miya
Copy link
Member

@tk0miya tk0miya commented Dec 1, 2019

@codecov
Copy link

codecov bot commented Dec 1, 2019

Codecov Report

Merging #6883 into 2.2.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##            2.2.2    #6883   +/-   ##
=======================================
  Coverage   83.74%   83.74%           
=======================================
  Files         271      271           
  Lines       41022    41022           
  Branches     6003     6003           
=======================================
  Hits        34355    34355           
  Misses       5339     5339           
  Partials     1328     1328

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3bc16b0...7f4c1d9. Read the comment docs.

Copy link
Contributor

@jfbu jfbu left a comment

Choose a reason for hiding this comment

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

LGTM ;-) I checked French and even Chinese 😜

Copy link
Contributor

@jfbu jfbu left a comment

Choose a reason for hiding this comment

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

I fixed a typo upstream at transifex for French, can you pull it?

Side note: I noticed some strings do not get translated because the catalog files are (afaik) for 2.0 branch and this is 2.2.2 branch. (this is the case for __('generating indices') in sphinx.builders.html). This looks unavoidable for 2.2.2.

(regarding French I prefer the full import as it has many language fixes compared to only cherry-picking the sole Sphinx breaking strings, even though some translation work will remain invisible before 2.3.0 release, thus I am quite happy with tx pull -a -f)

@tk0miya
Copy link
Member Author

tk0miya commented Dec 2, 2019

updated. I will merge this after CI passed.

@tk0miya tk0miya merged commit 73f23f4 into sphinx-doc:2.2.2 Dec 2, 2019
@tk0miya tk0miya deleted the 6821_update_translations branch December 2, 2019 15:55
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants