From 29d68d7a35c5fe32185c2afc2205b35b27273097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 20 Jan 2018 09:15:50 +0100 Subject: [PATCH 1/2] =?UTF-8?q?There=20was=20an=20error=20loading=20?= =?UTF-8?q?=E2=86=92=20could=20not=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/js/tests/specs/contactsmenuSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/tests/specs/contactsmenuSpec.js b/core/js/tests/specs/contactsmenuSpec.js index 8e57dc35f0..3fa8671e2a 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) { From 7fb1e458fac2a710c4a95acb2639d4115b52a972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 20 Jan 2018 09:17:26 +0100 Subject: [PATCH 2/2] =?UTF-8?q?There=20was=20an=20error=20loading=20?= =?UTF-8?q?=E2=86=92=20Could=20not=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/js/contactsmenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/contactsmenu.js b/core/js/contactsmenu.js index 8d08ea74f4..9e7ec55283 100644 --- a/core/js/contactsmenu.js +++ b/core/js/contactsmenu.js @@ -47,7 +47,7 @@ var ERROR_TEMPLATE = '' + '
' + ' ' - + '

' + t('core', 'There was an error loading your contacts') + '

' + + '

' + t('core', 'Could not load your contacts') + '

' + '
'; var CONTACT_TEMPLATE = '' + '{{#if contact.avatar}}'