#5382 fix: grammar of "log in"
Merged 8 months ago by ngompa. Opened a year ago by zbyszek.
zbyszek/pagure log-in  into  master

file modified
+1 -1
@@ -59,7 +59,7 @@ 

  

      $ docker-compose -f dev/docker-compose.yml exec web python3 dev-data.py --all

  

- You can then login with any of the created users, by example:

+ You can then log in with any of the created users, by example:

  

  - username: pingou

  - password: testing123

@@ -6,7 +6,7 @@ 

  

  ### Set the time after which the admin session expires

  # There are two sessions on pagure, login that holds for 31 days and

- # the session defined here after which an user has to re-login.

+ # the session defined here after which an user has to log in again.

  # This session is used when accessing all administrative parts of pagure

  # (ie: changing a project's or a user's settings)

  ADMIN_SESSION_LIFETIME = timedelta(minutes=20000000)

file modified
+2 -2
@@ -1747,9 +1747,9 @@ 

  ~~~~~~~~~~~~~~~~~~~~~~

  

  This configuration key allows specifying the lifetime of the session during

- which the user won't have to re-login for admin actions.

+ which the user won't have to log in again for admin actions.

  In other words, the maximum time between which an user can access a project's

- settings page without re-login.

+ settings page without a re-login.

  

  Defaults to: ``timedelta(minutes=20)``

  

file modified
+4 -4
@@ -6,8 +6,8 @@ 

  When coming to pagure for the first time there are a few things one should

  do or check to ensure all works as desired.

  

- Login to pagure or create your account

- --------------------------------------

+ Log in to pagure or create your account

+ ---------------------------------------

  

  Pagure has its own user account system.

  
@@ -16,7 +16,7 @@ 

  pagure.io, the Fedora Account System) via OpenID, the local user account

  is created upon login.

  

- This means, you cannot be added to a group or a project before you login for

+ This means, you cannot be added to a group or a project before you log in for

  the first time as the system will simply not know you.

  

  If you run your own pagure instance which uses the local authentication
@@ -54,7 +54,7 @@ 

  

  To upload your public key onto pagure:

  

- 1. Login into pagure and click on the user icon on

+ 1. Log in to pagure and click on the user icon on

  the top right corner, there, select ``My settings``.

  

  .. image:: _static/pagure_my_settings.png

file modified
+1 -1
@@ -3,7 +3,7 @@ 

  

  ### Set the time after which the admin session expires

  # There are two sessions on pagure, login that holds for 31 days and

- # the session defined here after which an user has to re-login.

+ # the session defined here after which an user has to log in again.

  # This session is used when accessing all administrative parts of pagure

  # (ie: changing a project's or a user's settings)

  ADMIN_SESSION_LIFETIME = timedelta(minutes=20)

file modified
+1 -1
@@ -1,7 +1,7 @@ 

  Authentication

  ~~~~~~~~~~~~~~

  

- To access some endpoints, you need to login to Pagure using API token. You

+ To access some endpoints, you need to log in to Pagure using an API token. You

  can generate one in the project setting page.

  

  When sending HTTP request, include an ``Authorization`` field in the header

file modified
+1 -1
@@ -89,7 +89,7 @@ 

  If you specify one or more branches (using commas `,` to separate them) only

  pushes made to these branches will trigger a new build of the documentation.

  

- To set up this hook, you will need to login to https://readthedocs.org/

+ To set up this hook, you will need to log in to https://readthedocs.org/

  Go to your project's admin settings, and in the ``Integrations`` section

  add a new ``Generic API incoming webhook``.

  

file modified
+1 -1
@@ -263,7 +263,7 @@ 

          </p>

        {% else %}

          <p>

-           <a href="{{ url_for('auth_login', next=request.url) }}">Login</a>

+           <a href="{{ url_for('auth_login', next=request.url) }}">Log in</a>

            to comment on this ticket.

          </p>

        {% endif %}

@@ -35,5 +35,5 @@ 

  </section>

  

  {% else %}

- <p><a href="{{ url_for('auth_login') }}">Login</a> to comment on this ticket.</p>

+ <p><a href="{{ url_for('auth_login') }}">Log in</a> to comment on this ticket.</p>

  {% endif %}

@@ -15,7 +15,7 @@ 

        <p>{{ error.description }}</p>

        </div>

        {% endif %}

-       <p>If you're not logged in, try to login; if you're already done,

+       <p>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.</p>

      </div>

    </div>

@@ -1316,7 +1316,7 @@ 

          )

          self.assertIn(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket.",

+             "Log in</a>\n          to comment on this ticket.",

              output_text,

          )

  
@@ -1359,7 +1359,7 @@ 

          )

          self.assertIn(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket.",

+             "Log in</a>\n          to comment on this ticket.",

              output_text,

          )

  
@@ -1380,7 +1380,7 @@ 

                  output_text,

              )

              self.assertFalse(

-                 '<a href="/login/">Login</a> to comment on this ticket.'

+                 '<a href="/login/">Log in</a> to comment on this ticket.'

                  in output_text

              )

              # Not author nor admin = No take
