Skip to content

Replace authorization with authorisation throughout the spec#2351

Draft
richvdh wants to merge 3 commits intomainfrom
rav/en_GB/authorisation
Draft

Replace authorization with authorisation throughout the spec#2351
richvdh wants to merge 3 commits intomainfrom
rav/en_GB/authorisation

Conversation

@richvdh
Copy link
Copy Markdown
Member

@richvdh richvdh commented Mar 31, 2026

The style guide requires en_GB, which spells authorisation with an s.

Preview: https://pr2351--matrix-spec-previews.netlify.app

@richvdh richvdh force-pushed the rav/en_GB/authorisation branch from 73ce2e4 to 82947bb Compare March 31, 2026 21:20
The style guide requires en_GB, which spells authorisation with an s.
@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Mar 31, 2026

I created this in response to the pushback against MSC4421, in the hope that it might help us visualise what we're talking about when people suggest going back to en_GB.

I think it's tolerable, even if it feels a bit odd that, say grant_types_supported uses authorization_code to identify the authorisation code grant.

@sandhose as our resident OAuth2 expert, I'd welcome your thoughts on this.

@richvdh richvdh marked this pull request as ready for review April 9, 2026 15:17
@richvdh richvdh requested a review from a team as a code owner April 9, 2026 15:17
Copy link
Copy Markdown
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, assuming this doesn't cause problems in OAuth areas.

Copy link
Copy Markdown
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two things:

Firstly, there are some clear errors in here which need to be addressed where constants have been renamed. See comments inline, but I could well have missed some more.

Secondly, for the OAuth related items sometimes/often we are referring to concepts or entities that are defined in external specs (e.g. RFCs). In these cases it doesn't feel "right" to have renamed them.

Examples of things that are external concepts:

Ideas:

  • we treat these external things as proper names that cannot be changed
  • we make it clearer when we are referring to the proper name or not. e.g. instead of the heading "Authorization Request" perhaps "Sending the Authorization Request" with a note that this is an Authorization Request as defined by XYZ.

Comment thread data/schemas/oauth2-client-metadata.yaml Outdated
Comment thread content/client-server-api/_index.md Outdated
@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Apr 10, 2026

Firstly, there are some clear errors in here which need to be addressed where constants have been renamed. See comments inline, but I could well have missed some more.

Good spots, thank you. I tried really hard to avoid changing these, so I'm sorry I missed them :/.

Secondly, for the OAuth related items sometimes/often we are referring to concepts or entities that are defined in external specs (e.g. RFCs). In these cases it doesn't feel "right" to have renamed them.

Right, so this is the whole debate here. matrix-org/matrix-spec-proposals#4421 (comment) is the relevant thread.

we treat these external things as proper names that cannot be changed

I'm really not in favour of trying to use en_US terms when we are talking about OAuth things, and en_GB the rest of the time. I did try that when the OAuth stuff first landed in the spec, but figuring out where exactly to draw the line was a nightmare. And you get sentences like "... obtain an authorisation code via the authorization code grant", which feels odd.

Further, the existence of https://auth0.com/fr/intro-to-iam/what-is-oauth-2 makes me think that one certainly can i18nise these terms.

we make it clearer when we are referring to the proper name or not. e.g. instead of the heading "Authorization Request" perhaps "Sending the Authorization Request" with a note that this is an Authorization Request as defined by XYZ.

I'm not really sure how practical this is. The problem is that these terms are repeated many times, and giving a reference each time they do is painful.


My only opinion here is that attempting a half-way house is unachievable; we should commit to one of en_GB or en_US. I don't really have a strong opinion on which, but I am a bit fed up with our current attempts to sit on the fence.

We got pushback against switching en_US, so this is my attempt to try en_GB. If you think this PR is worse, then I would welcome comments on MSC4421 :)

Co-authored-by: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Apr 16, 2026

Firstly, there are some clear errors in here which need to be addressed where constants have been renamed. See comments inline, but I could well have missed some more.

Good spots, thank you. I tried really hard to avoid changing these, so I'm sorry I missed them :/.

I ran this to double-check for further changes within identifiers:

$ git diff origin/main...HEAD | grep '^\+' | grep '`[^ `]*authoris'
$

@richvdh richvdh marked this pull request as draft April 21, 2026 21:43
@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Apr 22, 2026

If you think this PR is worse, then I would welcome comments on MSC4421 :)

MSC4421 is in final call for closure.

Copy link
Copy Markdown
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OAuth 2 API related changes now look sensible to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants