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

Merge pull request #3602 from moodlehq/MOBILE-4301 

MOBILE-4301 core: Drop core.sitenotfound string
main
Dani Palou 2023-04-13 09:36:42 +02:00 committed by GitHub
parent 8171da961e 4d5c18459c
commit e14f5002d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/langindex.json
View File

@ -2396,7 +2396,6 @@
"core.sitehome.sitehome": "moodle", "core.sitehome.sitehome": "moodle",
"core.sitehome.sitenews": "moodle", "core.sitehome.sitenews": "moodle",
"core.sitemaintenance": "admin", "core.sitemaintenance": "admin",
"core.sitenotfound": "local_moodlemobileapp",
"core.sitenotfoundhelp": "local_moodlemobileapp", "core.sitenotfoundhelp": "local_moodlemobileapp",
"core.siteunavailablehelp": "local_moodlemobileapp", "core.siteunavailablehelp": "local_moodlemobileapp",
"core.size": "moodle", "core.size": "moodle",

6
src/core/features/login/pages/site/site.ts
View File

@ -436,11 +436,7 @@ export class CoreLoginSitePage implements OnInit {
].filter(button => !!button); ].filter(button => !!button);
const alertElement = await CoreDomUtils.showAlertWithOptions({ const alertElement = await CoreDomUtils.showAlertWithOptions({
header: errorTitle ?? ( header: errorTitle ?? Translate.instant('core.cannotconnect'),
siteExists
? Translate.instant('core.cannotconnect')
: Translate.instant('core.sitenotfound')
),
message: errorMessage ?? Translate.instant('core.sitenotfoundhelp'), message: errorMessage ?? Translate.instant('core.sitenotfoundhelp'),
buttons: buttons as AlertButton[], buttons: buttons as AlertButton[],
}); });

4
src/core/features/login/tests/behat/basic_usage.feature
View File

@ -45,7 +45,7 @@ Feature: Test basic usage of login in app
When I launch the app When I launch the app
And I set the field "Your site" to "wrongsiteaddress" in the app And I set the field "Your site" to "wrongsiteaddress" in the app
And I press "Connect to your site" in the app And I press "Connect to your site" in the app
Then I should find "Site not found" in the app Then I should find "Can't connect to site" in the app
Scenario: Add a non existing account from accounts switcher Scenario: Add a non existing account from accounts switcher
When I enter the app When I enter the app
@ -56,7 +56,7 @@ Feature: Test basic usage of login in app
And I wait the app to restart And I wait the app to restart
And I set the field "Your site" to "wrongsiteaddress" in the app And I set the field "Your site" to "wrongsiteaddress" in the app
And I press "Connect to your site" in the app And I press "Connect to your site" in the app
Then I should find "Site not found" in the app Then I should find "Can't connect to site" in the app
Scenario: Log out from the app Scenario: Log out from the app
Given I entered the app as "student1" Given I entered the app as "student1"

1
src/core/lang.json
View File

@ -284,7 +284,6 @@
"showmore": "Show more...", "showmore": "Show more...",
"site": "Site", "site": "Site",
"sitemaintenance": "The site is undergoing maintenance and is currently not available", "sitemaintenance": "The site is undergoing maintenance and is currently not available",
"sitenotfound": "Site not found",
"sitenotfoundhelp": "We can't find the site you entered. Please check for typos or try again later. If you keep seeing this message, contact your school or learning provider.", "sitenotfoundhelp": "We can't find the site you entered. Please check for typos or try again later. If you keep seeing this message, contact your school or learning provider.",
"siteunavailablehelp": "The site \"{{site}}\" is not available right now. Please try again later or contact your school or learning provider.", "siteunavailablehelp": "The site \"{{site}}\" is not available right now. Please try again later or contact your school or learning provider.",
"size": "Size", "size": "Size",

2
src/core/services/utils/dom.ts
View File

@ -1371,7 +1371,7 @@ export class CoreDomUtilsProvider {
if (typeof error !== 'string' && 'title' in error && error.title) { if (typeof error !== 'string' && 'title' in error && error.title) {
alertOptions.header = error.title || undefined; alertOptions.header = error.title || undefined;
} else if (message === Translate.instant('core.sitenotfoundhelp')) { } else if (message === Translate.instant('core.sitenotfoundhelp')) {
alertOptions.header = Translate.instant('core.sitenotfound'); alertOptions.header = Translate.instant('core.cannotconnect');
} else if (this.isSiteUnavailableError(message)) { } else if (this.isSiteUnavailableError(message)) {
alertOptions.header = CoreSites.isLoggedIn() alertOptions.header = CoreSites.isLoggedIn()
? Translate.instant('core.connectionlost') ? Translate.instant('core.connectionlost')