diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 58c031b..30ee111 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -14,14 +14,9 @@ nginx::worker_processes: 8 nginx::error_log: '/var/log/nginx/error.log' nginx::access_log: '/var/log/nginx/access.log' -colab::mailman_archive_path: '/mnt/mailman/archives/' +colab::mailman_archive_path: '/var/lib/mailman/archives/public/' colab::mailman_exclude_lists: - - saberes-divulgacao - - pml - mailman - - lexml-anuncions colab::hostnames: - - colab.interlegis.leg.br - - colab.interlegis.gov.br - localhost colab::solr_project_path: '/home/colab/solr-4.6.1/colab' diff --git a/requirements.txt b/requirements.txt index 714a4dd..d37af2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ diazo==1.0.5 # Dpaste # TODO: Pull-request to mainstream repository -git+https://github.com/interlegis/dpaste +-e git+https://github.com/colab-community/dpaste@i18n/pt_BR#egg=dpaste # Mailman 2 REST API mailman-api==0.2.1 diff --git a/src/accounts/templates/accounts/user_update_form.html b/src/accounts/templates/accounts/user_update_form.html index cffbf12..27304fb 100644 --- a/src/accounts/templates/accounts/user_update_form.html +++ b/src/accounts/templates/accounts/user_update_form.html @@ -185,7 +185,7 @@ $(function() {

- {% blocktrans %}Change SVN and XMPP Client password{% endblocktrans %} + {% trans 'Change Password' %}

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 1560c5a..98019cc 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -192,11 +192,6 @@ LOGGING = { } } -COLAB_FROM_ADDRESS = '"Colab Interlegis" ' -SERVER_EMAIL = COLAB_FROM_ADDRESS -EMAIL_HOST = 'smtp.interlegis.leg.br' -EMAIL_PORT = 25 - TEMPLATE_CONTEXT_PROCESSORS = ( 'django.contrib.auth.context_processors.auth', 'django.core.context_processors.debug', @@ -248,7 +243,7 @@ LOCALE_PATHS = ( AUTH_USER_MODEL = 'accounts.User' -ALLOWED_HOSTS = ['colab.interlegis.leg.br'] +ALLOWED_HOSTS = [] from django.contrib.messages import constants as messages MESSAGE_TAGS = { @@ -291,7 +286,6 @@ REVPROXY_ADD_REMOTE_USER = True # This URL must use SSL in order to keep chat sessions secure CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind' -CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br' CONVERSEJS_ALLOW_CONTACT_REQUESTS = False CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True @@ -309,7 +303,7 @@ DPASTE_EXPIRE_CHOICES = ( ('never', _(u'Never')), ) DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0] -DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis' +DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created from Colab DPaste' DPASTE_DEFAULT_GIST_NAME = 'colab_paste' DPASTE_LEXER_DEFAULT = 'text' diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po index 0d6fb52..0070732 100644 --- a/src/locale/pt_BR/LC_MESSAGES/django.po +++ b/src/locale/pt_BR/LC_MESSAGES/django.po @@ -273,15 +273,6 @@ msgstr "Adicionar outro endereço de e-mail" msgid "Add" msgstr "Adicionar" -#: accounts/templates/accounts/user_update_form.html:188 -msgid "" -"Change SVN and XMPP Client password" -msgstr "" -"Trocar a senha do Repositório e do Mensageiro" - #: accounts/templates/accounts/user_update_form.html:193 msgid "" "This feature is available only for those who need to change the password for some " @@ -1095,8 +1086,8 @@ msgid "RSS - Latest Threads" msgstr "RSS - Últimas Discussões" #: templates/open-data.html:6 -msgid "OpenData - Communities Interlegis" -msgstr "OpenData - Comunidades Interlegis" +msgid "OpenData" +msgstr "OpenData" #: templates/open-data.html:7 msgid "" @@ -1484,9 +1475,6 @@ msgstr "" msgid "Paste it" msgstr "" -#~ msgid "INTERLEGIS COMMUNITIES" -#~ msgstr "COMUNIDADES INTERLEGIS" - #~ msgid "Creative Commons - attribution, non-commercial" #~ msgstr "Creative Commons - atribuição e não-comercial" diff --git a/src/templates/open-data.html b/src/templates/open-data.html index cb86ccb..17d5d74 100644 --- a/src/templates/open-data.html +++ b/src/templates/open-data.html @@ -3,7 +3,7 @@ {% block main-content %}
-

{% trans "OpenData - Communities Interlegis" %}

+

{% trans "OpenData - Communities" %}

{% trans "If you are interested in any other data that is not provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}

{% trans "Retrieving data via API" %}

-- libgit2 0.21.2