-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rename 'server-to-server sharing' to 'federated cloud' #13728
Conversation
@@ -34,7 +34,7 @@ class Server2Server { | |||
public function createShare($params) { | |||
|
|||
if (!$this->isS2SEnabled(true)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please dry-up the code! THX http://de.wikipedia.org/wiki/Don%E2%80%99t_repeat_yourself
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See also #12454 and the original PR where that was introduced where I pointed that explicitly out. The part with "Custom middlewares are not possible" ;-)
Great. Thanks 👍 |
@@ -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 cloud federation'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it missing the "sharing"?
I think the error messages should stay as they are, "cloud federation" tells me nothing as a user but some buzzwords while "server to server sharing" is hard to misunderstand. A header for the settings it's fine since it's 1) only exposed to admins, 2) the settings themselves still mention sharing. |
In this case, the message should be "Federated Cloud sharing" The error and the admin settings need to line up so that an admin can solve the problem easily. They should be the same... |
3f7a884
to
c4b796e
Compare
@@ -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'));?></h2> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Federated Cloud Sharing here aswell?
@schiesbn can you make the change ? |
c4b796e
to
8a09162
Compare
I fixed it. I'm fine with that change 👍 |
Refer to this link for build results (access rights to CI server needed): |
let's ship it then 👍 |
rename 'server-to-server sharing' to 'federated cloud'
The inspection completed: 2 new issues |
as discussed
cc @karlitschek @MTRichards