Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCode Raguet <ignacio.code@gmail.com>2013-07-23 17:30:46 (GMT)
committer Code Raguet <ignacio.code@gmail.com>2013-07-23 17:30:46 (GMT)
commitc589c5ce8cf8a691689e6bdfa3018cd7fa44efd1 (patch)
tree6cc585ae988a791bf639a25b722f04fe44533d8f
parent9157b35840e783d8d1119f2066d228c4fa5465d7 (diff)
Rename "Sociólogo" a "Investigador". Issue #3820
-rw-r--r--webapp/pollster/templates/pollster-assigned-polls.html2
-rw-r--r--webapp/sociologist/templates/sociologist-form.html4
-rw-r--r--webapp/sociologist/views.py4
-rw-r--r--webapp/webapp/templates/base-main.html2
4 files changed, 6 insertions, 6 deletions
diff --git a/webapp/pollster/templates/pollster-assigned-polls.html b/webapp/pollster/templates/pollster-assigned-polls.html
index 4940273..d06bf28 100644
--- a/webapp/pollster/templates/pollster-assigned-polls.html
+++ b/webapp/pollster/templates/pollster-assigned-polls.html
@@ -54,7 +54,7 @@
{% for poll in closed_polls %}
<tr>
<td>{{ poll.name|capfirst }}</td>
- <td>{% if poll.get_result %}Existen resultados para esta encuesta y pueden ser visualizados por los sociologos.{% else %}No tiene resultados.{% endif %}</td>
+ <td>{% if poll.get_result %}Existen resultados para esta encuesta y pueden ser visualizados por los investigadores.{% else %}No tiene resultados.{% endif %}</td>
<td>
<a class="btn" href="{% url pollsters:poll_download poll_id=poll.id %}">
<i class="icon-download-alt"></i>&nbsp;Descargar encuesta
diff --git a/webapp/sociologist/templates/sociologist-form.html b/webapp/sociologist/templates/sociologist-form.html
index 1625d3d..edf6b8c 100644
--- a/webapp/sociologist/templates/sociologist-form.html
+++ b/webapp/sociologist/templates/sociologist-form.html
@@ -1,11 +1,11 @@
{% extends "base-poll.html" %}
-{% block title %}Creaci&oacute;n de sociologo{% endblock %}
+{% block title %}Creaci&oacute;n de investigador{% endblock %}
{% block main_container %}
<div class="center">
- <h2>Creaci&oacute;n de sociologo</h2>
+ <h2>Creaci&oacute;n de investigador</h2>
</div>
<form id="pollster_form" class="form-inline" action="" method="post">{% csrf_token %}
diff --git a/webapp/sociologist/views.py b/webapp/sociologist/views.py
index 64253c5..ba91440 100644
--- a/webapp/sociologist/views.py
+++ b/webapp/sociologist/views.py
@@ -219,10 +219,10 @@ class SociologistFormView(FormView):
try:
form.save()
except Exception:
- msg = u'El sociologo no se pudo guardar.'
+ msg = u'El investigador no se pudo guardar.'
messages.add_message(self.request, messages.ERROR, msg)
else:
- msg = u'El sociologo fué guardado con éxito.'
+ msg = u'El investigador fué guardado con éxito.'
messages.add_message(self.request, messages.SUCCESS, msg)
return HttpResponseRedirect(reverse('index'))
diff --git a/webapp/webapp/templates/base-main.html b/webapp/webapp/templates/base-main.html
index e83e360..e0b3cbb 100644
--- a/webapp/webapp/templates/base-main.html
+++ b/webapp/webapp/templates/base-main.html
@@ -91,7 +91,7 @@
<li class="divider-vertical"></li>
{% url sociologist:sociologist_form as sociologist_form_url %}
<li class="{% if request.path == sociologist_form_url %}active{% endif %}">
- <a href="{{ sociologist_form_url }}"><i class="icon-white icon-plus"></i>&nbsp;Nuevo sociologo</a>
+ <a href="{{ sociologist_form_url }}"><i class="icon-white icon-plus"></i>&nbsp;Nuevo investigador</a>
</li>
{% endif %}