Increase check if support reactions

apps/accessibility/l10n/ru.json

@@ -12,6 +12,6 @@
     "Accessibility options for nextcloud" : "Настройки доступности для Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Предлагает дополнительные настройки для упрощения использования Nextcloud",
     "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Доступная среда очень важна для нас. При разработке мы следуем веб-стандартам, контролируя возможность пользования всем сервисом без помощи мыши и с использованием вспомогательных программ, например, выполняющих чтение с экрана. Мы стремимся к выполнению рекомендаций {guidelines}Руководства доступности Веб-Контента{linkend} 2.1 на уровне АА, а при использовании режима высокой контрастности  — даже на уровне ААА.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "При обнаружении ошибок, не стесняйтесь сообщать о них {issuetracker}на наш форум{linkend}. Если Вы заинтересованы в продвижении проекта присоединяйтесь к {designteam}команде дизайнеров{linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "При обнаружении ошибок, не стесняйтесь сообщать о них {issuetracker}на наш форум{linkend}. Если Вы заинтересованы в продвижении проекта присоединяйтесь к {designteam}нашей команде дизайнеров{linkend}!"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }

apps/dashboard/l10n/el.js

@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Dashboard" : "Πίνακας ελέγχου",
     "Dashboard app" : "Εφαρμογή Πίνακα Ελέγχου",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Ξεκινήστε τη μέρα σας ενημερωμένοι\n\nΤο Nextcloud Dashboard είναι το σημείο εκκίνησης της ημέρας, δίνοντάς σας μια επισκόπηση των επερχόμενων ραντεβού, των επειγόντων email, των μηνυμάτων συνομιλίας, και πολλά άλλα!\nΟι χρήστες μπορούν να προσθέσουν μικροεφαρμογές και να αλλάζουν το φόντο σύμφωνα με τις προτιμήσεις τους.",
     "Customize" : "Προσαρμογή",
     "Edit widgets" : "Επεξεργασία μικροεφαρμογών",
     "Get more widgets from the App Store" : "Λάβετε περισσότερες μικροεφαρμογές από το App Store",

apps/dashboard/l10n/el.json

