Download as
Browse Code »

Commit 502e23118dde5f9b7e9e41d25b0b7d4bc4cf94a4

Authored by Sergio Oliveira
1 parent c966c916
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Removing Interlegis references from code

Showing 6 changed files with 8 additions and 31 deletions   Show diff stats
puppet/hieradata/common.yaml
  Diff comments   View file @502e231
@@ -14,14 +14,9 @@ nginx::worker_processes: 8 @@ -14,14 +14,9 @@ nginx::worker_processes: 8
14 nginx::error_log: '/var/log/nginx/error.log' 14 nginx::error_log: '/var/log/nginx/error.log'
15 nginx::access_log: '/var/log/nginx/access.log' 15 nginx::access_log: '/var/log/nginx/access.log'
16 16
17 -colab::mailman_archive_path: '/mnt/mailman/archives/' 17 +colab::mailman_archive_path: '/var/lib/mailman/archives/public/'
18 colab::mailman_exclude_lists: 18 colab::mailman_exclude_lists:
19 - - saberes-divulgacao  
20 - - pml  
21 - mailman 19 - mailman
22 - - lexml-anuncions  
23 colab::hostnames: 20 colab::hostnames:
24 - - colab.interlegis.leg.br  
25 - - colab.interlegis.gov.br  
26 - localhost 21 - localhost
27 colab::solr_project_path: '/home/colab/solr-4.6.1/colab' 22 colab::solr_project_path: '/home/colab/solr-4.6.1/colab'
requirements.txt
  Diff comments   View file @502e231
@@ -47,7 +47,7 @@ diazo==1.0.5 @@ -47,7 +47,7 @@ diazo==1.0.5
47 47
48 # Dpaste 48 # Dpaste
49 # TODO: Pull-request to mainstream repository 49 # 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
51 51
52 # Mailman 2 REST API 52 # Mailman 2 REST API
53 mailman-api==0.2.1 53 mailman-api==0.2.1
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @502e231
@@ -185,7 +185,7 @@ $(function() { @@ -185,7 +185,7 @@ $(function() {
185 <div class="panel panel-default"> 185 <div class="panel panel-default">
186 <div class="panel-heading"> 186 <div class="panel-heading">
187 <h3 class="panel-title"> 187 <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' %}
189 </h3> 189 </h3>
190 </div> 190 </div>
191 <div class="panel-body"> 191 <div class="panel-body">
src/colab/custom_settings.py
  Diff comments   View file @502e231
@@ -192,11 +192,6 @@ LOGGING = { @@ -192,11 +192,6 @@ LOGGING = {
192 } 192 }
193 } 193 }
194 194
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 -  
200 TEMPLATE_CONTEXT_PROCESSORS = ( 195 TEMPLATE_CONTEXT_PROCESSORS = (
201 'django.contrib.auth.context_processors.auth', 196 'django.contrib.auth.context_processors.auth',
202 'django.core.context_processors.debug', 197 'django.core.context_processors.debug',
@@ -248,7 +243,7 @@ LOCALE_PATHS = ( @@ -248,7 +243,7 @@ LOCALE_PATHS = (
248 243
249 AUTH_USER_MODEL = 'accounts.User' 244 AUTH_USER_MODEL = 'accounts.User'
250 245
251 -ALLOWED_HOSTS = ['colab.interlegis.leg.br'] 246 +ALLOWED_HOSTS = []
252 247
253 from django.contrib.messages import constants as messages 248 from django.contrib.messages import constants as messages
254 MESSAGE_TAGS = { 249 MESSAGE_TAGS = {
@@ -291,7 +286,6 @@ REVPROXY_ADD_REMOTE_USER = True @@ -291,7 +286,6 @@ REVPROXY_ADD_REMOTE_USER = True
291 # This URL must use SSL in order to keep chat sessions secure 286 # This URL must use SSL in order to keep chat sessions secure
292 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind' 287 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
293 288
294 -CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'  
295 CONVERSEJS_ALLOW_CONTACT_REQUESTS = False 289 CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
296 CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True 290 CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
297 291
@@ -309,7 +303,7 @@ DPASTE_EXPIRE_CHOICES = ( @@ -309,7 +303,7 @@ DPASTE_EXPIRE_CHOICES = (
309 ('never', _(u'Never')), 303 ('never', _(u'Never')),
310 ) 304 )
311 DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0] 305 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'
313 DPASTE_DEFAULT_GIST_NAME = 'colab_paste' 307 DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
314 DPASTE_LEXER_DEFAULT = 'text' 308 DPASTE_LEXER_DEFAULT = 'text'
315 309
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @502e231
@@ -273,15 +273,6 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot; @@ -273,15 +273,6 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
273 msgid "Add" 273 msgid "Add"
274 msgstr "Adicionar" 274 msgstr "Adicionar"
275 275
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 -  
285 #: accounts/templates/accounts/user_update_form.html:193 276 #: accounts/templates/accounts/user_update_form.html:193
286 msgid "" 277 msgid ""
287 "This feature is available only for those who need to change the password for some " 278 "This feature is available only for those who need to change the password for some "
@@ -1095,8 +1086,8 @@ msgid &quot;RSS - Latest Threads&quot; @@ -1095,8 +1086,8 @@ msgid &quot;RSS - Latest Threads&quot;
1095 msgstr "RSS - Últimas Discussões" 1086 msgstr "RSS - Últimas Discussões"
1096 1087
1097 #: templates/open-data.html:6 1088 #: templates/open-data.html:6
1098 -msgid "OpenData - Communities Interlegis"  
1099 -msgstr "OpenData - Comunidades Interlegis" 1089 +msgid "OpenData"
  1090 +msgstr "OpenData"
1100 1091
1101 #: templates/open-data.html:7 1092 #: templates/open-data.html:7
1102 msgid "" 1093 msgid ""
@@ -1484,9 +1475,6 @@ msgstr &quot;&quot; @@ -1484,9 +1475,6 @@ msgstr &quot;&quot;
1484 msgid "Paste it" 1475 msgid "Paste it"
1485 msgstr "" 1476 msgstr ""
1486 1477
1487 -#~ msgid "INTERLEGIS COMMUNITIES"  
1488 -#~ msgstr "COMUNIDADES INTERLEGIS"  
1489 -  
1490 #~ msgid "Creative Commons - attribution, non-commercial" 1478 #~ msgid "Creative Commons - attribution, non-commercial"
1491 #~ msgstr "Creative Commons - atribuição e não-comercial" 1479 #~ msgstr "Creative Commons - atribuição e não-comercial"
1492 1480
src/templates/open-data.html
  Diff comments   View file @502e231
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 {% block main-content %} 4 {% block main-content %}
5 <div class="col-lg-12"> 5 <div class="col-lg-12">
6 - <h2>{% trans "OpenData - Communities Interlegis" %}</h2> 6 + <h2>{% trans "OpenData - Communities" %}</h2>
7 <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> 7 <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>
8 8
9 <h3>{% trans "Retrieving data via API" %}</h3> 9 <h3>{% trans "Retrieving data via API" %}</h3>