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 9c865e3ef..d319d15e6 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 @@ -48,7 +48,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`, - myVideoStudioEditionFinished: $localize`Video studio edition has finished`, + myVideoStudioEditionFinished: $localize`Video studio editing has finished`, myVideoTranscriptionGenerated: $localize`The transcription of your video has been generated` } this.notificationSettingGroups = [ diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.html b/client/src/app/+video-studio/edit/video-studio-edit.component.html index aa6a4535a..6eb21b87d 100644 --- a/client/src/app/+video-studio/edit/video-studio-edit.component.html +++ b/client/src/app/+video-studio/edit/video-studio-edit.component.html @@ -67,19 +67,19 @@
-
Video before edition
+
Video before editing
-
-
Edition tasks:
+
+
Editing tasks:
  1. {{ task }}
    2. diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.ts b/client/src/app/+video-studio/edit/video-studio-edit.component.ts index 436a0c3f5..a02d8e90e 100644 --- a/client/src/app/+video-studio/edit/video-studio-edit.component.ts +++ b/client/src/app/+video-studio/edit/video-studio-edit.component.ts @@ -34,7 +34,7 @@ import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.compon ] }) export class VideoStudioEditComponent extends FormReactive implements OnInit { - isRunningEdition = false + isRunningEditing = false video: VideoDetails @@ -86,10 +86,10 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { return this.serverService.getHTMLConfig().video.image.extensions } - async runEdition () { - if (this.isRunningEdition) return + async runEditing () { + if (this.isRunningEditing) return if (!this.form.valid) return - if (this.noEdition()) return + if (this.noEditing()) return const title = $localize`Are you sure you want to edit "${this.video.name}"?` const listHTML = this.getTasksSummary().map(t => `
  2. ${t}
    3. `).join('') @@ -100,7 +100,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { if (await this.confirmService.confirm(confirmHTML, title) !== true) return - this.isRunningEdition = true + this.isRunningEditing = true const tasks = this.buildTasks() @@ -109,7 +109,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { return this.videoStudioService.editVideo(this.video.uuid, tasks) .subscribe({ next: () => { - this.notifier.success($localize`Edition tasks created.`) + this.notifier.success($localize`Editing tasks created.`) // Don't redirect to old video version watch page that could be confusing for users this.router.navigateByUrl('/my-library/videos') @@ -117,7 +117,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { error: err => { this.loadingBar.useRef().complete() - this.isRunningEdition = false + this.isRunningEditing = false this.notifier.error(err.message) logger.error(err) } @@ -132,7 +132,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { return $localize`(extensions: ${this.imageExtensions.join(', ')})` } - noEdition () { + noEditing () { return this.buildTasks().length === 0 } diff --git a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html index f0577f452..4967073b4 100644 --- a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html +++ b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html @@ -16,16 +16,16 @@
    - +
    -
    +
    + - +
    - - + +
@@ -127,6 +127,6 @@
diff --git a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts index 18efc34de..7970ebc88 100644 --- a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts +++ b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts @@ -62,11 +62,11 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen @ViewChild('textarea', { static: true }) textarea: ElementRef @ViewChild('embed') embed: EmbedComponent - rawEdition = false + rawEdit = false segments: Segment[] = [] segmentToUpdate: Segment - segmentEditionError = '' + segmentEditError = '' private segmentToUpdateSave: Segment activeSegment: Segment @@ -126,7 +126,7 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen // --------------------------------------------------------------------------- loadCaptionContent () { - this.rawEdition = false + this.rawEdit = false if (this.videoCaption.action === 'CREATE' || this.videoCaption.action === 'UPDATE') { const file = this.videoCaption.captionfile as File @@ -144,8 +144,8 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen }) } - onRawEditionSwitch () { - if (this.rawEdition === true) { + onRawEditSwitch () { + if (this.rawEdit === true) { this.form.patchValue({ captionFileContent: this.formatSegments() }) this.resetTextarea() } else { @@ -163,16 +163,16 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen this.player.seek(segment.startMs / 1000) } - onEditionSaved (segment: Segment) { - this.segmentEditionError = '' + onEditSaved (segment: Segment) { + this.segmentEditError = '' if (segment.startMs >= segment.endMs) { - this.segmentEditionError = $localize`Start segment must be before end segment time` + this.segmentEditError = $localize`Start segment must be before end segment time` return } if (!segment.text) { - this.segmentEditionError = $localize`Segment must have a text content` + this.segmentEditError = $localize`Segment must have a text content` return } @@ -185,7 +185,7 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen this.scrollToSegment(segment) } - onEditionCanceled (segment: Segment) { + onEditCanceled (segment: Segment) { if (!this.segmentToUpdateSave) { this.segments = this.segments.filter(s => s.id !== segment.id) return @@ -195,11 +195,11 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen segment.endMs = this.segmentToUpdateSave.endMs segment.text = this.segmentToUpdateSave.text - this.onEditionSaved(segment) + this.onEditSaved(segment) } updateSegment (segment: Segment) { - this.segmentEditionError = '' + this.segmentEditError = '' this.segmentToUpdateSave = { ...segment } this.segmentToUpdate = segment @@ -306,14 +306,14 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen updateCaption () { if (this.segmentToUpdate) { - this.notifier.error($localize`A segment is being edited. Save or cancel the edition first.`) + this.notifier.error($localize`A segment is being edited. Save or cancel the edit first.`) return } const languageId = this.videoCaption.language.id const languageObject = this.videoCaptionLanguages.find(l => l.id === languageId) - if (this.rawEdition) { + if (this.rawEdit) { this.loadSegments(this.form.value['captionFileContent']) } diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index b03c9129a..9a3b9b985 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html @@ -200,7 +200,7 @@ @case ('CREATE') { Cancel creation } @case ('UPDATE') { - Cancel edition + Cancel edit } @case ('REMOVE') { Cancel deletion } diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts index 0dd7277cb..bc4c03b0f 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts @@ -409,7 +409,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { beforeDismiss: () => { return this.confirmService.confirm( $localize`Are you sure you want to close this modal without saving your changes?`, - $localize`Closing caption edition modal` + $localize`Closing caption editing modal` ) } }) diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html index 2722909ca..0302940b2 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html @@ -69,7 +69,7 @@ [parentComments]="newParentComments" [focusOnInit]="true" (commentCreated)="onCommentReplyCreated($event)" - (cancelEdition)="onResetReply()" + (cancelEdit)="onResetReply()" [textValue]="redraftValue" > diff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.html b/client/src/app/shared/standalone-notifications/user-notifications.component.html index 4b05d38d3..716da3819 100644 --- a/client/src/app/shared/standalone-notifications/user-notifications.component.html +++ b/client/src/app/shared/standalone-notifications/user-notifications.component.html @@ -213,7 +213,7 @@
- Your video {{ notification.video.name }} edition has finished + Your video {{ notification.video.name }} editing tasks have finished