diff --git a/i18n/en.json b/i18n/en.json index d3e5361..7d96f3a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -22,9 +22,8 @@ "login-required": "You are required to log in with your Wikimedia account to perform checks with the search engine.", "login-error": "Error trying to log in: $1", "login-heading": "Login", - "after-logging-in": "After logging in,", - "check-will-be-run": "your check will be run.", - "will-be-redirected-to": "you will be redirected to:", + "after-login-search": "After logging in, your check will be run.", + "after-login-redirect": "After logging in, you will be redirected to $1.", "login-button": "Login", "logout-heading": "Logout", "logout-message": "Logging out will prevent you from making search engine checks.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 007f86f..3080bba 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -22,9 +22,8 @@ "login-required": "Message explaining that the user needs to log in via OAuth to use the search engine", "login-error": "Error message displayed when login fails. $1 is the error message.", "login-heading": "Heading for the login page", - "after-logging-in": "Beginning of a sentence explaining what happens after login", - "check-will-be-run": "Part of a sentence, follows 'after-logging-in'. Used when the user was about to run a search.", - "will-be-redirected-to": "Part of a sentence, follows 'after-logging-in'. Used when the user was on another page.", + "after-login-search": "Sentence explaining that after logging in, the user's check will be run.", + "after-login-redirect": "Sentence explaining that after logging in, the user will be redirected to $1.", "login-button": "Label for the login button", "logout-heading": "Heading for the logout page", "logout-message": "Explanation of what logging out does", diff --git a/src/copyvios/templates/login.html.jinja b/src/copyvios/templates/login.html.jinja index 4356b32..55699b0 100644 --- a/src/copyvios/templates/login.html.jinja +++ b/src/copyvios/templates/login.html.jinja @@ -11,14 +11,11 @@
{{ message('login-required') }}
{% if request.args.get("next") %} -- {{ message('after-logging-in') }} - {% if is_search %} - {{ message('check-will-be-run') }} - {% else %} - {{ message('will-be-redirected-to') }} {{ request.args["next"] | safe }} - {% endif %} -
+ {% if is_search %} +{{ message('after-login-search') }}
+ {% else %} +{{ message('after-login-redirect', redirect_url=request.args["next"]) }}
+ {% endif %} {% endif %}