Merge branch 'stable32' into release/32.0.7_rc1

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

Author: skjnldsv

apps/dav/l10n/hr.js

@@ -236,6 +236,7 @@ OC.L10N.register(
     "Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
     "Could not open file: %1$s (%2$d), file does seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka postoji",
     "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka ne postoji",
+    "Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
     "Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
     "Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
     "Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
     "Completed on %s" : "Završeno na %s",
     "Due on %s by %s" : "%s treba završiti do %s",
     "Due on %s" : "Treba završiti do %s",
+    "This is an example contact" : "Ovo je primjer kontakta",
     "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Dobrodošli u Nextcloud Kalendar!\n\nOvo je primjer događaja – istražite fleksibilnost planiranja s Nextcloud Kalendarom tako da napravite bilo kakve izmjene koje želite!\n\nUz Nextcloud Kalendar možete:\n- Jednostavno stvarati, uređivati i upravljati događajima..\n- Stvarati više kalendara i dijeliti ih s kolegama, prijateljima ili obitelji.\n- Provjeravati dostupnost i drugima prikazivati svoja zauzeta razdoblja.\n- Neprimjetno se integrirati s aplikacijama i uređajima putem CalDAV-a.\n- Prilagoditi svoje iskustvo: zakazivati ponavljajuće događaje, prilagođavati obavijesti i druge postavke.",
     "Example event - open me!" : "Primjer događaja – otvori me!",
     "System Address Book" : "Adresar sustava",

apps/dav/l10n/hr.json

@@ -234,6 +234,7 @@
     "Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
     "Could not open file: %1$s (%2$d), file does seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka postoji",
     "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka ne postoji",
+    "Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
     "Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
     "Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
     "Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -250,6 +251,7 @@
     "Completed on %s" : "Završeno na %s",
     "Due on %s by %s" : "%s treba završiti do %s",
     "Due on %s" : "Treba završiti do %s",
+    "This is an example contact" : "Ovo je primjer kontakta",
     "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Dobrodošli u Nextcloud Kalendar!\n\nOvo je primjer događaja – istražite fleksibilnost planiranja s Nextcloud Kalendarom tako da napravite bilo kakve izmjene koje želite!\n\nUz Nextcloud Kalendar možete:\n- Jednostavno stvarati, uređivati i upravljati događajima..\n- Stvarati više kalendara i dijeliti ih s kolegama, prijateljima ili obitelji.\n- Provjeravati dostupnost i drugima prikazivati svoja zauzeta razdoblja.\n- Neprimjetno se integrirati s aplikacijama i uređajima putem CalDAV-a.\n- Prilagoditi svoje iskustvo: zakazivati ponavljajuće događaje, prilagođavati obavijesti i druge postavke.",
     "Example event - open me!" : "Primjer događaja – otvori me!",
     "System Address Book" : "Adresar sustava",

apps/dav/l10n/zh_CN.js

@@ -236,6 +236,7 @@ OC.L10N.register(
     "Failed to check file size: %1$s" : "检查文件大小失败：%1$s",
     "Could not open file: %1$s (%2$d), file does seem to exist" : "无法打开文件：%1$s（%2$d），文件似乎不存在",
     "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "无法打开文件：%1$s（%2$d），文件似乎不存在",
+    "Failed to get size for : %1$s" : "无法获取以下项目的大小：%1$s",
     "Encryption not ready: %1$s" : "加密不可用：%1$s",
     "Failed to open file: %1$s" : "打开文件失败：%1$s",
     "Failed to unlink: %1$s" : "解除链接失败：%1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
     "Completed on %s" : "已完成 %s",
     "Due on %s by %s" : "到期于 %s，在 %s 之前",
     "Due on %s" : "到期于 %s",
+    "This is an example contact" : "这是一个示例联系人",
     "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "欢迎使用 Nextcloud 日历！\n\n这是一个示例事件——探索使用 Nextcloud 日历进行规划的灵活性，进行任何您想要的编辑！\n\n使用 Nextcloud 日历，您可以：\n- 轻松创建、编辑和管理事件。\n- 创建多个日历并与队友、朋友或家人共享。\n- 查看空闲时间并向他人显示您的忙碌时间。\n- 通过 CalDAV 与应用和设备无缝集成。\n- 自定义您的体验：安排重复事件、调整通知和其他设置。",
     "Example event - open me!" : "示例事件——打开我！",
     "System Address Book" : "系统通讯录",

apps/dav/l10n/zh_CN.json

@@ -234,6 +234,7 @@
     "Failed to check file size: %1$s" : "检查文件大小失败：%1$s",
     "Could not open file: %1$s (%2$d), file does seem to exist" : "无法打开文件：%1$s（%2$d），文件似乎不存在",
     "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "无法打开文件：%1$s（%2$d），文件似乎不存在",
+    "Failed to get size for : %1$s" : "无法获取以下项目的大小：%1$s",
     "Encryption not ready: %1$s" : "加密不可用：%1$s",
     "Failed to open file: %1$s" : "打开文件失败：%1$s",
     "Failed to unlink: %1$s" : "解除链接失败：%1$s",
@@ -250,6 +251,7 @@
     "Completed on %s" : "已完成 %s",
     "Due on %s by %s" : "到期于 %s，在 %s 之前",
     "Due on %s" : "到期于 %s",
+    "This is an example contact" : "这是一个示例联系人",
     "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "欢迎使用 Nextcloud 日历！\n\n这是一个示例事件——探索使用 Nextcloud 日历进行规划的灵活性，进行任何您想要的编辑！\n\n使用 Nextcloud 日历，您可以：\n- 轻松创建、编辑和管理事件。\n- 创建多个日历并与队友、朋友或家人共享。\n- 查看空闲时间并向他人显示您的忙碌时间。\n- 通过 CalDAV 与应用和设备无缝集成。\n- 自定义您的体验：安排重复事件、调整通知和其他设置。",
     "Example event - open me!" : "示例事件——打开我！",
     "System Address Book" : "系统通讯录",

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -16,6 +16,7 @@
 use OCP\Calendar\Exceptions\CalendarException;
 use OCP\Calendar\ICalendarExport;
 use OCP\Calendar\ICalendarIsEnabled;
+use OCP\Calendar\ICalendarIsPublic;
 use OCP\Calendar\ICalendarIsShared;
 use OCP\Calendar\ICalendarIsWritable;
 use OCP\Calendar\ICreateFromString;
@@ -32,7 +33,7 @@
 
 use function Sabre\Uri\split as uriSplit;
 
-class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsWritable, ICalendarIsShared, ICalendarExport, ICalendarIsEnabled {
+class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsWritable, ICalendarIsShared, ICalendarExport, ICalendarIsEnabled, ICalendarIsPublic {
 	public function __construct(
 		private Calendar $calendar,
 		/** @var array<string, mixed> */
@@ -168,6 +169,13 @@ public function isShared(): bool {
 		return $this->calendar->isShared();
 	}
 
+	/**
+	 * @since 33.0.1, 32.0.7, 31.0.14.1, 30.0.17.8
+	 */
+	public function getPublicToken(): ?string {
+		return $this->calendar->getPublishStatus() ?: null;
+	}
+
 	/**
 	 * @throws CalendarException
 	 */
@@ -336,5 +344,4 @@ public function export(?CalendarExportOptions $options = null): Generator {
 			}
 		}
 	}
-
 }

apps/dav/tests/unit/CalDAV/CalendarImplTest.php

@@ -33,7 +33,7 @@ protected function setUp(): void {
 		$this->backend = $this->createMock(CalDavBackend::class);
 		$this->calendar = $this->createMock(Calendar::class);
 		$this->calendarInfo = [
-			'id' => 'fancy_id_123',
+			'id' => 123,
 			'{DAV:}displayname' => 'user readable name 123',
 			'{http://apple.com/ns/ical/}calendar-color' => '#AABBCC',
 			'uri' => '/this/is/a/uri',
@@ -62,7 +62,7 @@ protected function setUp(): void {
 
 
 	public function testGetKey(): void {
-		$this->assertEquals($this->calendarImpl->getKey(), 'fancy_id_123');
+		$this->assertEquals($this->calendarImpl->getKey(), '123');
 	}
 
 	public function testGetDisplayname(): void {
@@ -73,6 +73,18 @@ public function testGetDisplayColor(): void {
 		$this->assertEquals($this->calendarImpl->getDisplayColor(), '#AABBCC');
 	}
 
+	public function testGetPublicToken(): void {
+		$publicToken = $this->calendar->setPublishStatus(true);
+
+		$this->assertEquals($this->calendarImpl->getPublicToken(), $publicToken);
+	}
+
+	public function testGetPublicTokenWithPrivateCalendar(): void {
+		$this->calendar->setPublishStatus(false);
+
+		$this->assertNull($this->calendarImpl->getPublicToken());
+	}
+
 	public function testSearch(): void {
 		$this->backend->expects($this->once())
 			->method('search')
@@ -266,5 +278,4 @@ public function getHrefs(): array {
 
 		$calendarImpl->handleIMipMessage('fakeUser', $vObject->serialize());
 	}
-
 }

apps/federatedfilesharing/src/components/AdminSettings.vue

@@ -73,8 +73,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
 
-import '@nextcloud/password-confirmation/dist/style.css'
-
 export default {
 	name: 'AdminSettings',
 

apps/files/l10n/hr.js

@@ -95,6 +95,7 @@ OC.L10N.register(
     "Another entry with the same name already exists." : "Već postoji drugi upis s istim nazivom.",
     "Invalid filename." : "Nevažeći naziv datoteke.",
     "Rename file" : "Preimenuj datoteku",
+    "Recently created" : "Nedavno stvoreno",
     "Folder" : "Mapa",
     "Unknown file type" : "Nepoznata vrsta datoteke",
     "{ext} image" : "{ext} slika",

apps/files/l10n/hr.json

@@ -93,6 +93,7 @@
     "Another entry with the same name already exists." : "Već postoji drugi upis s istim nazivom.",
     "Invalid filename." : "Nevažeći naziv datoteke.",
     "Rename file" : "Preimenuj datoteku",
+    "Recently created" : "Nedavno stvoreno",
     "Folder" : "Mapa",
     "Unknown file type" : "Nepoznata vrsta datoteke",
     "{ext} image" : "{ext} slika",

apps/files/l10n/zh_CN.js

@@ -95,6 +95,7 @@ OC.L10N.register(
     "Another entry with the same name already exists." : "另一相同名称的条目已存在。",
     "Invalid filename." : "无效文件名称。",
     "Rename file" : "重命名文件",
+    "Recently created" : "最近创建",
     "Folder" : "文件夹",
     "Unknown file type" : "未知文件类型",
     "{ext} image" : "{ext} 图片",
@@ -234,6 +235,9 @@ OC.L10N.register(
     "Removing the file extension \"{old}\" may render the file unreadable." : "删除文件扩展名 \"{old}\" 可能会导致文件无法读取。",
     "Adding the file extension \"{new}\" may render the file unreadable." : "添加文件扩展名 \"{new}\" 可能会导致文件无法读取。",
     "Do not show this dialog again." : "不再显示此对话框。",
+    "Rename file to hidden" : "将文件重命名为隐藏文件",
+    "Prefixing a filename with a dot may render the file hidden." : "在文件名前加上点号可能会使文件变为隐藏文件。",
+    "Are you sure you want to rename the file to \"{filename}\"?" : "是否确定要将文件重命名为“{filename}”？",
     "Cancel" : "取消",
     "Rename" : "重命名",
     "Select file or folder to link to" : "选择需要链接的文件或文件夹",
@@ -316,7 +320,9 @@ OC.L10N.register(
     "The files are locked" : "文件已锁定",
     "The file does not exist anymore" : "文件不存在",
     "Moving \"{source}\" to \"{destination}\" …" : "正在将“{source}”移动到“{destination}” …",
+    "Moving {count} files to \"{destination}\" …" : "正在将 {count} 个文件移动到“{destination}” …",
     "Copying \"{source}\" to \"{destination}\" …" : "正在将“{source}”复制到“{destination}” …",
+    "Copying {count} files to \"{destination}\" …" : "正在将 {count} 个文件复制到“{destination}” …",
     "Choose destination" : "选择目标路径",
     "Copy to {target}" : "复制到 {target}",
     "Move to {target}" : "移动到 {target}",