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 i18n and Chinese translation. #345

Merged
merged 2 commits into from
Oct 7, 2020
Merged

Conversation

yihuang
Copy link
Contributor

@yihuang yihuang commented Oct 21, 2018

Not 100% complete though.

@marksweb
Copy link
Collaborator

marksweb commented Oct 6, 2020

@yihuang I'm just going over old PRs and this is quite old now - could you resolve the conflicts on this please & I'll merge it?

@yihuang
Copy link
Contributor Author

yihuang commented Oct 6, 2020

@yihuang I'm just going over old PRs and this is quite old now - could you resolve the conflicts on this please & I'll merge it?

thanks, rebased now.

@marksweb marksweb merged commit c921036 into explorerhq:master Oct 7, 2020
@marksweb marksweb mentioned this pull request Oct 9, 2020
@marksweb marksweb mentioned this pull request Dec 8, 2020
marksweb pushed a commit that referenced this pull request Jul 14, 2021
* Translates expression for duration

Fixes incorrect translation of expression with blocktrans introduced in PR #345.
Django docs show that expressions must be bound to a variable before
being used inside a blocktrans (now blocktranslate since 3.1)

https://docs.djangoproject.com/en/2.2/topics/i18n/translation/#blocktrans-template-tag

* Uses newer format for expression binding

This newer format is easier to read, and available since at least django
1.8.
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.

2 participants