Merge branch '5.9' into 5

symbiote · Feb 27, 2024 · 78bd593 · 78bd593
2 parents 97388a5 + e147a4d
commit 78bd593
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/lang/nl.yml b/lang/nl.yml
@@ -7,13 +7,15 @@ nl:
     GROUPS: Groepen
     USERS: Gebruikers
   NotifyUsersWorkflowAction:
+    EMAILFROM: 'E-mail van'
     EMAILSUBJECT: E-mailonderwerp
     EMAILTEMPLATE: E-mailtemplate
     FORMATTINGHELP: 'Hulp met opmaak'
   Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction:
     many_many_Groups: Groepen
     many_many_Users: Gebruikers
   Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction:
+    db_EmailFrom: 'E-mail van'
     db_EmailSubject: E-mailonderwerp
     db_EmailTemplate: E-mailtemplate
   Symbiote\AdvancedWorkflow\Actions\SetPropertyWorkflowAction:

diff --git a/lang/sk.yml b/lang/sk.yml
@@ -48,6 +48,9 @@ sk:
     db_Type: Typ
     many_many_Groups: Skupiny
     many_many_Users: Používatelia
+  Symbiote\AdvancedWorkflow\Extensions\WorkflowApplicable:
+    has_one_WorkflowDefinition: 'Definícia pracovného toku'
+    many_many_AdditionalWorkflowDefinitions: 'Ďalšie definície pracovného toku'
   WorkflowAction:
     Author: Autor
     COMMENT: Komentár

diff --git a/lang/sl.yml b/lang/sl.yml
@@ -6,21 +6,33 @@ sl:
   AssignUsersToWorkflowAction:
     GROUPS: Skupine
     USERS: Uporabniki
+  NotifyUsersWorkflowAction:
+    EMAILFROM: 'Pošiljatelj e-sporočila'
+    EMAILSUBJECT: 'Predmet e-sporočila'
+    EMAILTEMPLATE: 'Predloga e-sporočila'
   Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction:
     many_many_Groups: Skupine
     many_many_Users: Uporabniki
+  Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction:
+    db_EmailFrom: 'Pošiljatelj e-sporočila'
+    db_EmailSubject: 'Predmet e-sporočila'
+    db_EmailTemplate: 'Predloga e-sporočila'
+  Symbiote\AdvancedWorkflow\Actions\SetPropertyWorkflowAction:
+    db_Value: Vrednost
   Symbiote\AdvancedWorkflow\DataObjects\ImportedWorkflowTemplate:
     db_Content: Vsebina
     db_Filename: 'Ime datoteke'
     db_Name: Ime
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction:
+    db_Sort: Razvrščanje
     db_Title: Naziv
     db_Type: Tip
     has_one_Member: Uporabnik
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowActionInstance:
     has_one_Member: Uporabnik
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition:
     db_Description: Opis
+    db_Sort: Razvrščanje
     db_Title: Naziv
     has_many_Actions: Dejanja
     many_many_Groups: Skupine
@@ -31,10 +43,14 @@ sl:
     many_many_Groups: Skupine
     many_many_Users: Uporabniki
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowTransition:
+    db_Sort: Razvrščanje
     db_Title: Naziv
     db_Type: Tip
     many_many_Groups: Skupine
     many_many_Users: Uporabniki
+  Symbiote\AdvancedWorkflow\Extensions\WorkflowApplicable:
+    has_one_WorkflowDefinition: 'Definicija uredniškega procesa'
+    many_many_AdditionalWorkflowDefinitions: 'Dodatne definicije uredniških procesov'
   WorkflowAction:
     Author: Avtor
     TITLE: Naziv

diff --git a/lang/sv.yml b/lang/sv.yml
@@ -27,6 +27,7 @@ sv:
     has_one_Member: Medlem
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowActionInstance:
     db_Comment: Kommentar
+    db_Finished: Slutförd
     has_one_Member: Medlem
   Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition:
     db_Description: Beskrivning
@@ -51,13 +52,16 @@ sv:
     COMMENT: Kommentar
     CommentLabel: Kommentar
     FRONTENDCOMMENT: Kommentar
+    FinishedLabel: Slutförd
     TITLE: Titel
     TypeLabel: Typ
   WorkflowActionInstance:
     Title: Titel
   WorkflowDefinition:
     DESCRIPTION: Beskrivning
     TITLE: Titel
+  WorkflowEmbargoExpiryExtension:
+    BADGE_UNPUBLISH: 'Går ut'
   WorkflowField:
     CreateLabel: Skapa
     DeleteAction: Radera

diff --git a/src/Actions/UnpublishItemWorkflowAction.php b/src/Actions/UnpublishItemWorkflowAction.php
@@ -10,8 +10,8 @@
 use Symbiote\AdvancedWorkflow\DataObjects\WorkflowInstance;
 use Symbiote\AdvancedWorkflow\Extensions\WorkflowEmbargoExpiryExtension;
 use Symbiote\AdvancedWorkflow\Jobs\WorkflowPublishTargetJob;
-use Symbiote\QueuedJob\Services\AbstractQueuedJob;
-use Symbiote\QueuedJob\Services\QueuedJobService;
+use Symbiote\QueuedJobs\Services\AbstractQueuedJob;
+use Symbiote\QueuedJobs\Services\QueuedJobService;
 
 /**
  * Unpublishes an item