From b64a35d08c5e2bdebac59ad41ea2a7a768701679 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 19 Aug 2015 03:09:11 -0400 Subject: [PATCH 1/3] Version transifex resources by appending the version number. --- .tx/config | 80 ++++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 47 deletions(-) diff --git a/.tx/config b/.tx/config index 4857ad9556..2e8e3c75c2 100644 --- a/.tx/config +++ b/.tx/config @@ -1,184 +1,170 @@ [main] host = https://www.transifex.com -[mayan-edms.apps-acls] +[mayan-edms.apps-acls-2.0] file_filter = mayan/apps/acls/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/acls/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-appearance] +[mayan-edms.apps-appearance-2.0] file_filter = mayan/apps/appearance/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/appearance/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-authentication] +[mayan-edms.apps-authentication-2.0] file_filter = mayan/apps/authentication/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/authentication/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-checkouts] +[mayan-edms.apps-checkouts-2.0] file_filter = mayan/apps/checkouts/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-common] +[mayan-edms.apps-common-2.0] file_filter = mayan/apps/common/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/common/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-converter] +[mayan-edms.apps-converter-2.0] file_filter = mayan/apps/converter/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/converter/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-django_gpg] +[mayan-edms.apps-django_gpg-2.0] file_filter = mayan/apps/django_gpg/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-documents] +[mayan-edms.apps-documents-2.0] file_filter = mayan/apps/documents/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/documents/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-document_comments] +[mayan-edms.apps-document_comments-2.0] file_filter = mayan/apps/document_comments/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/document_comments/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-document_indexing] +[mayan-edms.apps-document_indexing-2.0] file_filter = mayan/apps/document_indexing/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-document_signatures] +[mayan-edms.apps-document_signatures-2.0] file_filter = mayan/apps/document_signatures/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-document_states] +[mayan-edms.apps-document_states-2.0] file_filter = mayan/apps/document_states/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/document_states/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-dynamic_search] +[mayan-edms.apps-dynamic_search-2.0] file_filter = mayan/apps/dynamic_search/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-events] +[mayan-edms.apps-events-2.0] file_filter = mayan/apps/events/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/events/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-folders] +[mayan-edms.apps-folders-2.0] file_filter = mayan/apps/folders/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/folders/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-installation] +[mayan-edms.apps-installation-2.0] file_filter = mayan/apps/installation/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/installation/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-linking] +[mayan-edms.apps-linking-2.0] file_filter = mayan/apps/linking/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/linking/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-mailer] +[mayan-edms.apps-mailer-2.0] file_filter = mayan/apps/mailer/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/mailer/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-metadata] +[mayan-edms.apps-metadata-2.0] file_filter = mayan/apps/metadata/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/metadata/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-navigation] +[mayan-edms.apps-navigation-2.0] file_filter = mayan/apps/navigation/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/navigation/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-ocr] +[mayan-edms.apps-ocr-2.0] file_filter = mayan/apps/ocr/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/ocr/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-permissions] +[mayan-edms.apps-permissions-2.0] file_filter = mayan/apps/permissions/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/permissions/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-project_setup] -file_filter = mayan/apps/project_setup/locale//LC_MESSAGES/django.po -source_lang = en -source_file = mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po -type = PO - -[mayan-edms.apps-project_tools] -file_filter = mayan/apps/project_tools/locale//LC_MESSAGES/django.po -source_lang = en -source_file = mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po -type = PO - -[mayan-edms.apps-rest_api] +[mayan-edms.apps-rest_api-2.0] file_filter = mayan/apps/rest_api/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/rest_api/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-smart_settings] +[mayan-edms.apps-smart_settings-2.0] file_filter = mayan/apps/smart_settings/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-statistics] -file_filter = mayan/apps/statistics/locale//LC_MESSAGES/django.po -source_lang = en -source_file = mayan/apps/statistics/locale/en/LC_MESSAGES/django.po -type = PO - -[mayan-edms.apps-sources] +[mayan-edms.apps-sources-2.0] file_filter = mayan/apps/sources/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/sources/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-tags] +[mayan-edms.apps-statistics-2.0] +file_filter = mayan/apps/statistics/locale//LC_MESSAGES/django.po +source_lang = en +source_file = mayan/apps/statistics/locale/en/LC_MESSAGES/django.po +type = PO + +[mayan-edms.apps-tags-2.0] file_filter = mayan/apps/tags/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/tags/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-user_management] +[mayan-edms.apps-user_management-2.0] file_filter = mayan/apps/user_management/locale//LC_MESSAGES/django.po source_lang = en source_file = mayan/apps/user_management/locale/en/LC_MESSAGES/django.po type = PO - - From 1b88f3b64114290ec337f4f16781e19b83db3778 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 19 Aug 2015 03:09:55 -0400 Subject: [PATCH 2/3] Update development tools requirement versions. --- requirements/development.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/development.txt b/requirements/development.txt index f272db841b..c27cdc406b 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -4,5 +4,5 @@ Werkzeug==0.10.4 django-extensions==1.5.5 django-rosetta==0.7.6 transifex-client==0.10 -django-debug-toolbar==1.3.0 -ipython==3.1.0 +django-debug-toolbar==1.3.2 +ipython==4.0.0 From 50ba007dd6d22b30071b5e115951ea6efc91d807 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 19 Aug 2015 03:24:04 -0400 Subject: [PATCH 3/3] Remove localtime tag. --- mayan/apps/appearance/templates/appearance/base.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index e54a8bbded..23f1eccab3 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -1,6 +1,5 @@ {% load i18n %} {% load static %} -{% load tz %} {% load compress %} @@ -164,8 +163,6 @@ {% endcompress %} - {% localtime on %} - {% if appearance_type == 'plain' %} {% block content_plain %}{% endblock %} {% else %} @@ -416,6 +413,5 @@ {% block javascript %}{% endblock %} {% endcompress %} - {% endlocaltime %}