Skip to content

Commit 56cad1e

Browse files
authored
Merge branch 'stable32' into release/32.0.7_rc1
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
2 parents ff0b133 + 7670827 commit 56cad1e

File tree

172 files changed

+2173
-1220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2173
-1220
lines changed

apps/dav/l10n/hr.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
237237
"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",
238238
"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",
239+
"Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
239240
"Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
240241
"Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
241242
"Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "Završeno na %s",
253254
"Due on %s by %s" : "%s treba završiti do %s",
254255
"Due on %s" : "Treba završiti do %s",
256+
"This is an example contact" : "Ovo je primjer kontakta",
255257
"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.",
256258
"Example event - open me!" : "Primjer događaja – otvori me!",
257259
"System Address Book" : "Adresar sustava",

apps/dav/l10n/hr.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
235235
"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",
236236
"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",
237+
"Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
237238
"Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
238239
"Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
239240
"Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -250,6 +251,7 @@
250251
"Completed on %s" : "Završeno na %s",
251252
"Due on %s by %s" : "%s treba završiti do %s",
252253
"Due on %s" : "Treba završiti do %s",
254+
"This is an example contact" : "Ovo je primjer kontakta",
253255
"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.",
254256
"Example event - open me!" : "Primjer događaja – otvori me!",
255257
"System Address Book" : "Adresar sustava",

apps/dav/l10n/zh_CN.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "检查文件大小失败:%1$s",
237237
"Could not open file: %1$s (%2$d), file does seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
238238
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
239+
"Failed to get size for : %1$s" : "无法获取以下项目的大小:%1$s",
239240
"Encryption not ready: %1$s" : "加密不可用:%1$s",
240241
"Failed to open file: %1$s" : "打开文件失败:%1$s",
241242
"Failed to unlink: %1$s" : "解除链接失败:%1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "已完成 %s",
253254
"Due on %s by %s" : "到期于 %s,在 %s 之前",
254255
"Due on %s" : "到期于 %s",
256+
"This is an example contact" : "这是一个示例联系人",
255257
"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- 自定义您的体验:安排重复事件、调整通知和其他设置。",
256258
"Example event - open me!" : "示例事件——打开我!",
257259
"System Address Book" : "系统通讯录",

apps/dav/l10n/zh_CN.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"Failed to check file size: %1$s" : "检查文件大小失败:%1$s",
235235
"Could not open file: %1$s (%2$d), file does seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
236236
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
237+
"Failed to get size for : %1$s" : "无法获取以下项目的大小:%1$s",
237238
"Encryption not ready: %1$s" : "加密不可用:%1$s",
238239
"Failed to open file: %1$s" : "打开文件失败:%1$s",
239240
"Failed to unlink: %1$s" : "解除链接失败:%1$s",
@@ -250,6 +251,7 @@
250251
"Completed on %s" : "已完成 %s",
251252
"Due on %s by %s" : "到期于 %s,在 %s 之前",
252253
"Due on %s" : "到期于 %s",
254+
"This is an example contact" : "这是一个示例联系人",
253255
"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- 自定义您的体验:安排重复事件、调整通知和其他设置。",
254256
"Example event - open me!" : "示例事件——打开我!",
255257
"System Address Book" : "系统通讯录",

apps/dav/lib/CalDAV/CalendarImpl.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use OCP\Calendar\Exceptions\CalendarException;
1717
use OCP\Calendar\ICalendarExport;
1818
use OCP\Calendar\ICalendarIsEnabled;
19+
use OCP\Calendar\ICalendarIsPublic;
1920
use OCP\Calendar\ICalendarIsShared;
2021
use OCP\Calendar\ICalendarIsWritable;
2122
use OCP\Calendar\ICreateFromString;
@@ -32,7 +33,7 @@
3233

3334
use function Sabre\Uri\split as uriSplit;
3435

