Commit 284406c4 authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

More translation fixes plus a cleanup of error.html file

parent 8943e7d7
......@@ -68,7 +68,7 @@ def group_routes(request):
peer = request.user.get_profile().peer
except UserProfile.DoesNotExist:
error = "User <strong>%s</strong> does not belong to any peer or organization. It is not possible to create new firewall rules.<br>Please contact Helpdesk to resolve this issue" % request.user.username
return render_to_response('error.html', {'error': error})
return render_to_response('error.html', {'error': error}, context_instance=RequestContext(request))
if peer:
peer_members = UserProfile.objects.filter(peer=peer)
users = [prof.user for prof in peer_members]
......@@ -271,7 +271,7 @@ def user_profile(request):
peers = Peer.objects.all()
except UserProfile.DoesNotExist:
error = "User <strong>%s</strong> does not belong to any peer or organization. It is not possible to create new firewall rules.<br>Please contact Helpdesk to resolve this issue" % user.username
return render_to_response('error.html', {'error': error})
return render_to_response('error.html', {'error': error}, context_instance=RequestContext(request))
return render_to_response('profile.html', {'user': user, 'peers':peers},
context_instance=RequestContext(request))
......@@ -327,7 +327,7 @@ def user_login(request):
up = UserProfile.objects.get_or_create(user=user,peer=peer)
except:
error = _("Your organization's domain name does not match our peers' domain names<br>Please contact Helpdesk to resolve this issue")
return render_to_response('error.html', {'error': error})
return render_to_response('error.html', {'error': error}, context_instance=RequestContext(request))
if not user_exists:
user_activation_notify(user)
if user.is_active:
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-04 12:44+0300\n"
"POT-Creation-Date: 2012-05-04 14:25+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leonidas Poulopoulos <leopoul@grnet.gr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -237,7 +237,7 @@ msgid ""
"Your organization's domain name does not match our peers' domain "
"names<br>Please contact Helpdesk to resolve this issue"
msgstr ""
"Το domain name του οργανισμού σας δε βρέθηκε στ βάση φορέων μας.<br>Παρακαλώ "
"Το domain name του οργανισμού σας δε βρέθηκε στη βάση φορέων μας.<br>Παρακαλώ "
"επικοινωνήστε με το Helpdesk για τη διευθέτηση του προβλήματος"
#: flowspec/views.py:337
......@@ -356,55 +356,61 @@ msgstr "Εφαρμογή"
msgid "Add new port"
msgstr "Νέα port"
#: templates/base.html:41 templates/error.html:39 templates/welcome.html:7
#: templates/base.html:41 templates/welcome.html:7
msgid "Welcome"
msgstr "Καλωσήρθατε"
#: templates/base.html:55 templates/error.html:42 templates/profile.html:4
#: templates/profile.html.py:5 templates/profile.html:7
#: templates/base.html:55 templates/profile.html:4 templates/profile.html.py:5
#: templates/profile.html:7
msgid "My profile"
msgstr "Το προφίλ μου"
#: templates/base.html:57 templates/error.html:44
#: templates/base.html:57
msgid "Admin"
msgstr "Διαχειριστής"
#: templates/base.html:59 templates/error.html:46
#: templates/base.html:59
msgid "Logout"
msgstr "Έξοδος"
#: templates/base.html:61 templates/welcome.html:17
#: templates/base.html:62
msgid ""
"After clicking Retry Login, it is strongly suggested to close your browser "
"and visit the page again"
msgstr "Αφού επιλέξετε Επανάληψη Εισόδου κλείστε τον browser σας και επισκεφθείτε ξανά τη σελίδα"
#: templates/base.html:62
msgid "Retry Login"
msgstr "Επανάληψη Εισόδου"
#: templates/base.html:64 templates/welcome.html:17
msgid "Shibboleth Login"
msgstr "Είσοδος με Shibboleth"
#: templates/base.html:70 templates/user_routes.html:225
#: templates/base.html:74 templates/user_routes.html:225
#: templates/user_routes.html.py:229
msgid "My rules"
msgstr "Τα φίλτρα μου"
#: templates/error.html:4 templates/error.html.py:53
#: templates/error.html:4 templates/error.html.py:30
msgid "Activation Pending"
msgstr "Απαιτείται Ενεργοποίηση"
#: templates/error.html:4 templates/error.html.py:53
#: templates/error.html:4 templates/error.html.py:30
msgid "Error"
msgstr "Σφάλμα"
#: templates/error.html:48
msgid "Retry Login"
msgstr "Επανάληψη Εισόδου"
#: templates/error.html:56
#: templates/error.html:33
msgid ""
"One or more required shibboleth attributes were not released towards this "
"service"
msgstr "Ένα ή περισσότερα Shibboleth attributes δεν προωθήθηκαν στην υπηρεσία"
#: templates/error.html:61
#: templates/error.html:38
msgid "Required shibboleth attributes"
msgstr "Απαιτούμενα Shibboleth attributes "
#: templates/error.html:68
#: templates/error.html:45
msgid "Optional"
msgstr "Προεραιτικά"
......@@ -801,5 +807,3 @@ msgstr "Ο χρήστης έχει ήδη ενεργοποιηθεί"
msgid "The user will be notified about his/her account activation"
msgstr "Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού"
#~ msgid "My data"
#~ msgstr "Τα στοιχεία μου"
......@@ -40,7 +40,7 @@
{% if user.is_authenticated %}
<span class="topmenuuser">{% trans "Welcome" %} <strong>{{user}}</strong></span>
{% endif %}
<span {% if user.is_authenticated %}class="topmenuaction"{% else %}class="topmenuuser"{% endif %} >
<form action="{% url django.views.i18n.set_language %}" method="post" style="display:inline;" id="langform">
{% csrf_token %}
......@@ -58,8 +58,12 @@
{% endif %}
<span class="topmenuaction"><a href="{% url logout %}">{% trans "Logout" %}</a></span>
{% else %}
{% if error %}
<span class="topmenuaction relogin" title="{% trans 'After clicking Retry Login, it is strongly suggested to close your browser and visit the page again' %}"><a href="{% url logout %}">{% trans "Retry Login" %}</a></span>
{% else %}
<span class="topmenuaction"><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></span>
{% endif %}
{% endif %}
{% endblock %}
</div>
......
......@@ -23,30 +23,7 @@
}
</style>
<script type="text/javascript">
function setlang(lang){
$("#langsel").val(lang);
$("#langform").submit();
}
</script>
{% endblock %}
{% block menublock %}
{% if user.is_authenticated %}
<span class="topmenuuser">{% trans "Welcome" %} <strong>{{user}}</strong></span>
{% endif %}
{% if user.is_authenticated %}
<span class="topmenuaction"><a href="{% url user-profile %}">{% trans "My profile" %}</a></span>
{% if user.is_superuser %}
<span class="topmenuaction"><a href="{% url admin:index %}">{% trans "Admin" %}</a></span>
{% endif %}
<span class="topmenuaction"><a href="{% url logout %}">{% trans "Logout" %}</a></span>
{% else %}
<span class="topmenuaction relogin" title="After clicking Retry Login, it is strongly suggested to close your browser and visit the page again"><a href="{% url logout %}">{% trans "Retry Login" %}</a></span>
{% endif %}
{% endblock %}
{% block content %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment