Merge pull request #34626 from nextcloud/enhancement/rename-personal-…

…groupware-settings-section-availability Rename personal Groupware settings section to "Availability"
nextcloud · Oct 24, 2022 · 232c760 · 232c760
2 parents 999f89f + 0799b89
commit 232c760
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/apps/dav/img/LICENSES.md b/apps/dav/img/LICENSES.md
@@ -0,0 +1,6 @@
+# Licenses
+
+## schedule.svg
+- Created by: Google
+- License: Apache License, Version 2.0
+- Link: https://fonts.google.com/icons?selected=Material%20Icons%3Aschedule%3A
diff --git a/apps/dav/img/schedule.svg b/apps/dav/img/schedule.svg
diff --git a/apps/dav/lib/Settings/AvailabilitySettings.php b/apps/dav/lib/Settings/AvailabilitySettings.php
@@ -59,7 +59,7 @@ public function getForm(): TemplateResponse {
 	}
 
 	public function getSection(): string {
-		return 'groupware';
+		return 'availability';
 	}
 
 	public function getPriority(): int {

diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
@@ -37,7 +37,7 @@
 		<personal>OCA\Settings\Settings\Personal\Security\Password</personal>
 		<personal>OCA\Settings\Settings\Personal\Security\TwoFactor</personal>
 		<personal>OCA\Settings\Settings\Personal\Security\WebAuthn</personal>
-		<personal-section>OCA\Settings\Sections\Personal\Groupware</personal-section>
+		<personal-section>OCA\Settings\Sections\Personal\Availability</personal-section>
 		<personal-section>OCA\Settings\Sections\Personal\PersonalInfo</personal-section>
 		<personal-section>OCA\Settings\Sections\Personal\Security</personal-section>
 		<personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section>

diff --git a/apps/settings/composer/composer/autoload_classmap.php b/apps/settings/composer/composer/autoload_classmap.php
@@ -48,7 +48,7 @@
     'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
     'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
     'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
-    'OCA\\Settings\\Sections\\Personal\\Groupware' => $baseDir . '/../lib/Sections/Personal/Groupware.php',
+    'OCA\\Settings\\Sections\\Personal\\Availability' => $baseDir . '/../lib/Sections/Personal/Availability.php',
     'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',
     'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir . '/../lib/Sections/Personal/Security.php',
     'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir . '/../lib/Sections/Personal/SyncClients.php',

diff --git a/apps/settings/composer/composer/autoload_static.php b/apps/settings/composer/composer/autoload_static.php
@@ -63,7 +63,7 @@ class ComposerStaticInitSettings
         'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
         'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
         'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
-        'OCA\\Settings\\Sections\\Personal\\Groupware' => __DIR__ . '/..' . '/../lib/Sections/Personal/Groupware.php',
+        'OCA\\Settings\\Sections\\Personal\\Availability' => __DIR__ . '/..' . '/../lib/Sections/Personal/Availability.php',
         'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',
         'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__ . '/..' . '/../lib/Sections/Personal/Security.php',
         'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__ . '/..' . '/../lib/Sections/Personal/SyncClients.php',

diff --git a/...tings/lib/Sections/Personal/Groupware.php → ...gs/lib/Sections/Personal/Availability.php b/...tings/lib/Sections/Personal/Groupware.php → ...gs/lib/Sections/Personal/Availability.php
@@ -27,7 +27,7 @@
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
-class Groupware implements IIconSection {
+class Availability implements IIconSection {
 
 	/** @var IL10N */
 	private $l;
@@ -41,15 +41,15 @@ public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
 	}
 
 	public function getIcon(): string {
-		return $this->urlGenerator->imagePath('core', 'places/contacts.svg');
+		return $this->urlGenerator->imagePath('dav', 'schedule.svg');
 	}
 
 	public function getID(): string {
-		return 'groupware';
+		return 'availability';
 	}
 
 	public function getName(): string {
-		return $this->l->t('Groupware');
+		return $this->l->t('Availability');
 	}
 
 	public function getPriority(): int {