Skip to content

I18n more fixes on i18n branch #28

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.

Sign up for GitHub

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

Open
arthurlutz wants to merge 66 commits into
base: master
Choose a base branch
from
Open

I18n more fixes on i18n branch #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
4827417
i18n roundup in templates (mainly blogs/ and root templates)
arthurlutz May 30, 2012
941c492
i18n round up in templates (mainly in registration/)
arthurlutz May 30, 2012
00b25d9
extracted i18n catalogs (and correcting blocktrans)
arthurlutz May 31, 2012
66eec28
first shot of french translation
arthurlutz Jun 1, 2012
3efa7c0
corrections in templates while looking at i18n catalog
arthurlutz Jun 1, 2012
f69d326
add ignore on emacs temporary files
arthurlutz Jun 1, 2012
df79d7f
added i18n wrappers around english strings in scanning/ templates
arthurlutz Jun 1, 2012
5fb62b3
bunch of small fixes found by actually compile the i18n and running a…
arthurlutz Jun 4, 2012
9c74239
more i18n
arthurlutz Jun 5, 2012
730a0be
Merge branch 'master' of https://github.com/yourcelf/btb
arthurlutz Jun 5, 2012
0d6a2b7
more i18n fixes
arthurlutz Jun 5, 2012
8186714
i18n on templactes/moderation
arthurlutz Jun 26, 2012
ff7b2b3
i18n pass on templates/notification
arthurlutz Jun 26, 2012
816a26a
i18n round on templates/profiles
arthurlutz Jun 26, 2012
bab07d7
i18n round on templates/subscriptions
arthurlutz Jun 26, 2012
11042ad
i18n round on templates/about
arthurlutz Jun 26, 2012
969fd51
i18n pass on templates/feeds
arthurlutz Jul 11, 2012
2edd564
i18n round on templates/correspondence
arthurlutz Jul 11, 2012
8243395
i18n round on templates/comments
arthurlutz Jul 11, 2012
af7f814
i18n round on templates/btb
arthurlutz Jul 11, 2012
2f43c01
correction error while trying to extract i18n po
arthurlutz Aug 3, 2012
40a4916
i18n corrections in templates
arthurlutz Aug 6, 2012
1630574
extraction of new i18n strings
arthurlutz Aug 6, 2012
4f13d55
untranslated blocks
arthurlutz Aug 6, 2012
d9cf13b
removing hard coded email adress and using the default from adress st…
arthurlutz Aug 6, 2012
3af3b59
removing hard coded email adress and using the default from adress st…
arthurlutz Aug 6, 2012
b22ea77
some translation of french .po
arthurlutz Aug 6, 2012
91bf075
cleanup
arthurlutz Aug 6, 2012
2d79c58
modifications made to upload to transiflex (msgct -c errors)
arthurlutz Aug 6, 2012
166161b
openned and edited in poedit
arthurlutz Aug 6, 2012
13870b3
i18n pass, mostly bug fixes (by actually running the site)
arthurlutz Sep 7, 2012
22ede7b
more i18n errors corrected
arthurlutz Sep 8, 2012
3124676
small fix in translation
arthurlutz Sep 8, 2012
9fe955b
django-admin makemessages -a
arthurlutz Sep 8, 2012
cefaf0f
Merge https://github.com/yourcelf/btb
arthurlutz Sep 10, 2012
d595727
missed some conflicts that were unresolved
arthurlutz Sep 11, 2012
6ec6eac
a few translations in po file
arthurlutz Sep 11, 2012
929b999
s/info@betweenthebars.org/{{ site.email }}/
arthurlutz Sep 11, 2012
6ddf01f
replaced a few "Between the bars" by {{ site.name }}
arthurlutz Sep 11, 2012
b5ad5cd
various fixes in templates & removal of hard coded adresses
arthurlutz Sep 14, 2012
bcaf713
fix i18n load in tex files
arthurlutz Sep 14, 2012
4216229
more i18n fixes in templates (including tex files)
arthurlutz Nov 9, 2012
ac6023c
add pytz to requirements.txt
arthurlutz Nov 9, 2012
8cc41d0
[i18n] django manage.py makemessages update
arthurlutz Nov 9, 2012
bca098a
A few fixes to translation bits
yourcelf Nov 13, 2012
a26c8bf
Correct pluralization syntax
yourcelf Nov 13, 2012
b6e518e
Merge https://github.com/yourcelf/btb
arthurlutz Jan 28, 2013
f395786
Merge https://github.com/yourcelf/btb (resolve conflicts)
arthurlutz May 9, 2014
1ccb88e
Merge github.com:arthurlutz/btb
arthurlutz May 9, 2014
40637d6
[i18n] more translation strings and a few fixes
arthurlutz May 9, 2014
df6b07d
[i18n] email_body fix for i18n
arthurlutz May 9, 2014
11afd19
[i18n] python manage.py makemessage -l fr/en
arthurlutz May 9, 2014
2a1b176
[i18n] integrated translations collaborated through transifex
arthurlutz May 9, 2014
c468cb7
[i18n] missing python string remplacement in .po
arthurlutz May 9, 2014
6cb740b
[i18n] more missing {% trans %} and {% blocktrans %} added
arthurlutz May 22, 2014
a30db26
[i18n] django makemessages -l fr
arthurlutz May 22, 2014
86e87a0
Merge Django 1.6; fix blocktrans and site.email
yourcelf Oct 21, 2014
c0b2c8d
Convert tabs to spaces
yourcelf Oct 21, 2014
19ec4cd
Fix tags inside {% trans %} tags
yourcelf Oct 21, 2014
193ae0c
Add site name back to ToU
yourcelf Oct 22, 2014
fc40375
[i18n] close a missing blocktrans and add more translations
arthurlutz Nov 11, 2014
ba3f659
[i18n] updated version from transifex
arthurlutz Nov 11, 2014
816b3a2
[i18n] [templates] fixed two endblocktrans found using makemessage
arthurlutz Nov 11, 2014
ba324f7
[i18n] makemessage extraction
arthurlutz Nov 11, 2014
5c2be34
[i18n] fix in .po to make transifex happy
arthurlutz Nov 11, 2014
5f76dd4
[i18n] Replace atomic translations with blocktrans
arthurlutz Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Editor trash/compiled files
*.pyc
*~
*.swp
.sass-cache
.DS_Store*
doc_data.txt
*.mo

# Local settings
settings.py
Expand Down
13 changes: 13 additions & 0 deletions scanblog/TODO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
* make piwik optionnal & configurable template analytics.html

* replace &#9997 by css class and css display

* optional sharing buttons

* Replace atomic translations with blocktrans in the following:
- scanblog/templates/blogs/_sharing_buttons.html
- scanblog/templates/blogs/all_comments_list.html
- scanblog/templates/blogs/delete_post.html
- scanblog/templates/blogs/tag_post_list.html
- scanblog/templates/btb/admin-content-flagged.txt
- scanblog/templates/comments/unremove_comment.html
1 change: 1 addition & 0 deletions scanblog/btb/context_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

def site(request):
site = Site.objects.get_current()
site.email = settings.SITE_EMAIL
return {
'site': site,
'scheme': 'http://',
Expand Down
Loading