diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-06-20 10:17:12 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-06-20 13:13:37 +0200 |
commit | 9107fd6cd6f55762d281aa34a4662b1d8e227285 (patch) | |
tree | 3fa056427cc897dea76f34fa4455f1dddf2f4aaf /apps/federation/lib | |
parent | 416466b700ade0b0c636b55fe4d5aacc507bbfcf (diff) | |
download | nextcloud-server-9107fd6cd6f55762d281aa34a4662b1d8e227285.tar.gz nextcloud-server-9107fd6cd6f55762d281aa34a4662b1d8e227285.zip |
fix federation strings
Diffstat (limited to 'apps/federation/lib')
-rw-r--r-- | apps/federation/lib/Controller/SettingsController.php | 6 | ||||
-rw-r--r-- | apps/federation/lib/DbHandler.php | 4 | ||||
-rw-r--r-- | apps/federation/lib/TrustedServers.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 0c5601b3c85..5a157d5aca5 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -70,7 +70,7 @@ class SettingsController extends Controller { [ 'url' => $url, 'id' => $id, - 'message' => (string) $this->l->t('Server added to the list of trusted ownClouds') + 'message' => (string) $this->l->t('Added to the list of trusted servers') ] ); } @@ -111,8 +111,8 @@ class SettingsController extends Controller { } if ($this->trustedServers->isOwnCloudServer($url) === false) { - $message = 'No ownCloud server found'; - $hint = $this->l->t('No ownCloud server found'); + $message = 'No server to federate found'; + $hint = $this->l->t('No server to federate found'); throw new HintException($message, $hint); } diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php index 0fab491be89..015a06c035c 100644 --- a/apps/federation/lib/DbHandler.php +++ b/apps/federation/lib/DbHandler.php @@ -61,7 +61,7 @@ class DbHandler { } /** - * add server to the list of trusted ownCloud servers + * add server to the list of trusted servers * * @param string $url * @return int @@ -93,7 +93,7 @@ class DbHandler { } /** - * remove server from the list of trusted ownCloud servers + * remove server from the list of trusted servers * * @param int $id */ diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 39feca13d22..c8ab4dec632 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -94,7 +94,7 @@ class TrustedServers { } /** - * add server to the list of trusted ownCloud servers + * add server to the list of trusted servers * * @param $url * @return int server id @@ -160,7 +160,7 @@ class TrustedServers { } /** - * remove server from the list of trusted ownCloud servers + * remove server from the list of trusted servers * * @param int $id */ @@ -242,7 +242,7 @@ class TrustedServers { $decoded = json_decode($status, true); if (!empty($decoded) && isset($decoded['version'])) { if (!version_compare($decoded['version'], '9.0.0', '>=')) { - throw new HintException('Remote server version is too low. ownCloud 9.0 is required.'); + throw new HintException('Remote server version is too low. 9.0 is required.'); } return true; } |