Merge remote-tracking branch 'origin/master' into ernolf/configurable…

…_sharetoken_length
nextcloud · Sep 26, 2024 · 5dae0fa · 5dae0fa
2 parents ee24fdd + 0a568e5
commit 5dae0fa
Show file tree

Hide file tree

Showing 107 changed files with 213 additions and 125 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
@@ -276,6 +276,7 @@ OC.L10N.register(
     "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" est un nom réservé et il n'est pas autorisé dans les noms de fichier.",
     "\"{extension}\" is not an allowed filetype." : "\"{extension}\" est un type de fichier interdit.",
     "Filenames must not end with \"{extension}\"." : "Les noms de fichier ne doivent pas se terminer par \"{extension}\".",
+    "List of favorite files and folders." : "Liste des fichiers et dossiers favoris.",
     "No favorites yet" : "Aucun favori pour l'instant",
     "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici",
     "All files" : "Tous les fichiers",
@@ -393,6 +394,9 @@ OC.L10N.register(
     "Text file" : "Fichier texte",
     "New text file.txt" : "Nouveau fichier texte.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Le lien direct a été copié (fonctionne uniquement pour les personnes qui ont accès à ce fichier ou à ce dossier)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Copier le lien direct (fonctionne uniquement pour les personnes pouvant accéder à ce fichier ou à ce dossier)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Copier le lien direct (fonctionne uniquement pour les personnes pouvant accéder à ce fichier ou à ce dossier)",
+    "Favored" : "Favoris",
+    "Favor" : "Mettre en favoris",
+    "Not favored" : "Non favoris"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
@@ -274,6 +274,7 @@
     "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" est un nom réservé et il n'est pas autorisé dans les noms de fichier.",
     "\"{extension}\" is not an allowed filetype." : "\"{extension}\" est un type de fichier interdit.",
     "Filenames must not end with \"{extension}\"." : "Les noms de fichier ne doivent pas se terminer par \"{extension}\".",
+    "List of favorite files and folders." : "Liste des fichiers et dossiers favoris.",
     "No favorites yet" : "Aucun favori pour l'instant",
     "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici",
     "All files" : "Tous les fichiers",
@@ -391,6 +392,9 @@
     "Text file" : "Fichier texte",
     "New text file.txt" : "Nouveau fichier texte.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Le lien direct a été copié (fonctionne uniquement pour les personnes qui ont accès à ce fichier ou à ce dossier)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Copier le lien direct (fonctionne uniquement pour les personnes pouvant accéder à ce fichier ou à ce dossier)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Copier le lien direct (fonctionne uniquement pour les personnes pouvant accéder à ce fichier ou à ce dossier)",
+    "Favored" : "Favoris",
+    "Favor" : "Mettre en favoris",
+    "Not favored" : "Non favoris"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
@@ -276,6 +276,7 @@ OC.L10N.register(
     "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” је резервисано име и не сме се користити као име фајла.",
     "\"{extension}\" is not an allowed filetype." : "„{extension}” није дозвољени тип фајла.",
     "Filenames must not end with \"{extension}\"." : "Имена фајлова не смеју да се завршавају са „{extension}”.",
+    "List of favorite files and folders." : "Листа омиљених фајлова и фолдера.",
     "No favorites yet" : "Још нема омиљених",
     "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде",
     "All files" : "Сви фајлови",
@@ -393,6 +394,9 @@ OC.L10N.register(
     "Text file" : "Tекстуални фајл",
     "New text file.txt" : "Нов текстуални фајл.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Копиран је директан линк (функционише само за особе који имају приступ овом фајлу/фолдеру)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Копирај директни линк (ради само за особе које имају приступ овом фајлу/фолдеру)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Копирај директни линк (ради само за особе које имају приступ овом фајлу/фолдеру)",
+    "Favored" : "Наклоњен",
+    "Favor" : "Наклоност",
+    "Not favored" : "Ненаклоњен"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
@@ -274,6 +274,7 @@
     "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” је резервисано име и не сме се користити као име фајла.",
     "\"{extension}\" is not an allowed filetype." : "„{extension}” није дозвољени тип фајла.",
     "Filenames must not end with \"{extension}\"." : "Имена фајлова не смеју да се завршавају са „{extension}”.",
+    "List of favorite files and folders." : "Листа омиљених фајлова и фолдера.",
     "No favorites yet" : "Још нема омиљених",
     "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде",
     "All files" : "Сви фајлови",
@@ -391,6 +392,9 @@
     "Text file" : "Tекстуални фајл",
     "New text file.txt" : "Нов текстуални фајл.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Копиран је директан линк (функционише само за особе који имају приступ овом фајлу/фолдеру)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Копирај директни линк (ради само за особе које имају приступ овом фајлу/фолдеру)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Копирај директни линк (ради само за особе које имају приступ овом фајлу/фолдеру)",
+    "Favored" : "Наклоњен",
+    "Favor" : "Наклоност",
+    "Not favored" : "Ненаклоњен"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
@@ -276,6 +276,7 @@ OC.L10N.register(
     "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ayrılmış bir ad olduğundan dosya adlarında kullanılamaz.",
     "\"{extension}\" is not an allowed filetype." : "\"{extension}\" dosya uzantısına izin verilmiyor.",
     "Filenames must not end with \"{extension}\"." : "Dosya adları \"{extension}\" ile bitemez.",
+    "List of favorite files and folders." : "Sık kullanılan dosya ve klasör listesi.",
     "No favorites yet" : "Henüz sık kullanılan bir öge yok",
     "Files and folders you mark as favorite will show up here" : "Sık kullanılanlara eklediğiniz dosya ve klasörler burada görüntülenir",
     "All files" : "Tüm dosyalar",
@@ -393,6 +394,9 @@ OC.L10N.register(
     "Text file" : "Metin dosyası",
     "New text file.txt" : "Yeni metin dosyası.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Doğrudan bağlantı kopyalandı (yalnızca bu dosya ya da klasöre erişim izni olan kişiler kullanabilir)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Doğrudan bağlantıyı kopyala (yalnızca bu dosya ya da klasöre erişim izni olan kişiler için)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Doğrudan bağlantıyı kopyala (yalnızca bu dosya ya da klasöre erişim izni olan kişiler için)",
+    "Favored" : "Sık kullanılanlara eklenmiş",
+    "Favor" : "Sık kullanılanlara ekle",
+    "Not favored" : "Sık kullanılanlara eklenmemiş"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
@@ -274,6 +274,7 @@
     "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ayrılmış bir ad olduğundan dosya adlarında kullanılamaz.",
     "\"{extension}\" is not an allowed filetype." : "\"{extension}\" dosya uzantısına izin verilmiyor.",
     "Filenames must not end with \"{extension}\"." : "Dosya adları \"{extension}\" ile bitemez.",
+    "List of favorite files and folders." : "Sık kullanılan dosya ve klasör listesi.",
     "No favorites yet" : "Henüz sık kullanılan bir öge yok",
     "Files and folders you mark as favorite will show up here" : "Sık kullanılanlara eklediğiniz dosya ve klasörler burada görüntülenir",
     "All files" : "Tüm dosyalar",
@@ -391,6 +392,9 @@
     "Text file" : "Metin dosyası",
     "New text file.txt" : "Yeni metin dosyası.txt",
     "Direct link was copied (only works for people who have access to this file/folder)" : "Doğrudan bağlantı kopyalandı (yalnızca bu dosya ya da klasöre erişim izni olan kişiler kullanabilir)",
-    "Copy direct link (only works for people who have access to this file/folder)" : "Doğrudan bağlantıyı kopyala (yalnızca bu dosya ya da klasöre erişim izni olan kişiler için)"
+    "Copy direct link (only works for people who have access to this file/folder)" : "Doğrudan bağlantıyı kopyala (yalnızca bu dosya ya da klasöre erişim izni olan kişiler için)",
+    "Favored" : "Sık kullanılanlara eklenmiş",
+    "Favor" : "Sık kullanılanlara ekle",
+    "Not favored" : "Sık kullanılanlara eklenmemiş"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
@@ -71,9 +71,9 @@ OC.L10N.register(
     "Target folder does not exist any more" : "目标文件夹已不存在",
     "Reload current directory" : "重新载入当前目录",
     "Go to the \"{dir}\" directory" : "前往“{dir}”目录",
-    "Drag and drop files here to upload" : "将文件拖拽至此处以上传",
-    "Your have used your space quota and cannot upload files anymore" : "您已用完您的空间配额,无法再上传更多文件",
-    "You don’t have permission to upload or create files here" : "您没有权限在此上传或创建文件",
+    "Drag and drop files here to upload" : "将文件拖放至此处以上传",
+    "Your have used your space quota and cannot upload files anymore" : "你已用完你的空间配额，无法再上传更多文件",
+    "You don’t have permission to upload or create files here" : "你没有权限在此上传或创建文件",
     "Favorite" : "收藏",
     "\"{displayName}\" action executed successfully" : "“{displayName}”操作执行成功",
     "\"{displayName}\" action failed" : "“{displayName}”操作执行失败",
@@ -288,7 +288,7 @@ OC.L10N.register(
     "Recent" : "最近",
     "List of recently modified files and folders." : "最近修改的文件与文件夹列表。",
     "No recently modified files" : "近期无修改文件",
-    "Files and folders you recently modified will show up here." : "您最近修改的文件与文件夹将会显示在此处。",
+    "Files and folders you recently modified will show up here." : "你最近修改的文件与文件夹将会显示在此处。",
     "You do not have permission to upload or create files here" : "您没有在此上传或创建文件的权限",
     "No entries found in this folder" : "在此文件夹中找不到项目",
     "Select all" : "全部选择",

diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
@@ -69,9 +69,9 @@
     "Target folder does not exist any more" : "目标文件夹已不存在",
     "Reload current directory" : "重新载入当前目录",
     "Go to the \"{dir}\" directory" : "前往“{dir}”目录",
-    "Drag and drop files here to upload" : "将文件拖拽至此处以上传",
-    "Your have used your space quota and cannot upload files anymore" : "您已用完您的空间配额,无法再上传更多文件",
-    "You don’t have permission to upload or create files here" : "您没有权限在此上传或创建文件",
+    "Drag and drop files here to upload" : "将文件拖放至此处以上传",
+    "Your have used your space quota and cannot upload files anymore" : "你已用完你的空间配额，无法再上传更多文件",
+    "You don’t have permission to upload or create files here" : "你没有权限在此上传或创建文件",
     "Favorite" : "收藏",
     "\"{displayName}\" action executed successfully" : "“{displayName}”操作执行成功",
     "\"{displayName}\" action failed" : "“{displayName}”操作执行失败",
@@ -286,7 +286,7 @@
     "Recent" : "最近",
     "List of recently modified files and folders." : "最近修改的文件与文件夹列表。",
     "No recently modified files" : "近期无修改文件",
-    "Files and folders you recently modified will show up here." : "您最近修改的文件与文件夹将会显示在此处。",
+    "Files and folders you recently modified will show up here." : "你最近修改的文件与文件夹将会显示在此处。",
     "You do not have permission to upload or create files here" : "您没有在此上传或创建文件的权限",
     "No entries found in this folder" : "在此文件夹中找不到项目",
     "Select all" : "全部选择",

diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue
@@ -103,7 +103,7 @@ export default {
 		// specific to that situation anyhow. So this covers warning covers
 		// our primary day-to-day concern (individual account quota usage).
 		//
-		if (this.storageStats?.quota > 0 && this.storageStats?.free <= 0) {
+		if (this.storageStats?.quota > 0 && this.storageStats?.free === 0) {
 			this.showStorageFullWarning()
 		}
 	},
@@ -138,7 +138,7 @@ export default {
 
 				// Warn the user if the available account storage changed from > 0 to 0
 				// (unless only because quota was intentionally set to 0 by admin in the interim)
-				if (this.storageStats?.free > 0 && response.data.data?.free <= 0 && response.data.data?.quota > 0) {
+				if (this.storageStats?.free > 0 && response.data.data?.free === 0 && response.data.data?.quota > 0) {
 					this.showStorageFullWarning()
 				}
 

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -160,6 +160,8 @@ protected function relativePath($fullPath) {
 	 * @param string $path
 	 * @return IFileInfo
 	 * @throws StorageAuthException
+	 * @throws \OCP\Files\NotFoundException
+	 * @throws \OCP\Files\ForbiddenException
 	 */
 	protected function getFileInfo($path) {
 		try {
@@ -336,7 +338,7 @@ public function rename($source, $target, $retry = true): bool {
 	public function stat($path, $retry = true) {
 		try {
 			$result = $this->formatInfo($this->getFileInfo($path));
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
@@ -557,7 +559,7 @@ public function getMetaData($path) {
 			$fileInfo = $this->getFileInfo($path);
 		} catch (\OCP\Files\NotFoundException $e) {
 			return null;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return null;
 		}
 		if (!$fileInfo) {
@@ -633,7 +635,7 @@ public function filetype($path) {
 			return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		}
 	}
@@ -668,7 +670,7 @@ public function file_exists($path) {
 			return true;
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		} catch (ConnectException $e) {
 			throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
@@ -681,7 +683,7 @@ public function isReadable($path) {
 			return $this->showHidden || !$info->isHidden();
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		}
 	}
@@ -694,7 +696,7 @@ public function isUpdatable($path) {
 			return ($this->showHidden || !$info->isHidden()) && (!$info->isReadOnly() || $info->isDirectory());
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		}
 	}
@@ -705,7 +707,7 @@ public function isDeletable($path) {
 			return ($this->showHidden || !$info->isHidden()) && !$info->isReadOnly();
 		} catch (\OCP\Files\NotFoundException $e) {
 			return false;
-		} catch (ForbiddenException $e) {
+		} catch (\OCP\Files\ForbiddenException $e) {
 			return false;
 		}
 	}