summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-23 10:58:43 +0100
committerGitHub <noreply@github.com>2018-01-23 10:58:43 +0100
commit9cb3a79b18bb74e3f79d53aa400d7efa5b2c2174 (patch)
treecb2da71b0d9ccdda38f5ad6a338b3c56853d2490
parent5c360a41e9ccc9a2cbb8a5d4ef8b09b9d1fa0d5d (diff)
parent7fb1e458fac2a710c4a95acb2639d4115b52a972 (diff)
downloadnextcloud-server-9cb3a79b18bb74e3f79d53aa400d7efa5b2c2174.tar.gz
nextcloud-server-9cb3a79b18bb74e3f79d53aa400d7efa5b2c2174.zip
Merge pull request #7971 from nextcloud/comradekingu-patch-1
Spelling: There was an error loading → could not load
-rw-r--r--core/js/contactsmenu.js2
-rw-r--r--core/js/tests/specs/contactsmenuSpec.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/contactsmenu.js b/core/js/contactsmenu.js
index 8d08ea74f4c..9e7ec552830 100644
--- a/core/js/contactsmenu.js
+++ b/core/js/contactsmenu.js
@@ -47,7 +47,7 @@
var ERROR_TEMPLATE = ''
+ '<div class="emptycontent">'
+ ' <div class="icon-search"></div>'
- + ' <h2>' + t('core', 'There was an error loading your contacts') + '</h2>'
+ + ' <h2>' + t('core', 'Could not load your contacts') + '</h2>'
+ '</div>';
var CONTACT_TEMPLATE = ''
+ '{{#if contact.avatar}}'
diff --git a/core/js/tests/specs/contactsmenuSpec.js b/core/js/tests/specs/contactsmenuSpec.js
index 8e57dc35f01..3fa8671e2ac 100644
--- a/core/js/tests/specs/contactsmenuSpec.js
+++ b/core/js/tests/specs/contactsmenuSpec.js
@@ -72,7 +72,7 @@ describe('Contacts menu', function() {
fakeServer.respond();
opening.then(function() {
- expect($menuEl.html()).toContain('There was an error loading your contacts');
+ expect($menuEl.html()).toContain('Could not load your contacts');
expect(console.error).toHaveBeenCalledTimes(1);
done();
}, function(e) {