diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-01-29 15:54:19 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-01-29 15:54:19 +0100 |
| commit | 5c8e5e223d07780196680732544fa66a5fa2503c (patch) | |
| tree | 248992c3a931f5e42cdcceadf3a6cf75ef61c806 | |
| parent | 65ec950b27d625b8184fbff28ecb7778f55415d9 (diff) | |
| parent | 8a091629dcd9282c1aa9f73094282bf9b1afcb87 (diff) | |
| download | nextcloud-server-5c8e5e223d07780196680732544fa66a5fa2503c.tar.gz nextcloud-server-5c8e5e223d07780196680732544fa66a5fa2503c.zip | |
Merge pull request #13728 from owncloud/federated_cloud
rename 'server-to-server sharing' to 'federated cloud'
| -rw-r--r-- | apps/files_sharing/api/server2server.php | 8 | ||||
| -rw-r--r-- | apps/files_sharing/templates/settings-admin.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index 7dce0df7d83..f2f7561598f 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -34,7 +34,7 @@ class Server2Server { public function createShare($params) { if (!$this->isS2SEnabled(true)) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $remote = isset($_POST['remote']) ? $_POST['remote'] : null; @@ -94,7 +94,7 @@ class Server2Server { public function acceptShare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; @@ -121,7 +121,7 @@ class Server2Server { public function declineShare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; @@ -152,7 +152,7 @@ class Server2Server { public function unshare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php index c71ef31b21c..9fac97faf55 100644 --- a/apps/files_sharing/templates/settings-admin.php +++ b/apps/files_sharing/templates/settings-admin.php @@ -4,7 +4,7 @@ ?> <div class="section" id="fileSharingSettings" > - <h2><?php p($l->t('Server-to-Server Sharing'));?></h2> + <h2><?php p($l->t('Federated Cloud Sharing'));?></h2> <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |