Skip to content

Commit

Permalink
Merge pull request #188 from buccalon/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
Photonauta 35 authored Dec 12, 2018
2 parents 40a8fb1 + 9ca5d24 commit cef5d4a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- DB_NAME=django
- DB_USER=django
- DB_PASSWORD=django
- DEBUG=True
- DEBUG=False
- [email protected]
- EMAIL_HOST=smtp.server.com
- EMAIL_PORT=587
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DB_NAME=django
DB_USER=django
DB_PASSWORD=django
DEBUG=True
DEBUG=False
EMAIL_HOST=smtp.email.com
EMAIL_PORT=587
[email protected]
Expand Down
15 changes: 8 additions & 7 deletions guia/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
SECRET_KEY = env.str('SECRET_KEY', default="MySecret")

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = env.bool('DEBUG', default=True)
# DEBUG = env.bool('DEBUG', default=False)
DEBUG = True

ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', default=['0.0.0.0', 'localhost', '127.0.0.0'])

Expand All @@ -43,7 +44,7 @@
'reversion',
'reversion_compare',
'import_export',
'debug_toolbar',
# 'debug_toolbar',
'widget_tweaks',
# My apps
'collection',
Expand Down Expand Up @@ -76,8 +77,8 @@
]


if DEBUG:
MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware', ] + MIDDLEWARE
# if DEBUG:
# MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware', ] + MIDDLEWARE

ROOT_URLCONF = 'guia.urls'

Expand Down Expand Up @@ -308,9 +309,9 @@
}


DEBUG_TOOLBAR_CONFIG = {
'SHOW_TOOLBAR_CALLBACK': 'guia.settings.custom_show_toolbar',
}
# DEBUG_TOOLBAR_CONFIG = {
# 'SHOW_TOOLBAR_CALLBACK': 'guia.settings.custom_show_toolbar',
# }

def custom_show_toolbar(request):
return True # Always show toolbar, for example purposes only.
10 changes: 4 additions & 6 deletions locale/pt_BR/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ msgstr "Dados de inventário"
#: collection/admin.py:75 event/admin.py:46 management/admin.py:71
#: publication/admin.py:41
msgid "Other Unstructured Data"
msgstr "Outros Dados não Estruturados"
msgstr "Outros Dados"

#: collection/admin.py:94
msgid "Indentification"
Expand Down Expand Up @@ -87,14 +87,14 @@ msgstr "App Coleções"
#: exhibition/models.py:22 exhibition/models.py:101 person/models.py:24
#: publication/models.py:45
msgid "Institucional Identifier"
msgstr "Idenficador Institucional"
msgstr "ID IMS"

#: collection/models.py:25 collection/models.py:105
#: digitalassetsmanagement/models.py:57 event/models.py:42
#: exhibition/models.py:23 exhibition/models.py:102 person/models.py:25
#: publication/models.py:46
msgid "Institucional ID"
msgstr "ID Institucional"
msgstr "ID IMS"

#: collection/models.py:31
msgid "Container Aggregation Type"
Expand Down Expand Up @@ -190,9 +190,7 @@ msgstr "Alimente com informações sobre as dimensões do agrupamento. "
#: collection/models.py:149 event/models.py:46 exhibition/models.py:42
#: exhibition/models.py:125 management/models.py:116 person/models.py:79
msgid "Choose a start date"
msgstr ""
"Escolha uma data inicial que representa a data de composição da primeira "
"obra presente nessa coleção."
msgstr "Escolha uma data inicial"

#: collection/models.py:150 event/models.py:47 exhibition/models.py:43
#: exhibition/models.py:126 management/models.py:117 person/models.py:80
Expand Down

0 comments on commit cef5d4a

Please sign in to comment.