aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php1
-rw-r--r--lib/l10n/es.js2
-rw-r--r--lib/l10n/es.json2
-rw-r--r--lib/l10n/pl.js2
-rw-r--r--lib/l10n/pl.json2
-rw-r--r--lib/l10n/pt_BR.js2
-rw-r--r--lib/l10n/pt_BR.json2
-rw-r--r--lib/l10n/sw.js3
-rw-r--r--lib/l10n/sw.json3
-rw-r--r--lib/l10n/zh_TW.js2
-rw-r--r--lib/l10n/zh_TW.json2
-rw-r--r--lib/private/Streamer.php13
-rw-r--r--lib/private/User/DisplayNameCache.php6
13 files changed, 36 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php
index a603f67d78e..ab838d366b1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -243,6 +243,7 @@ class OC {
// render error page
$template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest');
\OCP\Util::addScript('core', 'maintenance');
+ \OCP\Util::addScript('core', 'common');
\OCP\Util::addStyle('core', 'guest');
$template->printPage();
die();
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index a01ed7e43b8..91f0c8920c5 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -129,6 +129,8 @@ OC.L10N.register(
"Settings" : "Ajustes",
"Log out" : "Cerrar sesión",
"Accounts" : "Cuentas",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Ver %s en Bluesky",
"Email" : "Correo electrónico",
"Mail %s" : "Correo %s",
"Fediverse" : "Fediverso",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index fc43c0e1d91..fd606bfb8a0 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -127,6 +127,8 @@
"Settings" : "Ajustes",
"Log out" : "Cerrar sesión",
"Accounts" : "Cuentas",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Ver %s en Bluesky",
"Email" : "Correo electrónico",
"Mail %s" : "Correo %s",
"Fediverse" : "Fediverso",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 8392d2b48b8..eb66a56742e 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -129,6 +129,8 @@ OC.L10N.register(
"Settings" : "Ustawienia",
"Log out" : "Wyloguj",
"Accounts" : "Konta",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Wyświetl %s na Bluesky",
"Email" : "E-mail",
"Mail %s" : "Poczta %s",
"Fediverse" : "Fediverse",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 10b4a8379a5..0138279e46b 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -127,6 +127,8 @@
"Settings" : "Ustawienia",
"Log out" : "Wyloguj",
"Accounts" : "Konta",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Wyświetl %s na Bluesky",
"Email" : "E-mail",
"Mail %s" : "Poczta %s",
"Fediverse" : "Fediverse",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index e8373461705..0e28c2f9102 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -129,6 +129,8 @@ OC.L10N.register(
"Settings" : "Configurações",
"Log out" : "Sair",
"Accounts" : "Contas",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Ver %s no Bluesky",
"Email" : "E-mail",
"Mail %s" : "Enviar e-mail para %s",
"Fediverse" : "Fediverso",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 7293cdb880a..40b5c4e5807 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -127,6 +127,8 @@
"Settings" : "Configurações",
"Log out" : "Sair",
"Accounts" : "Contas",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "Ver %s no Bluesky",
"Email" : "E-mail",
"Mail %s" : "Enviar e-mail para %s",
"Fediverse" : "Fediverso",
diff --git a/lib/l10n/sw.js b/lib/l10n/sw.js
index 84ddd8abf9b..aa914220945 100644
--- a/lib/l10n/sw.js
+++ b/lib/l10n/sw.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"lib",
{
+ "Other activities" : "Other activities",
"Authentication" : "Uthibitisho",
"Unknown filetype" : "Aina ya faili haijulikani",
"Invalid image" : "Taswira si halisi",
@@ -22,12 +23,14 @@ OC.L10N.register(
"Settings" : "Mipangilio",
"Log out" : "Ondoka",
"Accounts" : "Akaunti",
+ "Bluesky" : "Bluesky",
"Email" : "Barua pepe",
"Phone" : "Simu",
"Twitter" : "Twitter",
"Website" : "Wavuti",
"Address" : "Anwani",
"About" : "Kuhusu",
+ "Display name" : "Display name",
"Additional settings" : "Mipangilio ya nyongeza",
"%1$s shared %2$s with you" : "%1$s ameshirikisha %2$s na wewe",
"Open %s" : "Fungua %s",
diff --git a/lib/l10n/sw.json b/lib/l10n/sw.json
index 6adf1f1d8ee..f0dc60848ce 100644
--- a/lib/l10n/sw.json
+++ b/lib/l10n/sw.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Other activities" : "Other activities",
"Authentication" : "Uthibitisho",
"Unknown filetype" : "Aina ya faili haijulikani",
"Invalid image" : "Taswira si halisi",
@@ -20,12 +21,14 @@
"Settings" : "Mipangilio",
"Log out" : "Ondoka",
"Accounts" : "Akaunti",
+ "Bluesky" : "Bluesky",
"Email" : "Barua pepe",
"Phone" : "Simu",
"Twitter" : "Twitter",
"Website" : "Wavuti",
"Address" : "Anwani",
"About" : "Kuhusu",
+ "Display name" : "Display name",
"Additional settings" : "Mipangilio ya nyongeza",
"%1$s shared %2$s with you" : "%1$s ameshirikisha %2$s na wewe",
"Open %s" : "Fungua %s",
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index a12ad471433..c6ff09d8cac 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -129,6 +129,8 @@ OC.L10N.register(
"Settings" : "設定",
"Log out" : "登出",
"Accounts" : "帳號",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "在 Bluesky 上檢視 %s",
"Email" : "電子郵件",
"Mail %s" : "寄送郵件給 %s",
"Fediverse" : "聯邦宇宙",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 0e01a122735..01e63631f3b 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -127,6 +127,8 @@
"Settings" : "設定",
"Log out" : "登出",
"Accounts" : "帳號",
+ "Bluesky" : "Bluesky",
+ "View %s on Bluesky" : "在 Bluesky 上檢視 %s",
"Email" : "電子郵件",
"Mail %s" : "寄送郵件給 %s",
"Fediverse" : "聯邦宇宙",
diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php
index de663f66e0d..e579c42c0d7 100644
--- a/lib/private/Streamer.php
+++ b/lib/private/Streamer.php
@@ -170,11 +170,16 @@ class Streamer {
/**
* Add an empty directory entry to the archive.
*
- * @param string $dirName Directory Path and name to be added to the archive.
- * @return bool $success
+ * @param $dirName - Directory Path and name to be added to the archive.
+ * @param $timestamp - Modification time of the directory (defaults to current time)
*/
- public function addEmptyDir($dirName) {
- return $this->streamerInstance->addEmptyDir($dirName);
+ public function addEmptyDir(string $dirName, int $timestamp = 0): bool {
+ $options = null;
+ if ($timestamp > 0) {
+ $options = ['timestamp' => $timestamp];
+ }
+
+ return $this->streamerInstance->addEmptyDir($dirName, $options);
}
/**
diff --git a/lib/private/User/DisplayNameCache.php b/lib/private/User/DisplayNameCache.php
index 40e1c752589..4321d95f88e 100644
--- a/lib/private/User/DisplayNameCache.php
+++ b/lib/private/User/DisplayNameCache.php
@@ -25,6 +25,8 @@ use OCP\User\Events\UserDeletedEvent;
* @template-implements IEventListener<UserChangedEvent|UserDeletedEvent>
*/
class DisplayNameCache implements IEventListener {
+ private const CACHE_TTL = 24 * 60 * 60; // 1 day
+
private array $cache = [];
private ICache $memCache;
private IUserManager $userManager;
@@ -56,7 +58,7 @@ class DisplayNameCache implements IEventListener {
$displayName = null;
}
$this->cache[$userId] = $displayName;
- $this->memCache->set($userId, $displayName, 60 * 10); // 10 minutes
+ $this->memCache->set($userId, $displayName, self::CACHE_TTL);
return $displayName;
}
@@ -71,7 +73,7 @@ class DisplayNameCache implements IEventListener {
$userId = $event->getUser()->getUID();
$newDisplayName = $event->getValue();
$this->cache[$userId] = $newDisplayName;
- $this->memCache->set($userId, $newDisplayName, 60 * 10); // 10 minutes
+ $this->memCache->set($userId, $newDisplayName, self::CACHE_TTL);
}
if ($event instanceof UserDeletedEvent) {
$userId = $event->getUser()->getUID();
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 05:58:04 +0000