@@ -1,6 +1,7 @@
 { "translations": {
     "Dashboard" : "Πίνακας ελέγχου",
     "Dashboard app" : "Εφαρμογή Πίνακα Ελέγχου",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Ξεκινήστε τη μέρα σας ενημερωμένοι\n\nΤο Nextcloud Dashboard είναι το σημείο εκκίνησης της ημέρας, δίνοντάς σας μια επισκόπηση των επερχόμενων ραντεβού, των επειγόντων email, των μηνυμάτων συνομιλίας, και πολλά άλλα!\nΟι χρήστες μπορούν να προσθέσουν μικροεφαρμογές και να αλλάζουν το φόντο σύμφωνα με τις προτιμήσεις τους.",
     "Customize" : "Προσαρμογή",
     "Edit widgets" : "Επεξεργασία μικροεφαρμογών",
     "Get more widgets from the App Store" : "Λάβετε περισσότερες μικροεφαρμογές από το App Store",

apps/dav/lib/Capabilities.php

@@ -29,7 +29,8 @@ public function getCapabilities() {
 		return [
 			'dav' => [
 				'chunking' => '1.0',
-				'bulkupload' => '1.0',
+				// disabled because of https://github.com/nextcloud/desktop/issues/4243
+				// 'bulkupload' => '1.0',
 			]
 		];
 	}

apps/dav/lib/UserMigration/CalendarMigrator.php

@@ -318,7 +318,10 @@ private function initCalendarObject(): VCalendar {
 		return $vCalendarObject;
 	}
 
-	private function importCalendarObject(int $calendarId, VCalendar $vCalendarObject, OutputInterface $output): void {
+	/**
+	 * @throws InvalidCalendarException
+	 */
+	private function importCalendarObject(int $calendarId, VCalendar $vCalendarObject, string $filename, OutputInterface $output): void {
 		try {
 			$this->calDavBackend->createCalendarObject(
 				$calendarId,
@@ -327,14 +330,14 @@ private function importCalendarObject(int $calendarId, VCalendar $vCalendarObjec
 				CalDavBackend::CALENDAR_TYPE_CALENDAR,
 			);
 		} catch (Throwable $e) {
-			// Rollback creation of calendar on error
-			$output->writeln('Error creating calendar object, rolling back creation of calendar…');
+			$output->writeln("Error creating calendar object, rolling back creation of \"$filename\" calendar…");
 			$this->calDavBackend->deleteCalendar($calendarId, true);
+			throw new InvalidCalendarException();
 		}
 	}
 
 	/**
-	 * @throws CalendarMigratorException
+	 * @throws InvalidCalendarException
 	 */
 	private function importCalendar(IUser $user, string $filename, string $initialCalendarUri, VCalendar $vCalendar, OutputInterface $output): void {
 		$principalUri = $this->getPrincipalUri($user);
@@ -392,7 +395,7 @@ function (array $componentNames, VObjectComponent $component) {
 					$vCalendarObject->add($component);
 				}
 			}
-			$this->importCalendarObject($calendarId, $vCalendarObject, $output);
+			$this->importCalendarObject($calendarId, $vCalendarObject, $filename, $output);
 		}
 
 		foreach ($ungroupedCalendarComponents as $component) {
@@ -401,7 +404,7 @@ function (array $componentNames, VObjectComponent $component) {
 			foreach ($this->getRequiredImportComponents($vCalendar, $component) as $component) {
 				$vCalendarObject->add($component);
 			}
-			$this->importCalendarObject($calendarId, $vCalendarObject, $output);
+			$this->importCalendarObject($calendarId, $vCalendarObject, $filename, $output);
 		}
 	}
 
@@ -446,15 +449,19 @@ public function import(IUser $user, IImportSource $importSource, OutputInterface
 			}
 			[$initialCalendarUri, $suffix] = $splitFilename;
 
-			$this->importCalendar(
-				$user,
-				$filename,
-				$initialCalendarUri,
-				$vCalendar,
-				$output,
-			);
-
-			$vCalendar->destroy();
+			try {
+				$this->importCalendar(
+					$user,
+					$filename,
+					$initialCalendarUri,
+					$vCalendar,
+					$output,
+				);
+			} catch (InvalidCalendarException $e) {
+				// Allow this exception to skip a failed import
+			} finally {
+				$vCalendar->destroy();
+			}
 		}
 	}
 }

apps/dav/tests/unit/CapabilitiesTest.php

@@ -35,7 +35,8 @@ public function testGetCapabilities() {
 		$expected = [
 			'dav' => [
 				'chunking' => '1.0',
-				'bulkupload' => '1.0',
+				// disabled because of https://github.com/nextcloud/desktop/issues/4243
+				// 'bulkupload' => '1.0',
 			],
 		];
 		$this->assertSame($expected, $capabilities->getCapabilities());

apps/dav/tests/unit/Comments/RootCollectionTest.php

@@ -43,7 +43,7 @@ class RootCollectionTest extends \Test\TestCase {
 	protected $commentsManager;
 	/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
 	protected $userManager;
-	/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
 	protected $logger;
 	/** @var \OCA\DAV\Comments\RootCollection */
 	protected $collection;
@@ -70,14 +70,14 @@ protected function setUp(): void {
 		$this->userSession = $this->getMockBuilder(IUserSession::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$this->logger = $this->getMockBuilder(ILogger::class)
+		$this->logger = $this->getMockBuilder(LoggerInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->dispatcher = new SymfonyAdapter(
 			new EventDispatcher(
 				new \Symfony\Component\EventDispatcher\EventDispatcher(),
 				\OC::$server,
-				$this->createMock(LoggerInterface::class)
+				$this->logger
 			),
 			$this->logger
 		);
@@ -87,7 +87,7 @@ protected function setUp(): void {
 			$this->userManager,
 			$this->userSession,
 			$this->dispatcher,
-			$this->logger
+			$this->createMock(ILogger::class)
 		);
 	}