Skip to content

Enhance Login Components for OpenID Connect Providers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enhance Login Components for OpenID Connect Providers #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/assets/javascripts/discourse/app/models/login-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export default class LoginMethod extends EmberObject {

@discourseComputed
title() {
return this.title_override || i18n(`login.${this.name}.title`);
// Prefer explicit override, then i18n, then pretty name, finally a humanized provider name.
const fallback = this.prettyName || this.name?.toString().replace(/_/g, " ");
return (
this.title_override ||
i18n(`login.${this.name}.title`, { defaultValue: fallback })
);
}

@discourseComputed
Expand All @@ -43,7 +48,13 @@ export default class LoginMethod extends EmberObject {

@discourseComputed
prettyName() {
return this.pretty_name_override || i18n(`login.${this.name}.name`);
// Prefer explicit override, then i18n, and finally a humanized provider name.
return (
this.pretty_name_override ||
i18n(`login.${this.name}.name`, {
defaultValue: this.name?.toString().replace(/_/g, " "),
})
);
}

doLogin({ reconnect = false, signup = false, params = {} } = {}) {
Expand Down