@@ -1503,7 +1503,7 @@ 

          )

          self.assertIn(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket.",

+             "Log in</a>\n          to comment on this ticket.",

              output_text,

          )

  
@@ -1530,7 +1530,7 @@ 

                  output_text,

              )

              self.assertFalse(

-                 '<a href="/login/">Login</a> to comment on this ticket.'

+                 '<a href="/login/">Log in</a> to comment on this ticket.'

                  in output_text

              )

              # author admin = take
@@ -1577,7 +1577,7 @@ 

          )

          self.assertTrue(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket." in output_text

+             "Log in</a>\n          to comment on this ticket." in output_text

          )

  

          # Create issues to play with
@@ -1607,7 +1607,7 @@ 

                  output_text,

              )

              self.assertFalse(

-                 '<a href="/login/">Login</a> to comment on this ticket.'

+                 '<a href="/login/">Log in</a> to comment on this ticket.'

                  in output_text

              )

              # user has ticket = take ok
@@ -1718,7 +1718,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

              # user has ticket = take ok

@@ -110,7 +110,7 @@ 

          )

          self.assertTrue(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket."

+             "Log in</a>\n          to comment on this ticket."

              in output.get_data(as_text=True)

          )

  
@@ -139,7 +139,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

  
@@ -203,7 +203,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

  
@@ -373,7 +373,7 @@ 

          )

          self.assertIn(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket.",

+             "Log in</a>\n          to comment on this ticket.",

              output_text,

          )

  
@@ -402,7 +402,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

  
@@ -628,7 +628,7 @@ 

          )

          self.assertTrue(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n            to comment on this ticket.",

+             "Log in</a>\n            to comment on this ticket.",

              output_text,

          )

  
@@ -657,7 +657,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

  
@@ -881,7 +881,7 @@ 

          )

          self.assertTrue(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket."

+             "Log in</a>\n          to comment on this ticket."

              in output.get_data(as_text=True)

          )

  
@@ -910,7 +910,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

  

@@ -214,7 +214,7 @@ 

          )

          self.assertIn(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket.",

+             "Log in</a>\n          to comment on this ticket.",

              output_text,

          )

  
@@ -235,7 +235,7 @@ 

                  output_text,

              )

              self.assertFalse(

-                 '<a href="/login/">Login</a> to comment on this ticket.'

+                 '<a href="/login/">Log in</a> to comment on this ticket.'

                  in output_text

              )

              # Not author nor admin but open_access = take
@@ -314,7 +314,7 @@ 

          )

          self.assertTrue(

              '<a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1">'

-             "Login</a>\n          to comment on this ticket." in output_text

+             "Log in</a>\n          to comment on this ticket." in output_text

          )

  

          # Create issues to play with
@@ -344,7 +344,7 @@ 

                  output_text,

              )

              self.assertFalse(

-                 '<a href="/login/">Login</a> to comment on this ticket.'

+                 '<a href="/login/">Log in</a> to comment on this ticket.'

                  in output_text

              )

              # user has ticket = take ok
@@ -446,7 +446,7 @@ 

                  output_text,

              )

              self.assertNotIn(

-                 '<a href="/login/">Login</a> to comment on this ticket.',

+                 '<a href="/login/">Log in</a> to comment on this ticket.',

                  output_text,

              )

              # user has ticket = take ok

@@ -297,8 +297,8 @@ 

          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 @@ 

      @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.

          """

  

"Login" is a noun or adjective. The verb is "log in". This becomes obvious when
one attempts present continuous: "I'm logging in", and not "I'm loginning".

I also adjusted grammar in surrounding context when I noticed something obvious.

I had a few fesco tickets open today without being logged in and the wrong form
was hurting me a little every time ;)

Ugh, the CI is failing because somehow all the old Fedora release tags for the container image at quay.io were deleted. :frowning:

Dunno. I see "Rerun CI". Should I click that?

pretty please pagure-ci rebuild

11 months ago

rebased onto 5091fc2d0c767fcf0451bb673ec7725e3d6a0851

11 months ago

I missed one spot, which caused tests to fail.

rebased onto 286a910e760ac6c44759f5a1a47dd1731d6438cb

11 months ago

rebased onto 891dab0471a308e95bf79e066be24620200b9673

11 months ago

Something seems to be wrong with notifications of completion:
https://jenkins-pagure.apps.ocp.cloud.ci.centos.org/job/pull-requests/135/console
apparently finished 20 minutes ago, but here it's still displayed as pending.
Same for job 136.

I think this can be merged.

rebased onto 9e34756edefa6a3455b5a8c9997e447de4451b04

8 months ago

rebased onto dec01ba8ea242777b0ac5828b711510b2ae1bb63

8 months ago

rebased onto 691ed1b

8 months ago

Pull-Request has been merged by ngompa

8 months ago