Merge branch 'develop' of https://github.com/metalpriest/django-rosetta into pull-request-39

This commit is contained in:
Marco Bonetti 2012-06-07 14:37:08 +02:00
commit 9b3359002c
2 changed files with 13 additions and 3 deletions

4
.gitignore vendored
View file

@ -5,4 +5,6 @@ dist
.svnignore
.svnexternals
build
rosetta/locale/xx/LC_MESSAGES/*.mo
rosetta/locale/xx/LC_MESSAGES/*.mo
/.settings
/.project

View file

@ -57,7 +57,11 @@ def home(request):
if rosetta_i18n_write:
rosetta_i18n_pofile = pofile(rosetta_i18n_fn, wrapwidth=rosetta_settings.POFILE_WRAP_WIDTH)
for entry in rosetta_i18n_pofile:
entry.md5hash = hashlib.md5(entry.msgid.encode("utf8") + entry.msgstr.encode("utf8")).hexdigest()
entry.md5hash = hashlib.md5(
entry.msgid.encode("utf8") +
entry.msgstr.encode("utf8") +
(entry.msgctxt and entry.msgctxt.encode("utf8") or "")
).hexdigest()
else:
rosetta_i18n_pofile = storage.get('rosetta_i18n_pofile')
@ -348,7 +352,11 @@ def lang_sel(request, langid, idx):
storage.set('rosetta_i18n_fn', file_)
po = pofile(file_)
for entry in po:
entry.md5hash = hashlib.md5(entry.msgid.encode("utf8") + entry.msgstr.encode("utf8")).hexdigest()
entry.md5hash = hashlib.md5(
entry.msgid.encode("utf8") +
entry.msgstr.encode("utf8") +
(entry.msgctxt and entry.msgctxt.encode("utf8") or "")
).hexdigest()
storage.set('rosetta_i18n_pofile', po)
try: