Merge branch 'hotfix/v0.12.3' into hotfix_0.12.3_merge
Conflicts: apps/acls/locale/de_DE/LC_MESSAGES/django.mo apps/acls/locale/en/LC_MESSAGES/django.po apps/acls/locale/es/LC_MESSAGES/django.mo apps/acls/locale/es/LC_MESSAGES/django.po apps/acls/locale/it/LC_MESSAGES/django.mo apps/acls/locale/pl/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.po apps/acls/locale/pt_BR/LC_MESSAGES/django.mo apps/acls/locale/pt_BR/LC_MESSAGES/django.po apps/acls/locale/ru/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.po apps/common/locale/en/LC_MESSAGES/django.po apps/common/locale/es/LC_MESSAGES/django.mo apps/common/locale/es/LC_MESSAGES/django.po apps/common/locale/it/LC_MESSAGES/django.mo apps/common/locale/it/LC_MESSAGES/django.po apps/common/locale/pl/LC_MESSAGES/django.mo apps/common/locale/pl/LC_MESSAGES/django.po apps/common/locale/pt/LC_MESSAGES/django.mo apps/common/locale/pt/LC_MESSAGES/django.po apps/common/locale/pt_BR/LC_MESSAGES/django.mo apps/common/locale/pt_BR/LC_MESSAGES/django.po apps/common/locale/ru/LC_MESSAGES/django.mo apps/common/locale/ru/LC_MESSAGES/django.po apps/converter/conf/settings.py apps/converter/locale/de_DE/LC_MESSAGES/django.mo apps/converter/locale/de_DE/LC_MESSAGES/django.po apps/converter/locale/en/LC_MESSAGES/django.po apps/converter/locale/es/LC_MESSAGES/django.mo apps/converter/locale/es/LC_MESSAGES/django.po apps/converter/locale/it/LC_MESSAGES/django.mo apps/converter/locale/it/LC_MESSAGES/django.po apps/converter/locale/pl/LC_MESSAGES/django.mo apps/converter/locale/pl/LC_MESSAGES/django.po apps/converter/locale/pt/LC_MESSAGES/django.mo apps/converter/locale/pt/LC_MESSAGES/django.po apps/converter/locale/pt_BR/LC_MESSAGES/django.mo apps/converter/locale/pt_BR/LC_MESSAGES/django.po apps/converter/locale/ru/LC_MESSAGES/django.mo apps/converter/locale/ru/LC_MESSAGES/django.po apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo apps/django_gpg/locale/en/LC_MESSAGES/django.po apps/django_gpg/locale/es/LC_MESSAGES/django.mo apps/django_gpg/locale/es/LC_MESSAGES/django.po apps/django_gpg/locale/it/LC_MESSAGES/django.mo apps/django_gpg/locale/pl/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.po apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po apps/django_gpg/locale/ru/LC_MESSAGES/django.mo apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo apps/document_comments/locale/en/LC_MESSAGES/django.po apps/document_comments/locale/es/LC_MESSAGES/django.mo apps/document_comments/locale/es/LC_MESSAGES/django.po apps/document_comments/locale/it/LC_MESSAGES/django.mo apps/document_comments/locale/pl/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.po apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po apps/document_comments/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/__init__.py apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po apps/document_indexing/locale/en/LC_MESSAGES/django.po apps/document_indexing/locale/es/LC_MESSAGES/django.mo apps/document_indexing/locale/es/LC_MESSAGES/django.po apps/document_indexing/locale/it/LC_MESSAGES/django.mo apps/document_indexing/locale/it/LC_MESSAGES/django.po apps/document_indexing/locale/pl/LC_MESSAGES/django.mo apps/document_indexing/locale/pl/LC_MESSAGES/django.po apps/document_indexing/locale/pt/LC_MESSAGES/django.mo apps/document_indexing/locale/pt/LC_MESSAGES/django.po apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po apps/document_indexing/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/locale/ru/LC_MESSAGES/django.po apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo apps/document_signatures/locale/en/LC_MESSAGES/django.po apps/document_signatures/locale/es/LC_MESSAGES/django.mo apps/document_signatures/locale/es/LC_MESSAGES/django.po apps/document_signatures/locale/it/LC_MESSAGES/django.mo apps/document_signatures/locale/pl/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.po apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po apps/document_signatures/locale/ru/LC_MESSAGES/django.mo apps/documents/__init__.py apps/documents/forms.py apps/documents/locale/de_DE/LC_MESSAGES/django.mo apps/documents/locale/de_DE/LC_MESSAGES/django.po apps/documents/locale/es/LC_MESSAGES/django.mo apps/documents/locale/es/LC_MESSAGES/django.po apps/documents/locale/it/LC_MESSAGES/django.mo apps/documents/locale/it/LC_MESSAGES/django.po apps/documents/locale/pl/LC_MESSAGES/django.mo apps/documents/locale/pl/LC_MESSAGES/django.po apps/documents/locale/pt/LC_MESSAGES/django.mo apps/documents/locale/pt/LC_MESSAGES/django.po apps/documents/locale/pt_BR/LC_MESSAGES/django.mo apps/documents/locale/pt_BR/LC_MESSAGES/django.po apps/documents/locale/ru/LC_MESSAGES/django.mo apps/documents/locale/ru/LC_MESSAGES/django.po apps/documents/views.py apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo apps/dynamic_search/locale/en/LC_MESSAGES/django.po apps/dynamic_search/locale/es/LC_MESSAGES/django.mo apps/dynamic_search/locale/es/LC_MESSAGES/django.po apps/dynamic_search/locale/it/LC_MESSAGES/django.mo apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.po apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo apps/dynamic_search/models.py apps/folders/locale/de_DE/LC_MESSAGES/django.mo apps/folders/locale/de_DE/LC_MESSAGES/django.po apps/folders/locale/en/LC_MESSAGES/django.po apps/folders/locale/es/LC_MESSAGES/django.mo apps/folders/locale/es/LC_MESSAGES/django.po apps/folders/locale/it/LC_MESSAGES/django.mo apps/folders/locale/pl/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.po apps/folders/locale/pt_BR/LC_MESSAGES/django.mo apps/folders/locale/pt_BR/LC_MESSAGES/django.po apps/folders/locale/ru/LC_MESSAGES/django.mo apps/history/locale/de_DE/LC_MESSAGES/django.mo apps/history/locale/en/LC_MESSAGES/django.po apps/history/locale/es/LC_MESSAGES/django.mo apps/history/locale/es/LC_MESSAGES/django.po apps/history/locale/it/LC_MESSAGES/django.mo apps/history/locale/pl/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.po apps/history/locale/pt_BR/LC_MESSAGES/django.mo apps/history/locale/pt_BR/LC_MESSAGES/django.po apps/history/locale/ru/LC_MESSAGES/django.mo apps/installation/locale/de_DE/LC_MESSAGES/django.mo apps/installation/locale/en/LC_MESSAGES/django.po apps/installation/locale/es/LC_MESSAGES/django.mo apps/installation/locale/es/LC_MESSAGES/django.po apps/installation/locale/it/LC_MESSAGES/django.mo apps/installation/locale/pl/LC_MESSAGES/django.mo apps/installation/locale/pt/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.po apps/installation/locale/ru/LC_MESSAGES/django.mo apps/linking/locale/de_DE/LC_MESSAGES/django.mo apps/linking/locale/en/LC_MESSAGES/django.po apps/linking/locale/es/LC_MESSAGES/django.mo apps/linking/locale/es/LC_MESSAGES/django.po apps/linking/locale/it/LC_MESSAGES/django.mo apps/linking/locale/pl/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.po apps/linking/locale/pt_BR/LC_MESSAGES/django.mo apps/linking/locale/pt_BR/LC_MESSAGES/django.po apps/linking/locale/ru/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.po apps/main/locale/en/LC_MESSAGES/django.po apps/main/locale/es/LC_MESSAGES/django.mo apps/main/locale/es/LC_MESSAGES/django.po apps/main/locale/it/LC_MESSAGES/django.mo apps/main/locale/it/LC_MESSAGES/django.po apps/main/locale/pl/LC_MESSAGES/django.mo apps/main/locale/pl/LC_MESSAGES/django.po apps/main/locale/pt/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.po apps/main/locale/ru/LC_MESSAGES/django.mo apps/main/locale/ru/LC_MESSAGES/django.po apps/metadata/__init__.py apps/metadata/locale/de_DE/LC_MESSAGES/django.mo apps/metadata/locale/en/LC_MESSAGES/django.po apps/metadata/locale/es/LC_MESSAGES/django.mo apps/metadata/locale/es/LC_MESSAGES/django.po apps/metadata/locale/it/LC_MESSAGES/django.mo apps/metadata/locale/pl/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.po apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo apps/metadata/locale/pt_BR/LC_MESSAGES/django.po apps/metadata/locale/ru/LC_MESSAGES/django.mo apps/navigation/locale/de_DE/LC_MESSAGES/django.mo apps/navigation/locale/en/LC_MESSAGES/django.po apps/navigation/locale/es/LC_MESSAGES/django.mo apps/navigation/locale/es/LC_MESSAGES/django.po apps/navigation/locale/it/LC_MESSAGES/django.mo apps/navigation/locale/pl/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.po apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo apps/navigation/locale/pt_BR/LC_MESSAGES/django.po apps/navigation/locale/ru/LC_MESSAGES/django.mo apps/navigation/templatetags/navigation_tags.py apps/ocr/locale/de_DE/LC_MESSAGES/django.mo apps/ocr/locale/en/LC_MESSAGES/django.po apps/ocr/locale/es/LC_MESSAGES/django.mo apps/ocr/locale/es/LC_MESSAGES/django.po apps/ocr/locale/it/LC_MESSAGES/django.mo apps/ocr/locale/pl/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.po apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo apps/ocr/locale/pt_BR/LC_MESSAGES/django.po apps/ocr/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.po apps/permissions/locale/en/LC_MESSAGES/django.po apps/permissions/locale/es/LC_MESSAGES/django.mo apps/permissions/locale/es/LC_MESSAGES/django.po apps/permissions/locale/it/LC_MESSAGES/django.mo apps/permissions/locale/it/LC_MESSAGES/django.po apps/permissions/locale/pl/LC_MESSAGES/django.mo apps/permissions/locale/pl/LC_MESSAGES/django.po apps/permissions/locale/pt/LC_MESSAGES/django.mo apps/permissions/locale/pt/LC_MESSAGES/django.po apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo apps/permissions/locale/pt_BR/LC_MESSAGES/django.po apps/permissions/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/ru/LC_MESSAGES/django.po apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo apps/project_setup/locale/en/LC_MESSAGES/django.po apps/project_setup/locale/es/LC_MESSAGES/django.mo apps/project_setup/locale/es/LC_MESSAGES/django.po apps/project_setup/locale/it/LC_MESSAGES/django.mo apps/project_setup/locale/pl/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.po apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po apps/project_setup/locale/ru/LC_MESSAGES/django.mo apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo apps/project_tools/locale/en/LC_MESSAGES/django.po apps/project_tools/locale/es/LC_MESSAGES/django.mo apps/project_tools/locale/es/LC_MESSAGES/django.po apps/project_tools/locale/it/LC_MESSAGES/django.mo apps/project_tools/locale/pl/LC_MESSAGES/django.mo apps/project_tools/locale/pt/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po apps/project_tools/locale/ru/LC_MESSAGES/django.mo apps/scheduler/locale/de_DE/LC_MESSAGES/django.mo apps/scheduler/locale/en/LC_MESSAGES/django.po apps/scheduler/locale/es/LC_MESSAGES/django.mo apps/scheduler/locale/es/LC_MESSAGES/django.po apps/scheduler/locale/it/LC_MESSAGES/django.mo apps/scheduler/locale/pl/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.po apps/scheduler/locale/pt_BR/LC_MESSAGES/django.mo apps/scheduler/locale/pt_BR/LC_MESSAGES/django.po apps/scheduler/locale/ru/LC_MESSAGES/django.mo apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo apps/smart_settings/locale/en/LC_MESSAGES/django.po apps/smart_settings/locale/es/LC_MESSAGES/django.mo apps/smart_settings/locale/es/LC_MESSAGES/django.po apps/smart_settings/locale/it/LC_MESSAGES/django.mo apps/smart_settings/locale/pl/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.po apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po apps/smart_settings/locale/ru/LC_MESSAGES/django.mo apps/sources/__init__.py apps/sources/locale/de_DE/LC_MESSAGES/django.mo apps/sources/locale/de_DE/LC_MESSAGES/django.po apps/sources/locale/es/LC_MESSAGES/django.mo apps/sources/locale/es/LC_MESSAGES/django.po apps/sources/locale/it/LC_MESSAGES/django.mo apps/sources/locale/it/LC_MESSAGES/django.po apps/sources/locale/pl/LC_MESSAGES/django.mo apps/sources/locale/pl/LC_MESSAGES/django.po apps/sources/locale/pt/LC_MESSAGES/django.mo apps/sources/locale/pt/LC_MESSAGES/django.po apps/sources/locale/pt_BR/LC_MESSAGES/django.mo apps/sources/locale/pt_BR/LC_MESSAGES/django.po apps/sources/locale/ru/LC_MESSAGES/django.mo apps/sources/locale/ru/LC_MESSAGES/django.po apps/sources/views.py apps/tags/locale/de_DE/LC_MESSAGES/django.mo apps/tags/locale/en/LC_MESSAGES/django.po apps/tags/locale/es/LC_MESSAGES/django.mo apps/tags/locale/es/LC_MESSAGES/django.po apps/tags/locale/it/LC_MESSAGES/django.mo apps/tags/locale/pl/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.po apps/tags/locale/pt_BR/LC_MESSAGES/django.mo apps/tags/locale/pt_BR/LC_MESSAGES/django.po apps/tags/locale/ru/LC_MESSAGES/django.mo apps/user_management/locale/de_DE/LC_MESSAGES/django.mo apps/user_management/locale/en/LC_MESSAGES/django.po apps/user_management/locale/es/LC_MESSAGES/django.mo apps/user_management/locale/es/LC_MESSAGES/django.po apps/user_management/locale/it/LC_MESSAGES/django.mo apps/user_management/locale/pl/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.po apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo apps/user_management/locale/pt_BR/LC_MESSAGES/django.po apps/user_management/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.po apps/web_theme/locale/en/LC_MESSAGES/django.po apps/web_theme/locale/es/LC_MESSAGES/django.mo apps/web_theme/locale/es/LC_MESSAGES/django.po apps/web_theme/locale/it/LC_MESSAGES/django.mo apps/web_theme/locale/it/LC_MESSAGES/django.po apps/web_theme/locale/pl/LC_MESSAGES/django.mo apps/web_theme/locale/pl/LC_MESSAGES/django.po apps/web_theme/locale/pt/LC_MESSAGES/django.mo apps/web_theme/locale/pt/LC_MESSAGES/django.po apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po apps/web_theme/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/ru/LC_MESSAGES/django.po misc/compilemessages_all.sh misc/makemessages_all.sh requirements/production.txt settings.py
This commit is contained in:
Roberto Rosario
+41
-38
@@ -13,45 +13,48 @@ from .models import HistoryType, History
|
||||
from .runtime_data import history_types_dict
|
||||
|
||||
|
||||
@transaction.commit_on_success
|
||||
def register_history_type(history_type_dict):
|
||||
namespace = history_type_dict['namespace']
|
||||
name = history_type_dict['name']
|
||||
|
||||
try:
|
||||
history_type_obj, created = HistoryType.objects.get_or_create(
|
||||
namespace=namespace, name=name)
|
||||
history_type_obj.save()
|
||||
except DatabaseError:
|
||||
# Special case for syncdb
|
||||
transaction.rollback()
|
||||
class EventNamespace(object):
|
||||
def __init__(self, name, label):
|
||||
self.name = name
|
||||
self.label = label
|
||||
|
||||
# Runtime
|
||||
history_types_dict.setdefault(namespace, {})
|
||||
history_types_dict[namespace][name] = {
|
||||
'label': history_type_dict['label'],
|
||||
'summary': history_type_dict.get('summary', u''),
|
||||
'details': history_type_dict.get('details', u''),
|
||||
'expressions': history_type_dict.get('expressions', {}),
|
||||
}
|
||||
|
||||
class Event(object):
|
||||
@transaction.commit_on_success
|
||||
def __init__(self, namespace, name, label, summary=None, details=None, expressions=None):
|
||||
self.namespace = namespace
|
||||
self.name = name
|
||||
self.label = label
|
||||
self.summary = summary or ''
|
||||
self.details = details or ''
|
||||
self.expressions = expressions or {}
|
||||
|
||||
try:
|
||||
self.history_type_obj, created = HistoryType.objects.get_or_create(
|
||||
namespace=self.namespace.name, name=self.name)
|
||||
self.history_type_obj.save()
|
||||
history_types_dict.setdefault(self.namespace.name, {})
|
||||
history_types_dict[self.namespace.name][self.name] = self
|
||||
except DatabaseError:
|
||||
# Special case for syncdb
|
||||
transaction.rollback()
|
||||
|
||||
|
||||
def create_history(history_type_dict, source_object=None, data=None):
|
||||
history_type = get_object_or_404(HistoryType, namespace=history_type_dict['namespace'], name=history_type_dict['name'])
|
||||
new_history = History(history_type=history_type)
|
||||
if source_object:
|
||||
new_history.content_object = source_object
|
||||
if data:
|
||||
new_dict = {}
|
||||
for key, value in data.items():
|
||||
new_dict[key] = {}
|
||||
if isinstance(value, models.Model):
|
||||
new_dict[key]['value'] = serializers.serialize('json', [value])
|
||||
elif isinstance(value, models.query.QuerySet):
|
||||
new_dict[key]['value'] = serializers.serialize('json', value)
|
||||
else:
|
||||
new_dict[key]['value'] = json.dumps(value)
|
||||
new_dict[key]['type'] = pickle.dumps(type(value))
|
||||
def commit(self, source_object=None, data=None):
|
||||
new_history = History(history_type=self.history_type_obj)
|
||||
if source_object:
|
||||
new_history.content_object = source_object
|
||||
if data:
|
||||
new_dict = {}
|
||||
for key, value in data.items():
|
||||
new_dict[key] = {}
|
||||
if isinstance(value, models.Model):
|
||||
new_dict[key]['value'] = serializers.serialize('json', [value])
|
||||
elif isinstance(value, models.query.QuerySet):
|
||||
new_dict[key]['value'] = serializers.serialize('json', value)
|
||||
else:
|
||||
new_dict[key]['value'] = json.dumps(value)
|
||||
new_dict[key]['type'] = pickle.dumps(type(value))
|
||||
|
||||
new_history.dictionary = json.dumps(new_dict)
|
||||
new_history.save()
|
||||
new_history.dictionary = json.dumps(new_dict)
|
||||
new_history.save()
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,122 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# <pkoldamov@gmail.com>, 2012.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-07-06 09:08+0000\n"
|
||||
"Last-Translator: koldo <pkoldamov@gmail.com>\n"
|
||||
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: bg\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
|
||||
#: __init__.py:17
|
||||
msgid "date and time"
|
||||
msgstr "дата и време"
|
||||
|
||||
#: __init__.py:21
|
||||
msgid "type"
|
||||
msgstr "тип"
|
||||
|
||||
#: __init__.py:25
|
||||
msgid "summary"
|
||||
msgstr "общо"
|
||||
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "история"
|
||||
|
||||
#: links.py:8
|
||||
msgid "details"
|
||||
msgstr "детайли"
|
||||
|
||||
#: models.py:18
|
||||
msgid "namespace"
|
||||
msgstr "имена"
|
||||
|
||||
#: models.py:19
|
||||
msgid "name"
|
||||
msgstr "име"
|
||||
|
||||
#: models.py:34 models.py:43
|
||||
msgid "history type"
|
||||
msgstr "тип на историята"
|
||||
|
||||
#: models.py:35
|
||||
msgid "history types"
|
||||
msgstr "типове история"
|
||||
|
||||
#: models.py:39
|
||||
msgid "date time"
|
||||
msgstr "дата"
|
||||
|
||||
#: models.py:44
|
||||
msgid "dictionary"
|
||||
msgstr "речник"
|
||||
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "истории"
|
||||
|
||||
#: permissions.py:7
|
||||
msgid "History"
|
||||
msgstr "История"
|
||||
|
||||
#: permissions.py:8
|
||||
msgid "Access the history of an object"
|
||||
msgstr "Вижте историята на обект"
|
||||
|
||||
#: views.py:37
|
||||
msgid "history events"
|
||||
msgstr "събития в историята"
|
||||
|
||||
#: views.py:40
|
||||
msgid "object link"
|
||||
msgstr "връзка към обект"
|
||||
|
||||
#: views.py:68
|
||||
#, python-format
|
||||
msgid "history events for: %s"
|
||||
msgstr "събития в историята за: %s"
|
||||
|
||||
#: views.py:86
|
||||
msgid "Date"
|
||||
msgstr "Дата"
|
||||
|
||||
#: views.py:87
|
||||
msgid "Time"
|
||||
msgstr "Време"
|
||||
|
||||
#: views.py:88
|
||||
msgid "Object"
|
||||
msgstr "Обект"
|
||||
|
||||
#: views.py:89
|
||||
msgid "Event type"
|
||||
msgstr "Тип на събитието"
|
||||
|
||||
#: views.py:90
|
||||
msgid "Additional details"
|
||||
msgstr "Допълнителни детайли"
|
||||
|
||||
#: views.py:90
|
||||
msgid "None"
|
||||
msgstr "Нищо"
|
||||
|
||||
#: views.py:94
|
||||
#, python-format
|
||||
msgid "details for: %s"
|
||||
msgstr "данни за: %s"
|
||||
|
||||
#: views.py:106
|
||||
#, python-format
|
||||
msgid "history events of type: %s"
|
||||
msgstr "събития в историята от тип: %s"
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:12+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
|
||||
@@ -30,7 +30,7 @@ msgstr ""
|
||||
msgid "summary"
|
||||
msgstr "Zusammenfassung"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "Verlauf"
|
||||
|
||||
@@ -62,7 +62,7 @@ msgstr "Datum Uhrzeit"
|
||||
msgid "dictionary"
|
||||
msgstr "Wörterbuch"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "Verläufe"
|
||||
|
||||
|
||||
Binary file not shown.
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-07-01 23:40-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -30,6 +30,7 @@ msgid "summary"
|
||||
msgstr ""
|
||||
|
||||
#: links.py:9 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr ""
|
||||
|
||||
@@ -61,7 +62,7 @@ msgstr ""
|
||||
msgid "dictionary"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -8,10 +8,10 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:24+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: Spanish (Castilian) (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
|
||||
"Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@@ -30,7 +30,7 @@ msgstr "tipo"
|
||||
msgid "summary"
|
||||
msgstr "resumen"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "historial"
|
||||
|
||||
@@ -62,7 +62,7 @@ msgstr "fecha y hora"
|
||||
msgid "dictionary"
|
||||
msgstr "diccionario"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "historiales"
|
||||
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,121 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2011-09-30 04:56+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: fr\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
|
||||
|
||||
#: __init__.py:17
|
||||
msgid "date and time"
|
||||
msgstr ""
|
||||
|
||||
#: __init__.py:21
|
||||
msgid "type"
|
||||
msgstr ""
|
||||
|
||||
#: __init__.py:25
|
||||
msgid "summary"
|
||||
msgstr ""
|
||||
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr ""
|
||||
|
||||
#: links.py:8
|
||||
msgid "details"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:18
|
||||
msgid "namespace"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:19
|
||||
msgid "name"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:34 models.py:43
|
||||
msgid "history type"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:35
|
||||
msgid "history types"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:39
|
||||
msgid "date time"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:44
|
||||
msgid "dictionary"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr ""
|
||||
|
||||
#: permissions.py:7
|
||||
msgid "History"
|
||||
msgstr ""
|
||||
|
||||
#: permissions.py:8
|
||||
msgid "Access the history of an object"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:37
|
||||
msgid "history events"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:40
|
||||
msgid "object link"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:68
|
||||
#, python-format
|
||||
msgid "history events for: %s"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:86
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:87
|
||||
msgid "Time"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:88
|
||||
msgid "Object"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:89
|
||||
msgid "Event type"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:90
|
||||
msgid "Additional details"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:90
|
||||
msgid "None"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:94
|
||||
#, python-format
|
||||
msgid "details for: %s"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:106
|
||||
#, python-format
|
||||
msgid "history events of type: %s"
|
||||
msgstr ""
|
||||
@@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:12+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
|
||||
@@ -31,7 +31,7 @@ msgstr ""
|
||||
msgid "summary"
|
||||
msgstr "sommario"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "versioni"
|
||||
|
||||
@@ -63,7 +63,7 @@ msgstr "data"
|
||||
msgid "dictionary"
|
||||
msgstr "dizionario"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "cronologie"
|
||||
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,121 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2011-09-30 04:56+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: nl_NL\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
|
||||
#: __init__.py:17
|
||||
msgid "date and time"
|
||||
msgstr ""
|
||||
|
||||
#: __init__.py:21
|
||||
msgid "type"
|
||||
msgstr ""
|
||||
|
||||
#: __init__.py:25
|
||||
msgid "summary"
|
||||
msgstr ""
|
||||
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr ""
|
||||
|
||||
#: links.py:8
|
||||
msgid "details"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:18
|
||||
msgid "namespace"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:19
|
||||
msgid "name"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:34 models.py:43
|
||||
msgid "history type"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:35
|
||||
msgid "history types"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:39
|
||||
msgid "date time"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:44
|
||||
msgid "dictionary"
|
||||
msgstr ""
|
||||
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr ""
|
||||
|
||||
#: permissions.py:7
|
||||
msgid "History"
|
||||
msgstr ""
|
||||
|
||||
#: permissions.py:8
|
||||
msgid "Access the history of an object"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:37
|
||||
msgid "history events"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:40
|
||||
msgid "object link"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:68
|
||||
#, python-format
|
||||
msgid "history events for: %s"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:86
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:87
|
||||
msgid "Time"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:88
|
||||
msgid "Object"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:89
|
||||
msgid "Event type"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:90
|
||||
msgid "Additional details"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:90
|
||||
msgid "None"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:94
|
||||
#, python-format
|
||||
msgid "details for: %s"
|
||||
msgstr ""
|
||||
|
||||
#: views.py:106
|
||||
#, python-format
|
||||
msgid "history events of type: %s"
|
||||
msgstr ""
|
||||
@@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:12+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
|
||||
@@ -32,7 +32,7 @@ msgstr ""
|
||||
msgid "summary"
|
||||
msgstr "streszczenie"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "historia"
|
||||
|
||||
@@ -64,7 +64,7 @@ msgstr "data i godzina"
|
||||
msgid "dictionary"
|
||||
msgstr "słownik"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "historie"
|
||||
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
#
|
||||
# Translators:
|
||||
# <dev.emerson@gmail.com>, 2011.
|
||||
# Vítor Figueiró <vfigueiro@gmail.com>, 2012.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:12+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-07-05 19:38+0000\n"
|
||||
"Last-Translator: Vítor Figueiró <vfigueiro@gmail.com>\n"
|
||||
"Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -24,23 +25,23 @@ msgstr "data e hora"
|
||||
|
||||
#: __init__.py:21
|
||||
msgid "type"
|
||||
msgstr ""
|
||||
msgstr "tipo"
|
||||
|
||||
#: __init__.py:25
|
||||
msgid "summary"
|
||||
msgstr "sumário"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "história"
|
||||
msgstr "historial"
|
||||
|
||||
#: links.py:8
|
||||
msgid "details"
|
||||
msgstr ""
|
||||
msgstr "detalhes"
|
||||
|
||||
#: models.py:18
|
||||
msgid "namespace"
|
||||
msgstr "namespace"
|
||||
msgstr "escopo"
|
||||
|
||||
#: models.py:19
|
||||
msgid "name"
|
||||
@@ -48,44 +49,44 @@ msgstr "nome"
|
||||
|
||||
#: models.py:34 models.py:43
|
||||
msgid "history type"
|
||||
msgstr "tipo de história"
|
||||
msgstr "tipo de historial"
|
||||
|
||||
#: models.py:35
|
||||
msgid "history types"
|
||||
msgstr "tipos de história"
|
||||
msgstr "tipos de historial"
|
||||
|
||||
#: models.py:39
|
||||
msgid "date time"
|
||||
msgstr "hora, data"
|
||||
msgstr "data / hora"
|
||||
|
||||
#: models.py:44
|
||||
msgid "dictionary"
|
||||
msgstr "dicionário"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "histórias"
|
||||
msgstr "historiais"
|
||||
|
||||
#: permissions.py:7
|
||||
msgid "History"
|
||||
msgstr "História"
|
||||
msgstr "Historial"
|
||||
|
||||
#: permissions.py:8
|
||||
msgid "Access the history of an object"
|
||||
msgstr ""
|
||||
msgstr "Aceder ao historial de um objeto"
|
||||
|
||||
#: views.py:37
|
||||
msgid "history events"
|
||||
msgstr "eventos da história"
|
||||
msgstr "eventos do historial"
|
||||
|
||||
#: views.py:40
|
||||
msgid "object link"
|
||||
msgstr ""
|
||||
msgstr "ligação de objeto"
|
||||
|
||||
#: views.py:68
|
||||
#, python-format
|
||||
msgid "history events for: %s"
|
||||
msgstr "eventos de história para: %s"
|
||||
msgstr "eventos do historial para: %s"
|
||||
|
||||
#: views.py:86
|
||||
msgid "Date"
|
||||
@@ -93,7 +94,7 @@ msgstr "Data"
|
||||
|
||||
#: views.py:87
|
||||
msgid "Time"
|
||||
msgstr "Tempo"
|
||||
msgstr "Hora"
|
||||
|
||||
#: views.py:88
|
||||
msgid "Object"
|
||||
@@ -105,11 +106,11 @@ msgstr "Tipo de evento"
|
||||
|
||||
#: views.py:90
|
||||
msgid "Additional details"
|
||||
msgstr ""
|
||||
msgstr "Detalhes adicionais"
|
||||
|
||||
#: views.py:90
|
||||
msgid "None"
|
||||
msgstr ""
|
||||
msgstr "Nenhum"
|
||||
|
||||
#: views.py:94
|
||||
#, python-format
|
||||
@@ -119,4 +120,4 @@ msgstr "detalhes para: %s"
|
||||
#: views.py:106
|
||||
#, python-format
|
||||
msgid "history events of type: %s"
|
||||
msgstr ""
|
||||
msgstr "Eventos de historial do tipo: %s"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-07-02 03:31+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mayan-edms/language/pt_BR/)\n"
|
||||
@@ -31,6 +31,7 @@ msgid "summary"
|
||||
msgstr "sumário"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "história"
|
||||
|
||||
@@ -63,6 +64,7 @@ msgid "dictionary"
|
||||
msgstr "dicionário"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "histórias"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"POT-Creation-Date: 2012-07-23 15:36-0400\n"
|
||||
"PO-Revision-Date: 2012-06-17 22:12+0000\n"
|
||||
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
|
||||
"Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/language/ru/)\n"
|
||||
@@ -30,7 +30,7 @@ msgstr ""
|
||||
msgid "summary"
|
||||
msgstr "итого"
|
||||
|
||||
#: links.py:7 models.py:78
|
||||
#: links.py:7 models.py:73
|
||||
msgid "history"
|
||||
msgstr "история"
|
||||
|
||||
@@ -62,7 +62,7 @@ msgstr "дата и время"
|
||||
msgid "dictionary"
|
||||
msgstr "словарь"
|
||||
|
||||
#: models.py:79
|
||||
#: models.py:74
|
||||
msgid "histories"
|
||||
msgstr "истории"
|
||||
|
||||
|
||||
+9
-11
@@ -20,7 +20,7 @@ class HistoryType(models.Model):
|
||||
|
||||
def __unicode__(self):
|
||||
try:
|
||||
return unicode(history_types_dict[self.namespace][self.name]['label'])
|
||||
return unicode(history_types_dict[self.namespace][self.name].label)
|
||||
except KeyError:
|
||||
return u'obsolete history type: %s - %s' % (self.namespace, self.name)
|
||||
|
||||
@@ -36,7 +36,7 @@ class HistoryType(models.Model):
|
||||
|
||||
|
||||
class History(models.Model):
|
||||
datetime = models.DateTimeField(verbose_name=_(u'date time'))
|
||||
datetime = models.DateTimeField(verbose_name=_(u'date time'), default=lambda: datetime.now())
|
||||
content_type = models.ForeignKey(ContentType, blank=True, null=True)
|
||||
object_id = models.PositiveIntegerField(blank=True, null=True)
|
||||
content_object = generic.GenericForeignKey('content_type', 'object_id')
|
||||
@@ -46,22 +46,17 @@ class History(models.Model):
|
||||
def __unicode__(self):
|
||||
return u'%s - %s - %s' % (self.datetime, self.content_object, self.history_type)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.pk:
|
||||
self.datetime = datetime.now()
|
||||
super(History, self).save(*args, **kwargs)
|
||||
|
||||
def get_label(self):
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name]['label']
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].label
|
||||
|
||||
def get_summary(self):
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].get('summary', u'')
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].summary
|
||||
|
||||
def get_details(self):
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].get('details', u'')
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].details
|
||||
|
||||
def get_expressions(self):
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].get('expressions', {})
|
||||
return history_types_dict[self.history_type.namespace][self.history_type.name].expressions
|
||||
|
||||
def get_processed_summary(self):
|
||||
return _process_history_text(self, self.get_summary())
|
||||
@@ -86,10 +81,12 @@ def _process_history_text(history, text):
|
||||
}
|
||||
|
||||
loaded_dictionary = json.loads(history.dictionary)
|
||||
print 'loaded_dictionary', loaded_dictionary
|
||||
|
||||
new_dict = {}
|
||||
for key, values in loaded_dictionary.items():
|
||||
value_type = pickle.loads(str(values['type']))
|
||||
print 'value_type', value_type
|
||||
if isinstance(value_type, models.base.ModelBase):
|
||||
for deserialized in serializers.deserialize('json', values['value']):
|
||||
new_dict[key] = deserialized.object
|
||||
@@ -102,6 +99,7 @@ def _process_history_text(history, text):
|
||||
new_dict[key] = json.loads(values['value'])
|
||||
|
||||
key_values.update(new_dict)
|
||||
print 'key_values', key_values
|
||||
expressions_dict = {}
|
||||
|
||||
for key, value in history.get_expressions().items():
|
||||
|
||||
Reference in New Issue
Block a user