summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-01-02 11:14:39 +0100
committerGitHub <noreply@github.com>2018-01-02 11:14:39 +0100
commit9e49b6e2bb2194f61eb8fe1f739e9b0c2184c23f (patch)
tree7f4462303586f43f43e5c007054db9c47ec72d48
parent75d4f0bcda45204356651bfcccde0182cdb68fd3 (diff)
parentd62834164915fe5ca7c58f7a7ca2d57396593e13 (diff)
downloadnextcloud-server-9e49b6e2bb2194f61eb8fe1f739e9b0c2184c23f.tar.gz
nextcloud-server-9e49b6e2bb2194f61eb8fe1f739e9b0c2184c23f.zip
Merge pull request #7659 from nextcloud/fix_7657
Get correct translations for SecurityProvider
-rw-r--r--settings/Activity/SecurityProvider.php2
-rw-r--r--tests/Settings/Activity/SecurityProviderTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/Activity/SecurityProvider.php b/settings/Activity/SecurityProvider.php
index f0789842e82..680881b6e31 100644
--- a/settings/Activity/SecurityProvider.php
+++ b/settings/Activity/SecurityProvider.php
@@ -53,7 +53,7 @@ class SecurityProvider implements IProvider {
throw new InvalidArgumentException();
}
- $l = $this->l10n->get('core', $language);
+ $l = $this->l10n->get('settings', $language);
switch ($event->getSubject()) {
case 'twofactor_success':
diff --git a/tests/Settings/Activity/SecurityProviderTest.php b/tests/Settings/Activity/SecurityProviderTest.php
index 21fc28f3c3b..552548984d7 100644
--- a/tests/Settings/Activity/SecurityProviderTest.php
+++ b/tests/Settings/Activity/SecurityProviderTest.php
@@ -87,7 +87,7 @@ class SecurityProviderTest extends TestCase {
->willReturn('security');
$this->l10n->expects($this->once())
->method('get')
- ->with('core', $lang)
+ ->with('settings', $lang)
->willReturn($l);
$this->urlGenerator->expects($this->once())
->method('imagePath')
@@ -119,7 +119,7 @@ class SecurityProviderTest extends TestCase {
->willReturn('security');
$this->l10n->expects($this->once())
->method('get')
- ->with('core', $lang)
+ ->with('settings', $lang)
->willReturn($l);
$event->expects($this->once())
->method('getSubject')