wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix federation strings

Browse source
This commit is contained in:
Morris Jobke 2016-06-20 10:17:12 +02:00
parent 416466b700
commit 9107fd6cd6
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/federation/appinfo/info.xml
View file

@ -2,7 +2,7 @@
<info>
<id>federation</id>
<name>Federation</name>
<description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
<version>0.1.0</version>

6
apps/federation/lib/Controller/SettingsController.php
View file

@ -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);
}

4
apps/federation/lib/DbHandler.php
View file

@ -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
*/

6
apps/federation/lib/TrustedServers.php
View file

@ -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;
}

4
apps/federation/templates/settings-admin.php
View file

@ -8,14 +8,14 @@ style('federation', 'settings-admin')
?>
<div id="ocFederationSettings" class="section">
<h2><?php p($l->t('Federation')); ?></h2>
<em><?php p($l->t('ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
<p>
<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
</p>
<h3><?php p($l->t('Trusted ownCloud Servers')); ?></h3>
<h3><?php p($l->t('Trusted Servers')); ?></h3>
<p id="ocFederationAddServer">
<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add ownCloud server')); ?></button>
<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('ownCloud Server')); ?>" name="server_url"/>

2
apps/federation/tests/TrustedServersTest.php
View file

@ -341,7 +341,7 @@ class TrustedServersTest extends TestCase {
/**
* @dataProvider dataTestCheckOwnCloudVersionTooLow
* @expectedException \OC\HintException
* @expectedExceptionMessage Remote server version is too low. ownCloud 9.0 is required.
* @expectedExceptionMessage Remote server version is too low. 9.0 is required.
*/
public function testCheckOwnCloudVersionTooLow($status) {
$this->invokePrivate($this->trustedServers, 'checkOwnCloudVersion', [$status]);