summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/File.php1
-rw-r--r--apps/federatedfilesharing/templates/settings-admin.php1
-rw-r--r--apps/federation/css/settings-admin.css4
-rw-r--r--apps/federation/templates/settings-admin.php18
-rw-r--r--apps/sharebymail/css/settings-admin.css2
-rw-r--r--apps/sharebymail/lib/Activity.php8
-rw-r--r--apps/sharebymail/templates/settings-admin.php3
-rw-r--r--apps/systemtags/templates/admin.php3
-rw-r--r--apps/theming/templates/settings-admin.php1
-rw-r--r--apps/updatenotification/templates/admin.php2
-rw-r--r--apps/user_ldap/lib/Notification/Notifier.php14
-rw-r--r--apps/user_ldap/lib/User/User.php2
12 files changed, 35 insertions, 24 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 1f878df1564..d0a01ef255b 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -512,6 +512,7 @@ class File extends Node implements IFile {
// TODO: in the future use ChunkHandler provided by storage
return !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') &&
!$storage->instanceOfStorage('OC\Files\Storage\OwnCloud') &&
+ !$storage->instanceOfStorage('OC\Files\ObjectStore\ObjectStoreStorage') &&
$storage->needsPartFile();
}
diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index b60ff1083b0..7343a867d53 100644
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -9,7 +9,6 @@ script('federatedfilesharing', 'settings-admin');
<a target="_blank" rel="noreferrer" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
-
<p>
<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css
index 97a50785f82..3fd5f5aea6d 100644
--- a/apps/federation/css/settings-admin.css
+++ b/apps/federation/css/settings-admin.css
@@ -1,9 +1,9 @@
#ocFederationSettings p {
- padding-top: 10px;
+ padding-bottom: 10px;
}
#listOfTrustedServers li {
- padding-top: 10px;
+ padding-bottom: 10px;
}
.removeTrustedServer {
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index dbcb4a54e6a..f0c2db81961 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -7,21 +7,14 @@ script('federation', 'settings-admin');
style('federation', 'settings-admin')
?>
<div id="ocFederationSettings" class="section">
- <h2><?php p($l->t('Federation')); ?></h2>
- <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>
+ <h2><?php p($l->t('Trusted servers')); ?></h2>
+ <p class="settings-hint"><?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.')); ?></p>
<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 servers')); ?></h3>
- <p id="ocFederationAddServer">
- <button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add trusted server')); ?></button>
- <input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Trusted server')); ?>" name="server_url"/>
- <button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button>
- <span class="msg"></span>
- </p>
<ul id="listOfTrustedServers">
<?php foreach($_['trustedServers'] as $trustedServer) { ?>
<li id="<?php p($trustedServer['id']); ?>">
@@ -41,6 +34,11 @@ style('federation', 'settings-admin')
</li>
<?php } ?>
</ul>
+ <p id="ocFederationAddServer">
+ <button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add trusted server')); ?></button>
+ <input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Trusted server')); ?>" name="server_url"/>
+ <button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button>
+ <span class="msg"></span>
+ </p>
</div>
-
diff --git a/apps/sharebymail/css/settings-admin.css b/apps/sharebymail/css/settings-admin.css
index c7bfb122f3e..fc6093ad525 100644
--- a/apps/sharebymail/css/settings-admin.css
+++ b/apps/sharebymail/css/settings-admin.css
@@ -1,3 +1,3 @@
#ncShareByMailSettings p {
- padding-top: 10px;
+ padding-bottom: 10px;
}
diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php
index 6dc462bf492..73751cb241e 100644
--- a/apps/sharebymail/lib/Activity.php
+++ b/apps/sharebymail/lib/Activity.php
@@ -173,17 +173,17 @@ class Activity implements IProvider {
->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters)
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
- $event->setParsedSubject($this->l->t('Password to access %1$s was send to %2s', [
+ $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
$parsedParameters['file']['path'],
$parsedParameters['email']['name']
]))
- ->setRichSubject($this->l->t('Password to access {file} was send to {email}'), $parsedParameters)
+ ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters)
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
$event->setParsedSubject(
- $this->l->t('Password to access %1$s was send to you',
+ $this->l->t('Password to access %1$s was sent to you',
[$parsedParameters['file']['path']]))
- ->setRichSubject($this->l->t('Password to access {file} was send to you'), $parsedParameters)
+ ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters)
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
} else {
diff --git a/apps/sharebymail/templates/settings-admin.php b/apps/sharebymail/templates/settings-admin.php
index 3af98741e52..50fede86685 100644
--- a/apps/sharebymail/templates/settings-admin.php
+++ b/apps/sharebymail/templates/settings-admin.php
@@ -8,7 +8,7 @@ style('sharebymail', 'settings-admin');
?>
<div id="ncShareByMailSettings" class="section">
<h2><?php p($l->t('Share by mail')); ?></h2>
- <em><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></em>
+ <p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
<p>
<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
@@ -18,4 +18,3 @@ style('sharebymail', 'settings-admin');
</p>
</div>
-
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index de97b283d09..e964f610ca1 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -33,8 +33,9 @@ script('systemtags', 'admin');
<form id="systemtags" class="section" data-systemtag-id="">
<h2><?php p($l->t('Collaborative tags')); ?></h2>
+ <p class="settings-hint"><?php p($l->t('Create and edit collaborative tags. These tags affect all users.')); ?></p>
- <input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag…')); ?>" style="width: 400px;" />
+ <input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag …')); ?>" style="width: 400px;" />
<br><br>
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index 920b4a007da..61fe57c3c75 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -28,6 +28,7 @@ style('theming', 'settings-admin');
?>
<div id="theming" class="section">
<h2 class="inlineblock"><?php p($l->t('Theming')); ?></h2>
+ <p class="settings-hint"><?php p($l->t('Theming makes it possible to easily customize the look and feel of your instance. This will be visible for all users.')); ?></p>
<div id="theming_settings_msg" class="msg success inlineblock" style="display: none;">Saved</div>
<?php if ($_['themable'] === false) { ?>
<p>
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index 28a47992410..dcea7cf3e6b 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -23,7 +23,7 @@
<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
<?php } ?>
<?php } else { ?>
- <strong><?php p($l->t('Your version is up to date.')); ?></strong>
+ <?php p($l->t('Your version is up to date.')); ?>
<span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span>
<?php } ?>
diff --git a/apps/user_ldap/lib/Notification/Notifier.php b/apps/user_ldap/lib/Notification/Notifier.php
index a6053cfcb19..0099d764f03 100644
--- a/apps/user_ldap/lib/Notification/Notifier.php
+++ b/apps/user_ldap/lib/Notification/Notifier.php
@@ -60,7 +60,19 @@ class Notifier implements INotifier {
switch ($notification->getSubject()) {
// Deal with known subjects
case 'pwd_exp_warn_days':
- $notification->setParsedSubject($l->t('Your password will expire within %s day(s).', $notification->getSubjectParameters()));
+ $params = $notification->getSubjectParameters();
+ $days = (int) $params[0];
+ if ($days === 2) {
+ $notification->setParsedSubject($l->t('Your password will expire tomorrow.', $days));
+ } else if ($days === 1) {
+ $notification->setParsedSubject($l->t('Your password will expire today.', $days));
+ } else {
+ $notification->setParsedSubject($l->n(
+ 'Your password will expire within %n day.',
+ 'Your password will expire within %n days.',
+ $days
+ ));
+ }
return $notification;
default:
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index a9e7eb6cc0c..5017f35ed0a 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -683,7 +683,7 @@ class User {
->setUser($uid)
->setDateTime($currentDateTime)
->setObject('pwd_exp_warn', $uid)
- ->setSubject('pwd_exp_warn_days', [strval(ceil($secondsToExpiry / 60 / 60 / 24))])
+ ->setSubject('pwd_exp_warn_days', [(int) ceil($secondsToExpiry / 60 / 60 / 24)])
;
$this->notificationManager->notify($notification);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 05:03:54 +0000