Commit graph

66 commits

Author SHA1 Message Date
Virgil Dupras
7a200ece7c Merge commit '4146da3287f71ccec5a6713e7e75cb346e805bce' into reflang
There was a conflict with rosetta/views.py, but it was easily resolved.
2013-01-29 15:53:05 -05:00
Virgil Dupras
1a13a890b6 Merge commit '4067e069bd680d67aea10afbd841113f6a7f3fd3' into reflang
That's (I think), the last commit for v0.6.7 (versionning in this
project is hazy).
2013-01-29 15:47:27 -05:00
Virgil Dupras
8f8429d27d Merge commit '329e8c693bc90b667f6f09235eec728dffc62f87' into reflang.
That commit if v0.6.6.
2013-01-29 15:41:17 -05:00
Virgil Dupras
3ebed99ac2 Extracted the "reflang" feature and applied it on its original commit.
I extracted the minimal feature set I could so that integration with newer
upstream commits are easier.
2013-01-29 15:35:11 -05:00
Marco Bonetti
4146da3287 rosetta 0.6.8 with pluggable storage classes, fixes Issue 38 2012-06-07 13:46:16 +02:00
Marco Bonetti
4bf26e1c01 Merge branch 'develop' of github.com:mbi/django-rosetta into storages 2012-06-07 10:18:27 +02:00
Marco Bonetti
516fbbe76c Merge pull request #41 from henkvos/develop
change to def proces to display the actual po file that contains the error
2012-05-30 06:08:45 -07:00
Henk Vos
b10e37ebeb change to def proces to display the actual po file that contains the error on top of the line number 2012-05-30 14:55:26 +02:00
Marco Bonetti
cf9daaf0d1 storages seem to work, more testing needed 2012-05-27 22:21:12 +02:00
Marco Bonetti
3185d99bf7 storages, wip 2012-05-23 11:45:04 +02:00
Marco Bonetti
72452dd4b3 storages, wip 2012-05-23 11:44:15 +02:00
Marco Bonetti
4067e069bd Merge branch 'develop' of github.com:mbi/django-rosetta into develop
Conflicts:
	CHANGES
	rosetta/locale/fr/LC_MESSAGES/django.po
2012-04-15 09:04:56 +02:00
Marco Bonetti
a73243f30b added a test project to run tests 2012-04-15 09:02:06 +02:00
Marco Bonetti
e1c0fc1b18 Update CHANGES 2012-04-05 16:40:11 +03:00
Marco Bonetti
b70ef4d4ca Merge pull request #36 from BertrandBordage/develop
Update french translation. Thanks, @BertrandBordage
2012-04-05 06:39:09 -07:00
Bertrand Bordage
ae14db8588 Update french translation. 2012-04-05 15:33:45 +02:00
Marco Bonetti
7881389012 Merged @sleepyjames' PR that fixes an error when pofile save path contains '.po' in the path 2012-03-31 09:13:25 +02:00
Marco Bonetti
7ffc385e72 Merge branch 'master' of https://github.com/sleepyjames/django-rosetta into pull-request-29 2012-03-31 09:09:59 +02:00
Marco Bonetti
ad26f566fe Merge branch 'develop' of github.com:mbi/django-rosetta into develop 2012-03-29 17:21:41 +02:00
Marco Bonetti
d05eece0d4 Merged @rory's PR to correcty handle plural strings that have a leading/trailing newline (Issue #34) 2012-03-29 17:21:09 +02:00
Marco Bonetti
1c143932a5 Update README.rst 2012-03-27 18:23:47 +03:00
Marco Bonetti
329e8c693b Version 0.6.6, Django 1.4 compatibility 2012-03-27 17:08:48 +02:00
Marco Bonetti
7c3a8bb159 initial django 1.4 support. Fixes issue 30. 2012-03-14 09:18:56 +01:00
James White
0cc88501c8 Re-instance .po file save. 2012-03-09 12:27:02 +00:00
James White
10f7c5210b Fix .mo save if path contains the '.mo' string 2012-03-07 13:38:02 +00:00
Marco Bonetti
c18e891ca0 Merged Kit Sunde's PR to better handle Bing API callbacks, and support for composite locales 2012-02-26 23:25:04 +01:00
Kit Sunde
b34d24915b Fixes the translation callback not being called and allow for suggestions on "zh-tw" and "zh-cn". 2012-02-25 05:47:43 +08:00
Kit Sunde
9fbf953216 Show bing suggest errors. 2012-02-24 18:37:21 +08:00
Marco Bonetti
5593635e1e updated changes file 2012-01-28 09:17:00 +01:00
Marco Bonetti
e89c42b48c moved CHANGES file 2012-01-28 09:03:52 +01:00
Marco Bonetti
f7872d5598 Merge branch 'pull-request-23' into develop 2012-01-28 09:00:30 +01:00
Marco Bonetti
86124b8afd Merge branch 'master' into develop 2012-01-28 08:59:15 +01:00
Marco Bonetti
32f7a1f0a1 Fix for issue #24. Support for --nowrap in the edited Po file 2012-01-28 08:58:41 +01:00
Nick Pope
b663129902 Prevent context issue w/ django.contrib.messages
Due to the situation we have at work, I encounter a problem whereby the
variable 'messages' in the template render context is overwritten by the
variable 'messages' provided by django.contrib.messages which is passed
in via a RequestContext.

This commit simply renames 'messages' to 'rosetta_messages' to avoid
this problem.
2012-01-25 22:44:50 +00:00
Marco Bonetti
22414cacd7 Corrected a misspelled setting. Fixes #20 2012-01-23 16:49:28 +01:00
Marco Bonetti
64df1d79c7 version bump 2012-01-16 10:36:58 +01:00
Marco Bonetti
33c1ae6078 merged PR 19, slightly modified to fix a failing test (we want to recheck the setting on each decorator call) 2012-01-16 10:32:35 +01:00
Thomas W
dd304810c6 Adds a flag that allows users to disable authentication requirements for Rosetta views. 2012-01-16 00:14:08 -08:00
Marco Bonetti
2324e8fea0 defaults 2012-01-05 16:04:31 +01:00
Marco Bonetti
cc1798bd5f some documentation about the configuration options 2012-01-05 16:00:23 +01:00
Marco Bonetti
4e6e19093d 0.6.3: use the Bing translation service instead of Google's 2012-01-05 15:38:46 +01:00
Marco Bonetti
aeb5f7c315 Merge pull request #8 from dboczek/develop
thanks.
2011-09-21 03:14:25 -07:00
Daniel Boczek
e68b9af59c Comments for translators are considered safe in template so developer can add html (fe. links) in them and they display correctly in browser. 2011-08-31 11:27:46 +03:00
Marco Bonetti
eca151e974 bumbed the requirements to Django 1.2, added a fix to handle the tests under Django 1.2 2011-08-27 17:20:23 +02:00
Marco Bonetti
acbd1ceac0 fix for (GoogleCode) issues 112 - Sublanguages & invalid translation language pair 2011-08-27 16:51:33 +02:00
Jarek Śmiejczak
5ffd64915c fixing test_10_issue_79_num_entries to use proper locale formatting of float 2011-08-12 13:28:46 +02:00
Marco Bonetti
4199110871 updated ignores 2011-06-30 14:48:48 +02:00
Marco Bonetti
0a75bf00aa merge of pull request 1, slightly edited 2011-06-30 14:45:40 +02:00
Juan Pablo Martínez
4c23b74a56 add button to translate all rows and unfuzzy 2011-06-25 15:59:56 -03:00
Juan Pablo Martínez
646492a040 add ignores 2011-06-25 15:42:56 -03:00