Merge branch 'main' into dependabot/composer/christophwurst/nextcloud_testing-1.0.1

Author: lukasdotcom

README.md

@@ -31,7 +31,10 @@ Workflow definition:
 
 A pending tag can only be used in one approval workflow.
 Workflows can be chained. For example, if the approved tag of a workflow A is used as the pending tag of another workflow B,
-then once a file is approved by the workflow A, it becomes pending for the B one.
+then once a file is approved by the workflow A, it becomes pending for the B one. For an example of a chain involving a leave
+request that needs to be approved by a manager and then the department head, there is a screenshot below.
+
+![Workflow chain](https://github.com/nextcloud/approval/raw/main/img/workflow_chained.jpg)
 
 ## Tag assignment
 

REUSE.toml

@@ -16,7 +16,7 @@ SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["img/app.svg", "img/app-dark.svg", "img/checkmark-green.svg", "img/close-red.svg"]
+path = ["img/app.svg", "img/app-dark.svg", "img/app-no-color.svg", "img/checkmark-green.svg", "img/close-red.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2018-2024 Google LLC"
 SPDX-License-Identifier = "Apache-2.0"

img/app-dark.svg

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later

img/app-no-color.svg

@@ -71,10 +71,7 @@ OC.L10N.register(
     "Select approved tag" : "إختَر وسم \"تمت الموافقة\" approved tag",
     "Select rejected tag" : "إختَر وسم \"مرفوض\" rejected tag",
     "Approved" : "مُوافَقٌ عليه",
-    "Approved by" : "تمّ قبوله من قِبَل ",
     "Rejected" : "مرفوضٌ",
-    "Rejected by" : "تمّ رفضه من قِبَل ",
-    "Approval requested by" : "طَلَبُ الموافقة قُدِّم من قِبَل",
     "Approval requested" : "تمّ طلب الموافقة",
     "you" : "أنت",
     "The related approval workflow is: {ruleDescription}" : "أتمتة سير العمل الخاصة بالموافقات ذات الصلة هي: {ruleDescription}",

img/app.svg

@@ -69,10 +69,7 @@
     "Select approved tag" : "إختَر وسم \"تمت الموافقة\" approved tag",
     "Select rejected tag" : "إختَر وسم \"مرفوض\" rejected tag",
     "Approved" : "مُوافَقٌ عليه",
-    "Approved by" : "تمّ قبوله من قِبَل ",
     "Rejected" : "مرفوضٌ",
-    "Rejected by" : "تمّ رفضه من قِبَل ",
-    "Approval requested by" : "طَلَبُ الموافقة قُدِّم من قِبَل",
     "Approval requested" : "تمّ طلب الموافقة",
     "you" : "أنت",
     "The related approval workflow is: {ruleDescription}" : "أتمتة سير العمل الخاصة بالموافقات ذات الصلة هي: {ruleDescription}",

img/screenshot_chained.jpg

@@ -70,10 +70,7 @@ OC.L10N.register(
     "Select approved tag" : "Избор на одобрен маркер/етикет/",
     "Select rejected tag" : "Избор на отхвърлен маркер/етикет/",
     "Approved" : "Одобрение",
-    "Approved by" : "Одобрен от",
     "Rejected" : "Отхвърляне",
-    "Rejected by" : "Отхвърляне от",
-    "Approval requested by" : "Одобрение, поискано от",
     "Approval requested" : " Поискано е одобрение",
     "you" : "ти",
     "Your approval was requested." : " Поискано е вашето одобрение.",