| @@ -22,9 +22,8 @@ | |||||
| "login-required": "You are required to log in with your Wikimedia account to perform checks with the search engine.", | "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-error": "Error trying to log in: $1", | ||||
| "login-heading": "Login", | "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", | "login-button": "Login", | ||||
| "logout-heading": "Logout", | "logout-heading": "Logout", | ||||
| "logout-message": "Logging out will prevent you from making search engine checks.", | "logout-message": "Logging out will prevent you from making search engine checks.", | ||||
| @@ -22,9 +22,8 @@ | |||||
| "login-required": "Message explaining that the user needs to log in via OAuth to use the search engine", | "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-error": "Error message displayed when login fails. $1 is the error message.", | ||||
| "login-heading": "Heading for the login page", | "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", | "login-button": "Label for the login button", | ||||
| "logout-heading": "Heading for the logout page", | "logout-heading": "Heading for the logout page", | ||||
| "logout-message": "Explanation of what logging out does", | "logout-message": "Explanation of what logging out does", | ||||
| @@ -11,14 +11,11 @@ | |||||
| <h2>{{ message('login-heading') }}</h2> | <h2>{{ message('login-heading') }}</h2> | ||||
| <p>{{ message('login-required') }}</p> | <p>{{ message('login-required') }}</p> | ||||
| {% if request.args.get("next") %} | {% if request.args.get("next") %} | ||||
| <p> | |||||
| {{ message('after-logging-in') }} | |||||
| {% if is_search %} | |||||
| {{ message('check-will-be-run') }} | |||||
| {% else %} | |||||
| {{ message('will-be-redirected-to') }} {{ request.args["next"] | safe }} | |||||
| {% endif %} | |||||
| </p> | |||||
| {% if is_search %} | |||||
| <p>{{ message('after-login-search') }}</p> | |||||
| {% else %} | |||||
| <p>{{ message('after-login-redirect', redirect_url=request.args["next"]) }}</p> | |||||
| {% endif %} | |||||
| {% endif %} | {% endif %} | ||||
| <form action="{{ request.script_root }}/login" method="post"> | <form action="{{ request.script_root }}/login" method="post"> | ||||
| <input type="hidden" name="next" value="{{ request.args.get('next', '/') | safe }}" /> | <input type="hidden" name="next" value="{{ request.args.get('next', '/') | safe }}" /> | ||||
| @@ -32,6 +32,7 @@ config = TranslationsConfig( | |||||
| "intro-paragraph-3": ["exclusions_url"], | "intro-paragraph-3": ["exclusions_url"], | ||||
| "intro-paragraph-1": ["copyright_url"], | "intro-paragraph-1": ["copyright_url"], | ||||
| "intro-paragraph-1-copyvio-url": [], | "intro-paragraph-1-copyvio-url": [], | ||||
| "after-login-redirect": ["redirect_url"], | |||||
| "settings-background-list": ["potd_subset_url", "commons_url", "potd_url"], | "settings-background-list": ["potd_subset_url", "commons_url", "potd_url"], | ||||
| }, | }, | ||||
| allowed_html_elements={ | allowed_html_elements={ | ||||