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

Add trimmed to all multilines blocktrans tags #4480

Merged
merged 1 commit into from Aug 22, 2018

Conversation

@humitos
Copy link
Member

@humitos humitos commented Aug 6, 2018

Following what @ewjoachim said in #4471,

Now I think most of these problems are pretty much stemming from the usage of blocktrans without trimmed, and that makes the translation quite more complex to write. There are some other issues, though.

I updated all our templates to add trimmed to all multilines blocktrans tag.

This PR should be merged before #4478 I suppose, so we don't override the resources twice.

@humitos
Copy link
Member Author

@humitos humitos commented Aug 6, 2018

This PR was done by running these commands:

$ cd readthedocs/
$ find . -iname "*.html" -type f -exec sed -i -e 's/blocktrans trimmed/blocktrans/gi' {} \;        

$ find . -iname "*.html" -type f -exec sed -i -e 's/{% blocktrans/{% blocktrans trimmed/gi' {} \;

Loading

@humitos humitos added this to the I18n improvements milestone Aug 6, 2018
@humitos humitos force-pushed the humitos/translations/blocktrans-trimmed branch from a4c7008 to 9e37eca Aug 6, 2018
@humitos humitos requested a review from Aug 6, 2018
@humitos humitos mentioned this pull request Aug 6, 2018
Copy link
Contributor

@ewjoachim ewjoachim left a comment

This is 👌perfect. The .po file must be in a much better state now !

Loading

@ericholscher
Copy link
Member

@ericholscher ericholscher commented Aug 22, 2018

👍

Loading

@ericholscher ericholscher merged commit 0426858 into master Aug 22, 2018
1 check passed
Loading
@stsewd stsewd deleted the humitos/translations/blocktrans-trimmed branch Aug 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants