Merge branch 'michielbdejong:master' into master

.github/workflows/command-pull-3rdparty.yml

@@ -18,18 +18,23 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa
+        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
           comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
+          reactions: "+1"
 
-      - name: Checkout the latest code
+      - name: Init branch
+        uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7 # v1
+        id: comment-branch
+
+      - name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
           token: ${{ secrets.COMMAND_BOT_PAT }}
+          ref: ${{ steps.comment-branch.outputs.head_ref }}
 
       - name: Setup git
         run: |
@@ -46,10 +51,10 @@ jobs:
           git push
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa
+        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
           comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
+          reactions: "-1"

dist/core-maintenance.js.LICENSE.txt → __mocks__/@nextcloud/initial-state.ts

@@ -1,9 +1,7 @@
 /**
- * @copyright 2019 Christoph Wurst <[email protected]>
+ * @copyright Copyright (c) 2023 John Molakvoæ <[email protected]>
  *
- * @author Christoph Wurst <[email protected]>
  * @author John Molakvoæ <[email protected]>
- * @author Roeland Jago Douma <[email protected]>
  *
  * @license AGPL-3.0-or-later
  *
@@ -21,3 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+export const loadState = function(app: string, key: string, fallback?: any) {
+	return fallback
+}

apps/admin_audit/l10n/hi_IN.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "ऑडिटिंग/लॉगिंग",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "नेक्स्टक्लाउड के लिए लॉगिंग क्षमताएं प्रदान करता है जैसे फ़ाइल एक्सेस या अन्यथा संवेदनशील कार्यों को लॉग करना।"
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/hi_IN.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "ऑडिटिंग/लॉगिंग",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "नेक्स्टक्लाउड के लिए लॉगिंग क्षमताएं प्रदान करता है जैसे फ़ाइल एक्सेस या अन्यथा संवेदनशील कार्यों को लॉग करना।"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/cloud_federation_api/l10n/uk.js

@@ -3,6 +3,6 @@ OC.L10N.register(
     {
     "Cloud Federation API" : "Cloud Federation API",
     "Enable clouds to communicate with each other and exchange data" : "Увімкніть хмари аби спілкуватися один з одним і обмінюватися даними",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним екземплярам Nextcloud спілкуватися між собою та обмінюватися даними."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам серверу хмари Nextcloud спілкуватися між собою та обмінюватися даними."
 },
 "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");

apps/cloud_federation_api/l10n/uk.json

@@ -1,6 +1,6 @@
 { "translations": {
     "Cloud Federation API" : "Cloud Federation API",
     "Enable clouds to communicate with each other and exchange data" : "Увімкніть хмари аби спілкуватися один з одним і обмінюватися даними",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним екземплярам Nextcloud спілкуватися між собою та обмінюватися даними."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам серверу хмари Nextcloud спілкуватися між собою та обмінюватися даними."
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
 }

apps/comments/lib/AppInfo/Application.php

@@ -66,7 +66,7 @@ public function register(IRegistrationContext $context): void {
 			LoadSidebarScripts::class
 		);
 		$context->registerEventListener(
-			CommentsEntityEvent::EVENT_ENTITY,
+			CommentsEntityEvent::class,
 			CommentsEntityEventListener::class
 		);
 		$context->registerSearchProvider(CommentsSearchProvider::class);

apps/comments/src/components/Comment.vue

@@ -91,12 +91,13 @@
 
 			<!-- Message content -->
 			<!-- The html is escaped and sanitized before rendering -->
-			<!-- eslint-disable-next-line vue/no-v-html-->
+			<!-- eslint-disable vue/no-v-html-->
 			<div v-else
 				:class="{'comment__message--expanded': expanded}"
 				class="comment__message"
 				@click="onExpand"
 				v-html="renderedContent" />
+			<!-- eslint-enable vue/no-v-html-->
 		</div>
 	</component>
 </template>

apps/comments/src/views/Comments.vue

@@ -22,9 +22,9 @@
   -->
 
 <template>
-	<div class="comments"
-		:class="{ 'icon-loading': isFirstLoading }"
-		v-observe-visibility="onVisibilityChange">
+	<div v-observe-visibility="onVisibilityChange"
+		class="comments"
+		:class="{ 'icon-loading': isFirstLoading }">
 		<!-- Editor -->
 		<Comment v-bind="editorData"
 			:auto-complete="autoComplete"
@@ -37,7 +37,7 @@
 		<template v-if="!isFirstLoading">
 			<NcEmptyContent v-if="!hasComments && done"
 				class="comments__empty"
-				:title="t('comments', 'No comments yet, start the conversation!')">
+				:name="t('comments', 'No comments yet, start the conversation!')">
 				<template #icon>
 					<MessageReplyTextIcon />
 				</template>
@@ -65,7 +65,7 @@
 
 			<!-- Error message -->
 			<template v-else-if="error">
-				<NcEmptyContent class="comments__error" :title="error">
+				<NcEmptyContent class="comments__error" :name="error">
 					<template #icon>
 						<AlertCircleOutlineIcon />
 					</template>
@@ -191,8 +191,8 @@ export default {
 		/**
 		 * Make sure we have all mentions as Array of objects
 		 *
-		 * @param {Array} mentions the mentions list
-		 * @return {Object<string, object>}
+		 * @param {any[]} mentions the mentions list
+		 * @return {Record<string, object>}
 		 */
 		genMentionsData(mentions) {
 			Object.values(mentions)

apps/dashboard/l10n/fa.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 overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "روز خود را آگاهانه شروع کنید\n\nداشبورد Nextcloud نقطه شروع روز شماست و به شما یک نمای کلی از قرارهای ملاقات آینده، ایمیل‌های فوری، پیام‌های چت، بلیط‌های دریافتی، آخرین توییت‌ها و موارد دیگر را در اختیار شما قرار می‌دهد. کاربران می توانند ویجت هایی را که دوست دارند اضافه کنند و پس زمینه را به دلخواه خود تغییر دهند.",
     "\"{title} icon\"" : "«نقشک {title}»",
     "Customize" : "سفارشی سازی",
     "Edit widgets" : "ویرایش ابزارک‌ها",
@@ -20,6 +21,7 @@ OC.L10N.register(
     "Good evening" : "عصر به خیر",
     "Good evening, {name}" : "{name} عصر به خیر",
     "Hello" : "درود",
-    "Hello, {name}" : "درود {name}"
+    "Hello, {name}" : "درود {name}",
+    "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 نقطه شروع روز شماست که به شما این امکان را می دهد\nمروری بر قرارهای آینده، ایمیل‌های فوری، پیام‌های چت،\nبلیط های ورودی، آخرین توییت ها و خیلی بیشتر! کاربران می توانند ویجت ها را اضافه کنند\nدوست دارند و پس زمینه را به دلخواه تغییر می دهند."
 },
 "nplurals=2; plural=(n > 1);");

