Skip to content

Commit 502e231

Browse files
committed
Removing Interlegis references from code
1 parent c966c91 commit 502e231

6 files changed

Lines changed: 8 additions & 31 deletions

File tree

puppet/hieradata/common.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ nginx::worker_processes: 8
1414
nginx::error_log: '/var/log/nginx/error.log'
1515
nginx::access_log: '/var/log/nginx/access.log'
1616

17-
colab::mailman_archive_path: '/mnt/mailman/archives/'
17+
colab::mailman_archive_path: '/var/lib/mailman/archives/public/'
1818
colab::mailman_exclude_lists:
19-
- saberes-divulgacao
20-
- pml
2119
- mailman
22-
- lexml-anuncions
2320
colab::hostnames:
24-
- colab.interlegis.leg.br
25-
- colab.interlegis.gov.br
2621
- localhost
2722
colab::solr_project_path: '/home/colab/solr-4.6.1/colab'

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ diazo==1.0.5
4747

4848
# Dpaste
4949
# TODO: Pull-request to mainstream repository
50-
git+https://github.com/interlegis/dpaste
50+
-e git+https://github.com/colab-community/dpaste@i18n/pt_BR#egg=dpaste
5151

5252
# Mailman 2 REST API
5353
mailman-api==0.2.1

src/accounts/templates/accounts/user_update_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h3 class="panel-title">{% trans "Emails" %}</h3>
185185
<div class="panel panel-default">
186186
<div class="panel-heading">
187187
<h3 class="panel-title">
188-
{% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
188+
{% trans 'Change Password' %}
189189
</h3>
190190
</div>
191191
<div class="panel-body">

src/colab/custom_settings.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,6 @@
192192
}
193193
}
194194

195-
COLAB_FROM_ADDRESS = '"Colab Interlegis" <noreply@interlegis.leg.br>'
196-
SERVER_EMAIL = COLAB_FROM_ADDRESS
197-
EMAIL_HOST = 'smtp.interlegis.leg.br'
198-
EMAIL_PORT = 25
199-
200195
TEMPLATE_CONTEXT_PROCESSORS = (
201196
'django.contrib.auth.context_processors.auth',
202197
'django.core.context_processors.debug',
@@ -248,7 +243,7 @@
248243

249244
AUTH_USER_MODEL = 'accounts.User'
250245

251-
ALLOWED_HOSTS = ['colab.interlegis.leg.br']
246+
ALLOWED_HOSTS = []
252247

253248
from django.contrib.messages import constants as messages
254249
MESSAGE_TAGS = {
@@ -291,7 +286,6 @@
291286
# This URL must use SSL in order to keep chat sessions secure
292287
CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
293288

294-
CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
295289
CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
296290
CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
297291

@@ -309,7 +303,7 @@
309303
('never', _(u'Never')),
310304
)
311305
DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
312-
DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
306+
DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created from Colab DPaste'
313307
DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
314308
DPASTE_LEXER_DEFAULT = 'text'
315309

src/locale/pt_BR/LC_MESSAGES/django.po

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,6 @@ msgstr "Adicionar outro endereço de e-mail"
273273
msgid "Add"
274274
msgstr "Adicionar"
275275

276-
#: accounts/templates/accounts/user_update_form.html:188
277-
msgid ""
278-
"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
279-
"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
280-
msgstr ""
281-
"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
282-
"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
283-
"\">Mensageiro</a>"
284-
285276
#: accounts/templates/accounts/user_update_form.html:193
286277
msgid ""
287278
"This feature is available only for those who need to change the password for some "
@@ -1095,8 +1086,8 @@ msgid "RSS - Latest Threads"
10951086
msgstr "RSS - Últimas Discussões"
10961087

10971088
#: templates/open-data.html:6
1098-
msgid "OpenData - Communities Interlegis"
1099-
msgstr "OpenData - Comunidades Interlegis"
1089+
msgid "OpenData"
1090+
msgstr "OpenData"
11001091

11011092
#: templates/open-data.html:7
11021093
msgid ""
@@ -1484,9 +1475,6 @@ msgstr ""
14841475
msgid "Paste it"
14851476
msgstr ""
14861477

1487-
#~ msgid "INTERLEGIS COMMUNITIES"
1488-
#~ msgstr "COMUNIDADES INTERLEGIS"
1489-
14901478
#~ msgid "Creative Commons - attribution, non-commercial"
14911479
#~ msgstr "Creative Commons - atribuição e não-comercial"
14921480

src/templates/open-data.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% block main-content %}
55
<div class="col-lg-12">
6-
<h2>{% trans "OpenData - Communities Interlegis" %}</h2>
6+
<h2>{% trans "OpenData - Communities" %}</h2>
77
<p>{% 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)." %}</p>
88

99
<h3>{% trans "Retrieving data via API" %}</h3>

0 commit comments

Comments
 (0)