interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/reword-edition' into 'develop' 

Reword "edition"

See merge request framasoft/peertube/PeerTube!35
This commit is contained in:
Chocobozzz 2025-02-10 15:02:27 +00:00
parent 50b067f9cd 21c4031c4d
commit 2842bdefd9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
View File

@ -48,7 +48,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
abuseStateChange: $localize`One of your abuse reports has been accepted or rejected by moderators`, abuseStateChange: $localize`One of your abuse reports has been accepted or rejected by moderators`,
newPeerTubeVersion: $localize`A new PeerTube version is available`, newPeerTubeVersion: $localize`A new PeerTube version is available`,
newPluginVersion: $localize`One of your plugin/theme has a new available version`, newPluginVersion: $localize`One of your plugin/theme has a new available version`,
myVideoStudioEditionFinished: $localize`Video studio editing has finished`, myVideoStudioEditionFinished: $localize`Processing of edits has finished`,
myVideoTranscriptionGenerated: $localize`The transcription of your video has been generated` myVideoTranscriptionGenerated: $localize`The transcription of your video has been generated`
} }
this.notificationSettingGroups = [ this.notificationSettingGroups = [

12
client/src/app/+video-studio/edit/video-studio-edit.component.html
View File

@ -67,19 +67,19 @@
</div> </div>
<my-button <my-button
theme="primary" i18n-label label="Run video editing" icon="circle-tick" theme="primary" i18n-label label="Apply edits" icon="circle-tick"
(click)="runEditing()" (keydown.enter)="runEditing()" (click)="runEdition()" (keydown.enter)="runEdition()"
[disabled]="!form.valid || isRunningEditing || noEditing()" [disabled]="!form.valid || isRunningEdition || noEdition()"
></my-button> ></my-button>
</form> </form>
<div class="embed-container"> <div class="embed-container">
<div class="mb-1 fw-bold" i18n>Video before editing</div> <div class="mb-1 fw-bold" i18n>Original video</div>
<my-embed [video]="video"></my-embed> <my-embed [video]="video"></my-embed>
</div> </div>
<div class="tasks-container" *ngIf="!noEditing()"> <div class="tasks-container" *ngIf="!noEdition()">
<div class="mb-1 fw-bold" i18n>Editing tasks:</div> <div class="mb-1 fw-bold" i18n>Edits to apply:</div>
<ol> <ol>
<li *ngFor="let task of getTasksSummary()">{{ task }}</li> <li *ngFor="let task of getTasksSummary()">{{ task }}</li>

6
client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html
View File

@ -16,9 +16,9 @@
<div class="d-flex justify-content-between align-items-center mb-3 ms-2"> <div class="d-flex justify-content-between align-items-center mb-3 ms-2">
<my-peertube-checkbox <my-peertube-checkbox
inputName="raw-edit" inputName="raw-edition"
[(ngModel)]="rawEdit" (ngModelChange)="onRawEditSwitch()" [(ngModel)]="rawEdition" (ngModelChange)="onRawEditionSwitch()"
i18n-labelText labelText="Raw edit" i18n-labelText labelText="Edit raw"
></my-peertube-checkbox> ></my-peertube-checkbox>
<my-button *ngIf="!rawEdit && !segmentToUpdate" i18n-label label="Add a new segment" (click)="addSegmentToEdit()"> <my-button *ngIf="!rawEdit && !segmentToUpdate" i18n-label label="Add a new segment" (click)="addSegmentToEdit()">

2
client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts
View File

@ -306,7 +306,7 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen
updateCaption () { updateCaption () {
if (this.segmentToUpdate) { if (this.segmentToUpdate) {
this.notifier.error($localize`A segment is being edited. Save or cancel the edit first.`) this.notifier.error($localize`A segment is being edited. Save or cancel your edits first.`)
return return
} }

2
client/src/app/+videos/+video-edit/shared/video-edit.component.html
View File

@ -200,7 +200,7 @@
@case ('CREATE') { @case ('CREATE') {
Cancel creation Cancel creation
} @case ('UPDATE') { } @case ('UPDATE') {
Cancel edit Cancel editing
} @case ('REMOVE') { } @case ('REMOVE') {
Cancel deletion Cancel deletion
} }

2
client/src/app/shared/standalone-notifications/user-notifications.component.html
View File

@ -213,7 +213,7 @@
<my-global-icon iconName="film" aria-hidden="true"></my-global-icon> <my-global-icon iconName="film" aria-hidden="true"></my-global-icon>
<div class="message" i18n> <div class="message" i18n>
Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> editing tasks have finished The edits to your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> have been applied
</div> </div>
</ng-container> </ng-container>