apps/dashboard/l10n/fa.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 overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "روز خود را آگاهانه شروع کنید\n\nداشبورد Nextcloud نقطه شروع روز شماست و به شما یک نمای کلی از قرارهای ملاقات آینده، ایمیل‌های فوری، پیام‌های چت، بلیط‌های دریافتی، آخرین توییت‌ها و موارد دیگر را در اختیار شما قرار می‌دهد. کاربران می توانند ویجت هایی را که دوست دارند اضافه کنند و پس زمینه را به دلخواه خود تغییر دهند.",
     "\"{title} icon\"" : "«نقشک {title}»",
     "Customize" : "سفارشی سازی",
     "Edit widgets" : "ویرایش ابزارک‌ها",
@@ -18,6 +19,7 @@
     "Good evening" : "عصر به خیر",
     "Good evening, {name}" : "{name} عصر به خیر",
     "Hello" : "درود",
-    "Hello, {name}" : "درود {name}"
+    "Hello, {name}" : "درود {name}",
+    "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 نقطه شروع روز شماست که به شما این امکان را می دهد\nمروری بر قرارهای آینده، ایمیل‌های فوری، پیام‌های چت،\nبلیط های ورودی، آخرین توییت ها و خیلی بیشتر! کاربران می توانند ویجت ها را اضافه کنند\nدوست دارند و پس زمینه را به دلخواه تغییر می دهند."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/dashboard/l10n/gl.js

@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Dashboard" : "Taboleiro",
     "Dashboard app" : "Aplicación de taboleiro",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de conversas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo.",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de parolas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo.",
     "\"{title} icon\"" : "«icona {title}»",
     "Customize" : "Personalizar",
     "Edit widgets" : "Editar trebellos",
@@ -23,6 +23,6 @@ OC.L10N.register(
     "Good evening, {name}" : "Boas noites, {name}",
     "Hello" : "Hello",
     "Hello, {name}" : "Ola, {name}",
-    "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." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de conversas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo."
+    "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." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de parolas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo."
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/gl.json

@@ -1,7 +1,7 @@
 { "translations": {
     "Dashboard" : "Taboleiro",
     "Dashboard app" : "Aplicación de taboleiro",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de conversas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo.",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de parolas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo.",
     "\"{title} icon\"" : "«icona {title}»",
     "Customize" : "Personalizar",
     "Edit widgets" : "Editar trebellos",
@@ -21,6 +21,6 @@
     "Good evening, {name}" : "Boas noites, {name}",
     "Hello" : "Hello",
     "Hello, {name}" : "Ola, {name}",
-    "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." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de conversas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo."
+    "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." : "Comece o día informado\n\nO Taboleiro de Nextcloud é o seu punto de partida do día, onde atopará unha visión xeral das súas próximas citas, correos-e urxentes, mensaxes de parolas, billetes entrantes, chíos máis recentes e moito máis. Os usuarios poden engadir os trebellos que lles gusten e cambiar o fondo ao seu antollo."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/src/DashboardApp.vue

@@ -77,15 +77,17 @@
 
 				<a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the App Store') }}</a>
 
-				<h3>{{ t('dashboard', 'Weather service') }}</h3>
-				<p>
-					{{ t('dashboard', 'For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information.') }}
-				</p>
-				<p class="credits--end">
-					<a href="https://api.met.no/doc/TermsOfService" target="_blank" rel="noopener">{{ t('dashboard', 'Weather data from Met.no') }}</a>,
-					<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" target="_blank" rel="noopener">{{ t('dashboard', 'geocoding with Nominatim') }}</a>,
-					<a href="https://www.opentopodata.org/#public-api" target="_blank" rel="noopener">{{ t('dashboard', 'elevation data from OpenTopoData') }}</a>.
-				</p>
+				<div v-if="statuses.weather && isStatusActive('weather')">
+					<h3>{{ t('dashboard', 'Weather service') }}</h3>
+					<p>
+						{{ t('dashboard', 'For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information.') }}
+					</p>
+					<p class="credits--end">
+						<a href="https://api.met.no/doc/TermsOfService" target="_blank" rel="noopener">{{ t('dashboard', 'Weather data from Met.no') }}</a>,
+						<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" target="_blank" rel="noopener">{{ t('dashboard', 'geocoding with Nominatim') }}</a>,
+						<a href="https://www.opentopodata.org/#public-api" target="_blank" rel="noopener">{{ t('dashboard', 'elevation data from OpenTopoData') }}</a>.
+					</p>
+				</div>
 			</div>
 		</NcModal>
 	</div>