From 6f046b9f4acb98dd3a7951f11e5c52ed4d41e246 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 12:08:54 -0300 Subject: [PATCH] Novo release --- docker-compose.yml | 2 +- sapl/settings.py | 4 ++-- sapl/templates/protocoloadm/protocolo_list.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a06f2c81c..9b4326ce1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ sapldb: ports: - "5532:5432" sapl: - image: interlegis/sapl:3.1.12-BETA + image: interlegis/sapl:3.1.13-BETA volumes: - sapl_data:/var/interlegis/sapl/data - sapl_media:/var/interlegis/sapl/media diff --git a/sapl/settings.py b/sapl/settings.py index 9bb544a15..5e390d6ee 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -205,8 +205,8 @@ LANGUAGES = ( TIME_ZONE = 'America/Sao_Paulo' USE_I18N = True -USE_L10N = False -USE_TZ = False +USE_L10N = True +USE_TZ = True # DATE_FORMAT = 'N j, Y' DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y' diff --git a/sapl/templates/protocoloadm/protocolo_list.html b/sapl/templates/protocoloadm/protocolo_list.html index 4ae55baf0..8abcb0d7c 100644 --- a/sapl/templates/protocoloadm/protocolo_list.html +++ b/sapl/templates/protocoloadm/protocolo_list.html @@ -20,7 +20,7 @@ Etiqueta Individual
Assunto: {{ p.assunto_ementa }}
- Data Protocolo: {{ p.data|date:"d/m/Y" }} - HorĂ¡rio: {{ p.timestamp|date:"H:m:s" }}
+ Data Protocolo: {{ p.data|date:"d/m/Y" }} - HorĂ¡rio: {{ p.hora|date:"H:m:s" }}
Natureza do Processo: {% if p.tipo_processo == 0 %} Administrativo