Skip to content

Commit

Permalink
MM-60312- rename ssoOffice 365 to sso EntraId (#8209)
Browse files Browse the repository at this point in the history
* MM-60312- rename ssoOffice 365 to sso EntraId

* address pr comments, remove old icon and fix i18n
  • Loading branch information
pvev authored Sep 9, 2024
1 parent f864947 commit c31ec8a
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/screens/edit_profile/components/email_field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type {FloatingTextInputRef} from '@components/floating_text_input_label';
const services: Record<string, string> = {
gitlab: 'GitLab',
google: 'Google Apps',
office365: 'Office 365',
office365: 'Entra ID',
ldap: 'AD/LDAP',
saml: 'SAML',
};
Expand Down
4 changes: 2 additions & 2 deletions app/screens/login/sso_options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const SsoOptions = ({goToSso, ssoOnly, ssoOptions, theme}: Props) => {
sso.imageSrc = require('@assets/images/Icon_Google.png');
break;
case Sso.OFFICE365:
sso.text = formatMessage({id: 'mobile.login_options.office365', defaultMessage: 'Office 365'});
sso.imageSrc = require('@assets/images/Icon_Office.png');
sso.text = formatMessage({id: 'mobile.login_options.entraid', defaultMessage: 'Entra ID'});
sso.imageSrc = require('@assets/images/Icon_EntraID.png');
break;
case Sso.OPENID:
sso.text = options.text || formatMessage({id: 'mobile.login_options.openid', defaultMessage: 'Open ID'});
Expand Down
2 changes: 1 addition & 1 deletion assets/base/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,11 @@
"mobile.link.error.title": "Error",
"mobile.login_options.cant_heading": "Can't Log In",
"mobile.login_options.enter_credentials": "Enter your login details below.",
"mobile.login_options.entraid": "Entra ID",
"mobile.login_options.gitlab": "GitLab",
"mobile.login_options.google": "Google",
"mobile.login_options.heading": "Log In to Your Account",
"mobile.login_options.none": "You can't log in to your account yet. At least one login option must be configured. Contact your System Admin for assistance.",
"mobile.login_options.office365": "Office 365",
"mobile.login_options.openid": "Open ID",
"mobile.login_options.saml": "SAML",
"mobile.login_options.select_option": "Select a login option below.",
Expand Down
Binary file added assets/base/images/Icon_EntraID.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/base/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/base/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/base/images/Icon_Office.png
Binary file not shown.
Binary file removed assets/base/images/[email protected]
Binary file not shown.
Binary file removed assets/base/images/[email protected]
Binary file not shown.

0 comments on commit c31ec8a

Please sign in to comment.