mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename External storages to External storage 

Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2021-05-20 12:13:04 +02:00
parent 7ffee26aa8
commit 35d978c2fc
19 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/appinfo/app.php
View File

@ -43,7 +43,7 @@ $appContainer = \OCA\Files_External\MountConfig::$app->getContainer();
'appname' => 'files_external',
'script' => 'list.php',
'order' => 30,
'name' => $l->t('External storages'),
'name' => $l->t('External storage'),
];
});

2
apps/files_external/js/app.js
View File

@ -34,7 +34,7 @@ OCA.Files_External.App = {
);
this._extendFileList(this.fileList);
this.fileList.appName = t('files_external', 'External storages');
this.fileList.appName = t('files_external', 'External storage');
return this.fileList;
},

2
apps/files_external/js/mountsfilelist.js
View File

@ -28,7 +28,7 @@
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Files_External.FileList.prototype */ {
appName: 'External storages',
appName: 'External storage',
_allowSelection: false,

2
apps/files_external/lib/Service/GlobalStoragesService.php
View File

@ -33,7 +33,7 @@ use OC\Files\Filesystem;
use OCA\Files_External\Lib\StorageConfig;
/**
* Service class to manage global external storages
* Service class to manage global external storage
*/
class GlobalStoragesService extends StoragesService {
/**

2
apps/files_external/lib/Service/LegacyStoragesService.php
View File

@ -97,7 +97,7 @@ abstract class LegacyStoragesService {
}
/**
* Read the external storages config
* Read the external storage config
*
* @return StorageConfig[] map of storage id to storage config
*/

4
apps/files_external/lib/Service/StoragesService.php
View File

@ -45,7 +45,7 @@ use OCP\Files\StorageNotAvailableException;
use OCP\ILogger;
/**
* Service class to manage external storages
* Service class to manage external storage
*/
abstract class StoragesService {
@ -125,7 +125,7 @@ abstract class StoragesService {
}
/**
* Read the external storages config
* Read the external storage config
*
* @return array map of storage id to storage config
*/

2
apps/files_external/lib/Service/UserStoragesService.php
View File

@ -36,7 +36,7 @@ use OCP\Files\Config\IUserMountCache;
use OCP\IUserSession;
/**
* Service class to manage user external storages
* Service class to manage user external storage
* (aka personal storages)
*/
class UserStoragesService extends StoragesService {

2
apps/files_external/lib/Settings/Section.php
View File

@ -60,7 +60,7 @@ class Section implements IIconSection {
* @return string
*/
public function getName() {
return $this->l->t('External storages');
return $this->l->t('External storage');
}
/**

4
apps/files_external/templates/settings.php
View File

@ -101,7 +101,7 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
</div>
<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
@ -207,7 +207,7 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
<form autocomplete="false" action="#"
id="global_credentials" method="post">
<h2><?php p($l->t('Global credentials')); ?></h2>
<p class="settings-hint"><?php p($l->t('Global credentials can be used to authenticate with multiple external storages that have the same credentials.')); ?></p>
<p class="settings-hint"><?php p($l->t('Global credentials can be used to authenticate with multiple external storage that have the same credentials.')); ?></p>
<input type="text" name="username"
autocomplete="false"
value="<?php p($_['globalCredentials']['user']); ?>"

6
apps/files_external/tests/Settings/SectionTest.php
View File

@ -57,10 +57,10 @@ class SectionTest extends TestCase {
$this->l
->expects($this->once())
->method('t')
->with('External storages')
->willReturn('External storages');
->with('External storage')
->willReturn('External storage');
$this->assertSame('External storages', $this->section->getName());
$this->assertSame('External storage', $this->section->getName());
}
public function testGetPriority() {

2
apps/files_external/tests/js/mountsfilelistSpec.js
View File

@ -72,7 +72,7 @@ describe('OCA.Files_External.FileList tests', function() {
alertStub.restore();
});
describe('loading file list for external storages', function() {
describe('loading file list for external storage', function() {
var ocsResponse;
var reloading;

2
apps/files_sharing/lib/External/Mount.php vendored
View File

@ -71,7 +71,7 @@ class Mount extends MountPoint implements MoveableMount {
}
/**
* Get the type of mount point, used to distinguish things like shares and external storages
* Get the type of mount point, used to distinguish things like shares and external storage
* in the web interface
*
* @return string

2
apps/workflowengine/lib/Check/FileName.php
View File

@ -54,7 +54,7 @@ class FileName extends AbstractStringCheck implements IFileCheck {
protected function getActualValue(): string {
$fileName = $this->path === null ? '' : basename($this->path);
if ($fileName === '' && (!$this->storage->isLocal() || $this->storage->instanceOfStorage(Local::class))) {
// Return the mountpoint name of external storages that are not mounted as user home
// Return the mountpoint name of external storage that are not mounted as user home
$mountPoints = $this->mountManager->findByStorageId($this->storage->getId());
if (empty($mountPoints) || $mountPoints[0]->getMountType() !== 'external') {
return $fileName;

2
build/integration/features/external-storage.feature
View File

@ -24,7 +24,7 @@ Feature: external-storage
| token | A_TOKEN |
| mimetype | httpd/unix-directory |
Scenario: Shares don't overwrite external storages
Scenario: Shares don't overwrite external storage
Given user "user0" exists
And user "user1" exists
And As an "user0"

4
config/config.sample.php
View File

@ -1548,7 +1548,7 @@ $CONFIG = [
/**
* Override where Nextcloud stores temporary files. Useful in situations where
* the system temporary directory is on a limited space ramdisk or is otherwise
* restricted, or if external storages which do not support streaming are in
* restricted, or if external storage which do not support streaming are in
* use.
*
* The Web server user must have write access to this directory.
@ -1682,7 +1682,7 @@ $CONFIG = [
/**
* Specifies how often the local filesystem (the Nextcloud data/ directory, and
* NFS mounts in data/) is checked for changes made outside Nextcloud. This
* does not apply to external storages.
* does not apply to external storage.
*
* 0 -> Never check the filesystem for outside changes, provides a performance
* increase when it's certain that no changes are made directly to the

2
lib/private/Share20/Manager.php
View File

@ -1665,7 +1665,7 @@ class Manager implements IManager {
return $al;
}
//Get node for the owner and correct the owner in case of external storages
//Get node for the owner and correct the owner in case of external storage
$userFolder = $this->rootFolder->getUserFolder($owner);
if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
$nodes = $userFolder->getById($path->getId());

2
lib/private/Streamer.php
View File

@ -78,7 +78,7 @@ class Streamer {
* larger than 4GiB), but it should not happen in the real world.
*
* We also have to check for a size above 0. As negative sizes could be
* from not fully scanned external storages. And then things fall apart
* from not fully scanned external storage. And then things fall apart
* if somebody tries to package to much.
*/
if ($size > 0 && $size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {

2
lib/public/Files/Config/IUserMountCache.php
View File

@ -111,7 +111,7 @@ interface IUserMountCache {
* Get the used space for users
*
* Note that this only includes the space in their home directory,
* not any incoming shares or external storages.
* not any incoming shares or external storage.
*
* @param IUser[] $users
* @return int[] [$userId => $userSpace]

2
lib/public/Files/Mount/IMountPoint.php
View File

@ -121,7 +121,7 @@ interface IMountPoint {
public function getMountId();
/**
* Get the type of mount point, used to distinguish things like shares and external storages
* Get the type of mount point, used to distinguish things like shares and external storage
* in the web interface
*
* @return string