26 files changed, 109 insertions, 108 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 94f1021bf..eb892bbfd 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -200,7 +200,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           resolutions: {}
         }
       },
-      videoEditor: {
+      videoStudio: {
         enabled: null
       },
       autoBlacklist: {
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index 52d6c79f6..5c0bea4a5 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -193,9 +193,9 @@
     </div>
   </div>
 
-  <div class="form-row mt-2"> <!-- video editor grid -->
+  <div class="form-row mt-2"> <!-- video studio grid -->
     <div class="form-group col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">VIDEO EDITOR</div>
+      <div i18n class="inner-form-title">VIDEO STUDIO</div>
       <div i18n class="inner-form-description">
         Allows your users to edit their video (cut, add intro/outro, add a watermark etc)
       </div>
@@ -203,14 +203,14 @@
 
     <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-      <ng-container formGroupName="videoEditor">
+      <ng-container formGroupName="videoStudio">
         <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
           <my-peertube-checkbox
-            inputName="videoEditorEnabled" formControlName="enabled"
-            i18n-labelText labelText="Enable video editor"
+            inputName="videoStudioEnabled" formControlName="enabled"
+            i18n-labelText labelText="Enable video studio"
           >
             <ng-container ngProjectAs="description" *ngIf="!isTranscodingEnabled()">
-              <span i18n>⚠️ You need to enable transcoding first to enable video editor</span>
+              <span i18n>⚠️ You need to enable transcoding first to enable video studio</span>
             </ng-container>
           </my-peertube-checkbox>
         </div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
index 948c10b69..a38438e3a 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
@@ -72,7 +72,7 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
 
   private checkTranscodingFields () {
     const transcodingControl = this.form.get('transcoding.enabled')
-    const videoEditorControl = this.form.get('videoEditor.enabled')
+    const videoStudioControl = this.form.get('videoStudio.enabled')
     const hlsControl = this.form.get('transcoding.hls.enabled')
     const webtorrentControl = this.form.get('transcoding.webtorrent.enabled')
 
@@ -101,7 +101,7 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
     transcodingControl.valueChanges
               .subscribe(newValue => {
                 if (newValue === false) {
-                  videoEditorControl.setValue(false)
+                  videoStudioControl.setValue(false)
                 }
               })
   }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
index 187a3818a..7c13282fa 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -45,7 +45,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
       abuseStateChange: $localize`One of your abuse reports has been accepted or rejected by moderators`,
       newPeerTubeVersion: $localize`A new PeerTube version is available`,
       newPluginVersion: $localize`One of your plugin/theme has a new available version`,
-      myVideoEditionFinished: $localize`Video edition finished`
+      myVideoStudioEditionFinished: $localize`Video studio edition has finished`
     }
     this.notificationSettingGroups = [
       {
@@ -64,7 +64,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
           'blacklistOnMyVideo',
           'myVideoPublished',
           'myVideoImportFinished',
-          'myVideoEditionFinished'
+          'myVideoStudioEditionFinished'
         ]
       },
 
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts
index 45a586981..a364b9b6a 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.ts
+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts
@@ -205,9 +205,9 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
   private buildActions () {
     this.videoActions = [
       {
-        label: $localize`Editor`,
-        linkBuilder: ({ video }) => [ '/video-editor/edit', video.uuid ],
-        isDisplayed: ({ video }) => video.isEditableBy(this.authService.getUser(), this.serverService.getHTMLConfig().videoEditor.enabled),
+        label: $localize`Studio`,
+        linkBuilder: ({ video }) => [ '/studio/edit', video.uuid ],
+        isDisplayed: ({ video }) => video.isEditableBy(this.authService.getUser(), this.serverService.getHTMLConfig().videoStudio.enabled),
         iconName: 'film'
       },
       {
diff --git a/client/src/app/+video-editor/edit/index.ts b/client/src/app/+video-editor/edit/index.ts
deleted file mode 100644
index 390ca80fc..000000000
--- a/client/src/app/+video-editor/edit/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './video-editor-edit.component'
-export * from './video-editor-edit.resolver'
diff --git a/client/src/app/+video-editor/index.ts b/client/src/app/+video-editor/index.ts
deleted file mode 100644
index 5a9e9fdd0..000000000
--- a/client/src/app/+video-editor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-editor.module'
diff --git a/client/src/app/+video-editor/shared/index.ts b/client/src/app/+video-editor/shared/index.ts
deleted file mode 100644
index eaf88b6f4..000000000
--- a/client/src/app/+video-editor/shared/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-editor.service'
diff --git a/client/src/app/+video-editor/video-editor-routing.module.ts b/client/src/app/+video-editor/video-editor-routing.module.ts
deleted file mode 100644
index 9f37a0dae..000000000
--- a/client/src/app/+video-editor/video-editor-routing.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { VideoEditorEditResolver } from './edit'
-import { VideoEditorEditComponent } from './edit/video-editor-edit.component'
-
-const videoEditorRoutes: Routes = [
-  {
-    path: '',
-    children: [
-      {
-        path: 'edit/:videoId',
-        component: VideoEditorEditComponent,
-        data: {
-          meta: {
-            title: $localize`Edit video`
-          }
-        },
-        resolve: {
-          video: VideoEditorEditResolver
-        }
-      }
-    ]
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoEditorRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoEditorRoutingModule {}
diff --git a/client/src/app/+video-editor/video-editor.module.ts b/client/src/app/+video-editor/video-editor.module.ts
deleted file mode 100644
index 7bbebc17b..000000000
--- a/client/src/app/+video-editor/video-editor.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { VideoEditorEditComponent, VideoEditorEditResolver } from './edit'
-import { VideoEditorService } from './shared'
-import { VideoEditorRoutingModule } from './video-editor-routing.module'
-
-@NgModule({
-  imports: [
-    VideoEditorRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule
-  ],
-
-  declarations: [
-    VideoEditorEditComponent
-  ],
-
-  exports: [],
-
-  providers: [
-    VideoEditorService,
-    VideoEditorEditResolver
-  ]
-})
-export class VideoEditorModule { }
diff --git a/client/src/app/+video-studio/edit/index.ts b/client/src/app/+video-studio/edit/index.ts
new file mode 100644
index 000000000..ff1d77fc0
--- /dev/null
+++ b/client/src/app/+video-studio/edit/index.ts
@@ -0,0 +1,2 @@
+export * from './video-studio-edit.component'
+export * from './video-studio-edit.resolver'
diff --git a/client/src/app/+video-editor/edit/video-editor-edit.component.html b/client/src/app/+video-studio/edit/video-studio-edit.component.html
index d33dfaf18..a9f34811f 100644
--- a/client/src/app/+video-editor/edit/video-editor-edit.component.html
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.html
@@ -1,5 +1,5 @@
 <div class="margin-content">
-  <h1 class="title-page title-page-single" i18n>Edit {{ video.name }}</h1>
+  <h1 class="title-page title-page-single" i18n>Studio for {{ video.name }}</h1>
 
   <div class="columns">
     <form role="form" [formGroup]="form">
diff --git a/client/src/app/+video-editor/edit/video-editor-edit.component.scss b/client/src/app/+video-studio/edit/video-studio-edit.component.scss
index 43f336f59..43f336f59 100644
--- a/client/src/app/+video-editor/edit/video-editor-edit.component.scss
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.scss
diff --git a/client/src/app/+video-editor/edit/video-editor-edit.component.ts b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
index 0adf93335..392b65767 100644
--- a/client/src/app/+video-editor/edit/video-editor-edit.component.ts
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
@@ -2,18 +2,18 @@ import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmService, Notifier, ServerService } from '@app/core'
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
-import { Video, VideoDetails } from '@app/shared/shared-main'
+import { VideoDetails } from '@app/shared/shared-main'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { secondsToTime } from '@shared/core-utils'
-import { VideoEditorTask, VideoEditorTaskCut } from '@shared/models'
-import { VideoEditorService } from '../shared'
+import { VideoStudioTask, VideoStudioTaskCut } from '@shared/models'
+import { VideoStudioService } from '../shared'
 
 @Component({
-  selector: 'my-video-editor-edit',
-  templateUrl: './video-editor-edit.component.html',
-  styleUrls: [ './video-editor-edit.component.scss' ]
+  selector: 'my-video-studio-edit',
+  templateUrl: './video-studio-edit.component.html',
+  styleUrls: [ './video-studio-edit.component.scss' ]
 })
-export class VideoEditorEditComponent extends FormReactive implements OnInit {
+export class VideoStudioEditComponent extends FormReactive implements OnInit {
   isRunningEdition = false
 
   video: VideoDetails
@@ -24,7 +24,7 @@ export class VideoEditorEditComponent extends FormReactive implements OnInit {
     private notifier: Notifier,
     private router: Router,
     private route: ActivatedRoute,
-    private videoEditorService: VideoEditorService,
+    private videoStudioService: VideoStudioService,
     private loadingBar: LoadingBarService,
     private confirmService: ConfirmService
   ) {
@@ -84,11 +84,13 @@ export class VideoEditorEditComponent extends FormReactive implements OnInit {
 
     this.loadingBar.useRef().start()
 
-    return this.videoEditorService.editVideo(this.video.uuid, tasks)
+    return this.videoStudioService.editVideo(this.video.uuid, tasks)
       .subscribe({
         next: () => {
-          this.notifier.success($localize`Video updated.`)
-          this.router.navigateByUrl(Video.buildWatchUrl(this.video))
+          this.notifier.success($localize`Edition tasks created.`)
+
+          // Don't redirect to old video version watch page that could be confusing for users
+          this.router.navigateByUrl('/my-library/videos')
         },
 
         error: err => {
@@ -153,13 +155,13 @@ export class VideoEditorEditComponent extends FormReactive implements OnInit {
   }
 
   private buildTasks () {
-    const tasks: VideoEditorTask[] = []
+    const tasks: VideoStudioTask[] = []
     const value = this.form.value
 
     const cut = value['cut']
     if (cut['start'] !== 0 || cut['end'] !== this.video.duration) {
 
-      const options: VideoEditorTaskCut['options'] = {}
+      const options: VideoStudioTaskCut['options'] = {}
       if (cut['start'] !== 0) options.start = cut['start']
       if (cut['end'] !== this.video.duration) options.end = cut['end']
 
diff --git a/client/src/app/+video-editor/edit/video-editor-edit.resolver.ts b/client/src/app/+video-studio/edit/video-studio-edit.resolver.ts
index 7b95ae834..c658be50b 100644
--- a/client/src/app/+video-editor/edit/video-editor-edit.resolver.ts
+++ b/client/src/app/+video-studio/edit/video-studio-edit.resolver.ts
@@ -4,7 +4,7 @@ import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
 import { VideoService } from '@app/shared/shared-main'
 
 @Injectable()
-export class VideoEditorEditResolver implements Resolve<any> {
+export class VideoStudioEditResolver implements Resolve<any> {
   constructor (
     private videoService: VideoService
   ) {
diff --git a/client/src/app/+video-studio/index.ts b/client/src/app/+video-studio/index.ts
new file mode 100644
index 000000000..d50c21cdc
--- /dev/null
+++ b/client/src/app/+video-studio/index.ts
@@ -0,0 +1 @@
+export * from './video-studio.module'
diff --git a/client/src/app/+video-studio/shared/index.ts b/client/src/app/+video-studio/shared/index.ts
new file mode 100644
index 000000000..9940ac6a9
--- /dev/null
+++ b/client/src/app/+video-studio/shared/index.ts
@@ -0,0 +1 @@
+export * from './video-studio.service'
diff --git a/client/src/app/+video-editor/shared/video-editor.service.ts b/client/src/app/+video-studio/shared/video-studio.service.ts
index 5b7053039..8d8b2f0e5 100644
--- a/client/src/app/+video-editor/shared/video-editor.service.ts
+++ b/client/src/app/+video-studio/shared/video-studio.service.ts
@@ -4,19 +4,19 @@ import { Injectable } from '@angular/core'
 import { RestExtractor } from '@app/core'
 import { objectToFormData } from '@app/helpers'
 import { VideoService } from '@app/shared/shared-main'
-import { VideoEditorCreateEdition, VideoEditorTask } from '@shared/models'
+import { VideoStudioCreateEdition, VideoStudioTask } from '@shared/models'
 
 @Injectable()
-export class VideoEditorService {
+export class VideoStudioService {
 
   constructor (
     private authHttp: HttpClient,
     private restExtractor: RestExtractor
   ) {}
 
-  editVideo (videoId: number | string, tasks: VideoEditorTask[]) {
-    const url = VideoService.BASE_VIDEO_URL + '/' + videoId + '/editor/edit'
-    const body: VideoEditorCreateEdition = {
+  editVideo (videoId: number | string, tasks: VideoStudioTask[]) {
+    const url = VideoService.BASE_VIDEO_URL + '/' + videoId + '/studio/edit'
+    const body: VideoStudioCreateEdition = {
       tasks
     }
 
diff --git a/client/src/app/+video-studio/video-studio-routing.module.ts b/client/src/app/+video-studio/video-studio-routing.module.ts
new file mode 100644
index 000000000..bcd9b79a5
--- /dev/null
+++ b/client/src/app/+video-studio/video-studio-routing.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { VideoStudioEditComponent, VideoStudioEditResolver } from './edit'
+
+const videoStudioRoutes: Routes = [
+  {
+    path: '',
+    children: [
+      {
+        path: 'edit/:videoId',
+        component: VideoStudioEditComponent,
+        data: {
+          meta: {
+            title: $localize`Studio`
+          }
+        },
+        resolve: {
+          video: VideoStudioEditResolver
+        }
+      }
+    ]
+  }
+]
+
+@NgModule({
+  imports: [ RouterModule.forChild(videoStudioRoutes) ],
+  exports: [ RouterModule ]
+})
+export class VideoStudioRoutingModule {}
diff --git a/client/src/app/+video-studio/video-studio.module.ts b/client/src/app/+video-studio/video-studio.module.ts
new file mode 100644
index 000000000..1a8763539
--- /dev/null
+++ b/client/src/app/+video-studio/video-studio.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core'
+import { SharedFormModule } from '@app/shared/shared-forms'
+import { SharedMainModule } from '@app/shared/shared-main'
+import { VideoStudioEditComponent, VideoStudioEditResolver } from './edit'
+import { VideoStudioService } from './shared'
+import { VideoStudioRoutingModule } from './video-studio-routing.module'
+
+@NgModule({
+  imports: [
+    VideoStudioRoutingModule,
+
+    SharedMainModule,
+    SharedFormModule
+  ],
+
+  declarations: [
+    VideoStudioEditComponent
+  ],
+
+  exports: [],
+
+  providers: [
+    VideoStudioService,
+    VideoStudioEditResolver
+  ]
+})
+export class VideoStudioModule { }
diff --git a/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts b/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
index 6e8a64f46..af26ea04d 100644
--- a/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
@@ -35,7 +35,7 @@ export class ActionButtonsComponent implements OnInit, OnChanges {
     playlist: false,
     download: true,
     update: true,
-    editor: true,
+    studio: true,
     blacklist: true,
     delete: true,
     report: true,
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index cd499845b..a831da099 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -144,8 +144,8 @@ const routes: Routes = [
   },
 
   {
-    path: 'video-editor',
-    loadChildren: () => import('./+video-editor/video-editor.module').then(m => m.VideoEditorModule),
+    path: 'studio',
+    loadChildren: () => import('./+video-studio/video-studio.module').then(m => m.VideoStudioModule),
     canActivateChild: [ MetaGuard ]
   },
 
diff --git a/client/src/app/shared/shared-main/users/user-notification.model.ts b/client/src/app/shared/shared-main/users/user-notification.model.ts
index d1b36f347..a2367166e 100644
--- a/client/src/app/shared/shared-main/users/user-notification.model.ts
+++ b/client/src/app/shared/shared-main/users/user-notification.model.ts
@@ -228,7 +228,7 @@ export class UserNotification implements UserNotificationServer {
           this.pluginQueryParams.pluginType = this.plugin.type + ''
           break
 
-        case UserNotificationType.MY_VIDEO_EDITION_FINISHED:
+        case UserNotificationType.MY_VIDEO_STUDIO_EDITION_FINISHED:
           this.videoUrl = this.buildVideoUrl(this.video)
           break
       }
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index ff1259fb8..e7cdb0183 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -207,7 +207,7 @@
         </div>
       </ng-container>
 
-      <ng-container *ngSwitchCase="19"> <!-- UserNotificationType.MY_VIDEO_EDITION_FINISHED -->
+      <ng-container *ngSwitchCase="19"> <!-- UserNotificationType.MY_VIDEO_STUDIO_EDITION_FINISHED -->
         <my-global-icon iconName="film" aria-hidden="true"></my-global-icon>
 
         <div class="message" i18n>
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 612fcf16c..2d4db9a28 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -228,8 +228,8 @@ export class Video implements VideoServerModel {
     return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.UPDATE_ANY_VIDEO))
   }
 
-  isEditableBy (user: AuthUser, videoEditorEnabled: boolean) {
-    return videoEditorEnabled &&
+  isEditableBy (user: AuthUser, videoStudioEnabled: boolean) {
+    return videoStudioEnabled &&
       this.state?.id === VideoState.PUBLISHED &&
       this.isUpdatableBy(user)
   }
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 29a711378..5eef96145 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -29,7 +29,7 @@ export type VideoActionsDisplayType = {
   liveInfo?: boolean
   removeFiles?: boolean
   transcoding?: boolean
-  editor?: boolean
+  studio?: boolean
 }
 
 @Component({
@@ -61,7 +61,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
     liveInfo: false,
     removeFiles: false,
     transcoding: false,
-    editor: true
+    studio: true
   }
   @Input() placement = 'left'
 
@@ -153,7 +153,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
   }
 
   isVideoEditable () {
-    return this.video.isEditableBy(this.user, this.serverService.getHTMLConfig().videoEditor.enabled)
+    return this.video.isEditableBy(this.user, this.serverService.getHTMLConfig().videoStudio.enabled)
   }
 
   isVideoRemovable () {
@@ -337,10 +337,10 @@ export class VideoActionsDropdownComponent implements OnChanges {
           isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable()
         },
         {
-          label: $localize`Editor`,
-          linkBuilder: ({ video }) => [ '/video-editor/edit', video.uuid ],
+          label: $localize`Studio`,
+          linkBuilder: ({ video }) => [ '/studio/edit', video.uuid ],
           iconName: 'film',
-          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.editor && this.isVideoEditable()
+          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.studio && this.isVideoEditable()
         },
         {
           label: $localize`Block`,