EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3060 from dpalou/MOBILE-3715 

MOBILE-3715 login: Change message when sso with another app scheme
main
Pau Ferrer Ocaña 2022-01-19 12:08:33 +01:00 committed by GitHub
parent 338249d069 d60512d4e7
commit 44787dcb79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/langindex.json
View File

@ -1658,7 +1658,6 @@
"core.errorsync": "local_moodlemobileapp",
"core.errorsyncblocked": "local_moodlemobileapp",
"core.errorurlschemeinvalidscheme": "local_moodlemobileapp",
"core.errorurlschemeinvalidschemessologin": "local_moodlemobileapp",
"core.errorurlschemeinvalidsite": "local_moodlemobileapp",
"core.expand": "moodle",
"core.explanationdigitalminor": "moodle",

4
src/app/app.component.ts
View File

@ -125,8 +125,10 @@ export class AppComponent implements OnInit, AfterViewInit {
} else if (isExternalApp && url.includes('://token=')) {
// It's an SSO token for another app. Close the IAB and show an error.
CoreUtils.closeInAppBrowser();
CoreDomUtils.showErrorModal(Translate.instant('core.errorurlschemeinvalidschemessologin', {
CoreDomUtils.showErrorModal(Translate.instant('core.login.contactyouradministratorissue', {
$a: '<br><br>' + Translate.instant('core.errorurlschemeinvalidscheme', {
$a: urlScheme,
}),
}));
} else if (CoreApp.isAndroid()) {

1
src/core/lang.json
View File

@ -113,7 +113,6 @@
"errorsync": "An error occurred while synchronising. Please try again.",
"errorsyncblocked": "This {{$a}} cannot be synchronised right now because of an ongoing process. Please try again later. If the problem persists, try restarting the app.",
"errorurlschemeinvalidscheme": "This URL is meant to be used in another app: {{$a}}.",
"errorurlschemeinvalidschemessologin": "This site is configured to be used in another app: {{$a}}.",
"errorurlschemeinvalidsite": "This site URL cannot be opened in this app.",
"expand": "Expand",
"explanationdigitalminor": "This information is required to determine if your age is over the digital age of consent. This is the age when an individual can consent to terms and conditions and their data being legally stored and processed.",