35-
class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsWritable, ICalendarIsShared, ICalendarExport, ICalendarIsEnabled {
36+
class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsWritable, ICalendarIsShared, ICalendarExport, ICalendarIsEnabled, ICalendarIsPublic {
3637
public function __construct(
3738
private Calendar $calendar,
3839
/** @var array<string, mixed> */
@@ -168,6 +169,13 @@ public function isShared(): bool {
168169
return $this->calendar->isShared();
169170
}
170171

172+
/**
173+
* @since 33.0.1, 32.0.7, 31.0.14.1, 30.0.17.8
174+
*/
175+
public function getPublicToken(): ?string {
176+
return $this->calendar->getPublishStatus() ?: null;
177+
}
178+
171179
/**
172180
* @throws CalendarException
173181
*/
@@ -336,5 +344,4 @@ public function export(?CalendarExportOptions $options = null): Generator {
336344
}
337345
}
338346
}
339-
340347
}

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected function setUp(): void {
3333
$this->backend = $this->createMock(CalDavBackend::class);
3434
$this->calendar = $this->createMock(Calendar::class);
3535
$this->calendarInfo = [
36-
'id' => 'fancy_id_123',
36+
'id' => 123,
3737
'{DAV:}displayname' => 'user readable name 123',
3838
'{http://apple.com/ns/ical/}calendar-color' => '#AABBCC',
3939
'uri' => '/this/is/a/uri',
@@ -62,7 +62,7 @@ protected function setUp(): void {
6262

6363

6464
public function testGetKey(): void {
65-
$this->assertEquals($this->calendarImpl->getKey(), 'fancy_id_123');
65+
$this->assertEquals($this->calendarImpl->getKey(), '123');
6666
}
6767

6868
public function testGetDisplayname(): void {
@@ -73,6 +73,18 @@ public function testGetDisplayColor(): void {
7373
$this->assertEquals($this->calendarImpl->getDisplayColor(), '#AABBCC');
7474
}
7575

76+
public function testGetPublicToken(): void {
77+
$publicToken = $this->calendar->setPublishStatus(true);
78+
79+
$this->assertEquals($this->calendarImpl->getPublicToken(), $publicToken);
80+
}
81+
82+
public function testGetPublicTokenWithPrivateCalendar(): void {
83+
$this->calendar->setPublishStatus(false);
84+
85+
$this->assertNull($this->calendarImpl->getPublicToken());
86+
}
87+
7688
public function testSearch(): void {
7789
$this->backend->expects($this->once())
7890
->method('search')
@@ -266,5 +278,4 @@ public function getHrefs(): array {
266278

267279
$calendarImpl->handleIMipMessage('fakeUser', $vObject->serialize());
268280
}
269-
270281
}

apps/federatedfilesharing/src/components/AdminSettings.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
7373
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
7474
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
7575
76-
import '@nextcloud/password-confirmation/dist/style.css'
77-
7876
export default {
7977
name: 'AdminSettings',
8078

apps/files/l10n/hr.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ OC.L10N.register(
9595
"Another entry with the same name already exists." : "Već postoji drugi upis s istim nazivom.",
9696
"Invalid filename." : "Nevažeći naziv datoteke.",
9797
"Rename file" : "Preimenuj datoteku",
98+
"Recently created" : "Nedavno stvoreno",
9899
"Folder" : "Mapa",
99100
"Unknown file type" : "Nepoznata vrsta datoteke",
100101
"{ext} image" : "{ext} slika",

apps/files/l10n/hr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"Another entry with the same name already exists." : "Već postoji drugi upis s istim nazivom.",
9494
"Invalid filename." : "Nevažeći naziv datoteke.",
9595
"Rename file" : "Preimenuj datoteku",
96+
"Recently created" : "Nedavno stvoreno",
9697
"Folder" : "Mapa",
9798
"Unknown file type" : "Nepoznata vrsta datoteke",
9899
"{ext} image" : "{ext} slika",

apps/files/l10n/zh_CN.js

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

0 commit comments

Comments
 (0)