diff --git a/wizard/templates/wizard/newprocess.html b/wizard/templates/wizard/newprocess.html index db00c6dfb2b930d8236a0459db3dc33efcf0893d..e543ff4edaaf8ba28d84c7d8fae13324e92109b2 100644 --- a/wizard/templates/wizard/newprocess.html +++ b/wizard/templates/wizard/newprocess.html @@ -6,35 +6,13 @@
{% blocktrans %}You are not currently logged in. See the -Single Sign-On page -for details.{% endblocktrans %}
-{% elif not visitor %} -{% blocktrans with request_user_username=request.user.username %}You are -currently logged in with -SSO username {{request_user_username}}, but you cannot be matched -to any person in the site.{% endblocktrans %}
-- {% url 'dm_claim' as dm_claim_url %} - {% blocktrans %}If you are already in the site, for example as a Debian -Maintainer, you can try to correct the situation using the -claim interface.{% endblocktrans %}
-- {% url 'dm_claim' as dm_claim_url %} - {% blocktrans %}If you are already in the site, for example as a Debian -Maintainer, you can try to correct the situation using the -claim interface.{% endblocktrans %}
-- {% url 'public_newnm' as public_newnm_url %} - {% blocktrans %}If you are not yet in the site, -visit the 'Join the NM process' page -to can create an entry for yourself.{% endblocktrans %}
+{% if not visitor %} +{% trans "This wizard only works when you are logged into the site" %}
{% else %} - {% for c in comments %}{{c}}
{% endfor %} + {% for c in comments %}{{c}}
{% endfor %} {% if allowed %} -+
{% url 'process_create' key=visitor.lookup_key as process_create_url %} {% blocktrans %}Just visit this page and follow the instructions.{% endblocktrans %} diff --git a/wizard/templates/wizard/whoami.html b/wizard/templates/wizard/whoami.html index 05eb78f8d9fdacd9729df3260c17dba74a1bc468..b7474eb0f13d6c4f01b6a0055ad4d9cbfdec3f57 100644 --- a/wizard/templates/wizard/whoami.html +++ b/wizard/templates/wizard/whoami.html @@ -17,6 +17,11 @@ are currently logged in, but not mapped to any person in the site. If you are a Debian Maintainer, you can try to correct the situation using the claim interface.{% endblocktrans %} +{% url 'public_newnm' as public_newnm_url %} +{% blocktrans %}If you are not yet in the site, +visit the 'Join the NM process' page +to create an entry for yourself.{% endblocktrans %}
+{% trans "You are logged in as:" %}