summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-01-28 12:09:53 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-29 15:05:39 +0100
commit8a091629dcd9282c1aa9f73094282bf9b1afcb87 (patch)
tree38257c7bebd53e12b690c462fc96e7d1c3a3328c
parent55142186deb9e163ce3519453ebfe93f6a446666 (diff)
downloadnextcloud-server-8a091629dcd9282c1aa9f73094282bf9b1afcb87.tar.gz
nextcloud-server-8a091629dcd9282c1aa9f73094282bf9b1afcb87.zip
rename 'server-to-server sharing' to 'federated cloud'
-rw-r--r--apps/files_sharing/api/server2server.php8
-rw-r--r--apps/files_sharing/templates/settings-admin.php2
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"'); ?> />