From 691ed1bb3a54bbf76542b905171a0f2a151a8f1f Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek
- Login + Log in to comment on this ticket.
{% endif %} diff --git a/pagure/templates/pull_request_comment.html b/pagure/templates/pull_request_comment.html index c33dd6b..e013a4d 100644 --- a/pagure/templates/pull_request_comment.html +++ b/pagure/templates/pull_request_comment.html @@ -35,5 +35,5 @@ {% else %} -Login to comment on this ticket.
+Log in to comment on this ticket.
{% endif %} diff --git a/pagure/templates/unauthorized.html b/pagure/templates/unauthorized.html index 43ce0cf..629f8fe 100644 --- a/pagure/templates/unauthorized.html +++ b/pagure/templates/unauthorized.html @@ -15,7 +15,7 @@{{ error.description }}
{% endif %} -If you're not logged in, try to login; if you're already done, +
If you're not logged in, try to log in; if you've already done so, that probably means you do not have sufficient access.
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 0af9975..6d763cf 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -1316,7 +1316,7 @@ class PagureFlaskIssuestests(tests.Modeltests): ) self.assertIn( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -1359,7 +1359,7 @@ class PagureFlaskIssuestests(tests.Modeltests): ) self.assertIn( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -1380,7 +1380,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text, ) self.assertFalse( - 'Login to comment on this ticket.' + 'Log in to comment on this ticket.' in output_text ) # Not author nor admin = No take @@ -1503,7 +1503,7 @@ class PagureFlaskIssuestests(tests.Modeltests): ) self.assertIn( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -1530,7 +1530,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text, ) self.assertFalse( - 'Login to comment on this ticket.' + 'Log in to comment on this ticket.' in output_text ) # author admin = take @@ -1577,7 +1577,7 @@ class PagureFlaskIssuestests(tests.Modeltests): ) self.assertTrue( '' - "Login\n to comment on this ticket." in output_text + "Log in\n to comment on this ticket." in output_text ) # Create issues to play with @@ -1607,7 +1607,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text, ) self.assertFalse( - 'Login to comment on this ticket.' + 'Log in to comment on this ticket.' in output_text ) # user has ticket = take ok @@ -1718,7 +1718,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) # user has ticket = take ok diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py index 4f890ab..b8af162 100644 --- a/tests/test_pagure_flask_ui_issues_acl_checks.py +++ b/tests/test_pagure_flask_ui_issues_acl_checks.py @@ -110,7 +110,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): ) self.assertTrue( '' - "Login\n to comment on this ticket." + "Log in\n to comment on this ticket." in output.get_data(as_text=True) ) @@ -139,7 +139,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) @@ -203,7 +203,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) @@ -373,7 +373,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): ) self.assertIn( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -402,7 +402,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) @@ -628,7 +628,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): ) self.assertTrue( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -657,7 +657,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) @@ -881,7 +881,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): ) self.assertTrue( '' - "Login\n to comment on this ticket." + "Log in\n to comment on this ticket." in output.get_data(as_text=True) ) @@ -910,7 +910,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) diff --git a/tests/test_pagure_flask_ui_issues_open_access.py b/tests/test_pagure_flask_ui_issues_open_access.py index 4fa6ff7..6975564 100644 --- a/tests/test_pagure_flask_ui_issues_open_access.py +++ b/tests/test_pagure_flask_ui_issues_open_access.py @@ -214,7 +214,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): ) self.assertIn( '' - "Login\n to comment on this ticket.", + "Log in\n to comment on this ticket.", output_text, ) @@ -235,7 +235,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text, ) self.assertFalse( - 'Login to comment on this ticket.' + 'Log in to comment on this ticket.' in output_text ) # Not author nor admin but open_access = take @@ -314,7 +314,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): ) self.assertTrue( '' - "Login\n to comment on this ticket." in output_text + "Log in\n to comment on this ticket." in output_text ) # Create issues to play with @@ -344,7 +344,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text, ) self.assertFalse( - 'Login to comment on this ticket.' + 'Log in to comment on this ticket.' in output_text ) # user has ticket = take ok @@ -446,7 +446,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text, ) self.assertNotIn( - 'Login to comment on this ticket.', + 'Log in to comment on this ticket.', output_text, ) # user has ticket = take ok diff --git a/tests/test_pagure_flask_ui_login.py b/tests/test_pagure_flask_ui_login.py index 5927cb0..ea6ac99 100644 --- a/tests/test_pagure_flask_ui_login.py +++ b/tests/test_pagure_flask_ui_login.py @@ -297,8 +297,8 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.assertEqual(item.user, "foouser") self.assertEqual(item.token, None) - # Login but cannot save the session to the DB due to the missing IP - # address in the flask request + # Login works but cannot save the session to the DB due to the missing + # IP address in the flask request data["password"] = "barpass" output = self.app.post("/dologin", data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -522,7 +522,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): @patch.dict("pagure.config.config", {"PAGURE_AUTH": "local"}) @patch("pagure.lib.notify.send_email", MagicMock(return_value=True)) def test_non_ascii_password(self): - """Test login and create user functionality when the password is + """Test login and user creation functionality when the password is non-ascii. """