TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-06 04:51:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken translations for snackbars

Browse Source
This commit is contained in:
Isaac Abadi
2022-06-23 01:22:22 -04:00
parent 2ba1dc6333
commit a2d1b154a3
8 changed files with 151 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/components/recent-videos/recent-videos.component.ts
View File

@@ -276,13 +276,13 @@ export class RecentVideosComponent implements OnInit {
deleteNormalFile(file: DatabaseFile, blacklistMode = false): void {
this.postsService.deleteFile(file.uid, blacklistMode).subscribe(result => {
if (result) {
this.postsService.openSnackBar($localize`Delete success!', 'OK.`);
this.postsService.openSnackBar($localize`Delete success!`, $localize`OK.`);
this.removeFileCard(file);
} else {
this.postsService.openSnackBar($localize`Delete failed!', 'OK.`);
this.postsService.openSnackBar($localize`Delete failed!`, $localize`OK.`);
}
}, () => {
this.postsService.openSnackBar($localize`Delete failed!', 'OK.`);
this.postsService.openSnackBar($localize`Delete failed!`, $localize`OK.`);
});
}
@@ -297,7 +297,7 @@ export class RecentVideosComponent implements OnInit {
deleteAndRedownload(file: DatabaseFile): void {
const sub = this.postsService.getSubscriptionByID(file.sub_id);
this.postsService.deleteSubscriptionFile(sub, file.id, false, file.uid).subscribe(() => {
this.postsService.openSnackBar(`Successfully deleted file: '${file.id}'`);
this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
this.removeFileCard(file);
});
}
@@ -305,7 +305,7 @@ export class RecentVideosComponent implements OnInit {
deleteForever(file: DatabaseFile): void {
const sub = this.postsService.getSubscriptionByID(file.sub_id);
this.postsService.deleteSubscriptionFile(sub, file.id, true, file.uid).subscribe(() => {
this.postsService.openSnackBar(`Successfully deleted file: '${file.id}'`);
this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
this.removeFileCard(file);
});
}
@@ -316,6 +316,7 @@ export class RecentVideosComponent implements OnInit {
this.getAllFiles(true);
}
// TODO: Add translation support for these snackbars
addFileToPlaylist(info_obj) {
const file = info_obj['file'];
const playlist_id = info_obj['playlist_id'];

14
src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
View File

@@ -58,31 +58,31 @@ export class ShareMediaDialogComponent implements OnInit {
}
copiedToClipboard() {
this.openSnackBar('Copied to clipboard!');
this.postsService.openSnackBar($localize`Copied to clipboard!`);
}
sharingChanged(event) {
if (event.checked) {
this.postsService.enableSharing(this.uid, this.is_playlist).subscribe(res => {
if (res['success']) {
this.openSnackBar('Sharing enabled.');
this.postsService.openSnackBar($localize`Sharing enabled.`);
this.sharing_enabled = true;
} else {
this.openSnackBar('Failed to enable sharing.');
this.postsService.openSnackBar($localize`Failed to enable sharing.`);
}
}, err => {
this.openSnackBar('Failed to enable sharing - server error.');
this.postsService.openSnackBar($localize`Failed to enable sharing - server error.`);
});
} else {
this.postsService.disableSharing(this.uid, this.is_playlist).subscribe(res => {
if (res['success']) {
this.openSnackBar('Sharing disabled.');
this.postsService.openSnackBar($localize`Sharing disabled.`);
this.sharing_enabled = false;
} else {
this.openSnackBar('Failed to disable sharing.');
this.postsService.openSnackBar($localize`Failed to disable sharing.`);
}
}, err => {
this.openSnackBar('Failed to disable sharing - server error.');
this.postsService.openSnackBar($localize`Failed to disable sharing - server error.`);
});
}
}

13
src/app/dialogs/subscribe-dialog/subscribe-dialog.component.ts
View File

@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { MatDialogRef, MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { PostsService } from 'app/posts.services';
import { ArgModifierDialogComponent } from '../arg-modifier-dialog/arg-modifier-dialog.component';
@@ -70,7 +69,6 @@ export class SubscribeDialogComponent implements OnInit {
];
constructor(private postsService: PostsService,
private snackBar: MatSnackBar,
private dialog: MatDialog,
public dialogRef: MatDialogRef<SubscribeDialogComponent>) { }
@@ -81,7 +79,7 @@ export class SubscribeDialogComponent implements OnInit {
if (this.url && this.url !== '') {
// timerange must be specified if download_all is false
if (!this.download_all && !this.timerange_amount) {
this.openSnackBar('You must specify an amount of time');
this.postsService.openSnackBar($localize`You must specify an amount of time`);
return;
}
this.subscribing = true;
@@ -97,7 +95,7 @@ export class SubscribeDialogComponent implements OnInit {
this.dialogRef.close(res['new_sub']);
} else {
if (res['error']) {
this.openSnackBar('ERROR: ' + res['error']);
this.postsService.openSnackBar($localize`ERROR: ` + res['error']);
}
this.dialogRef.close();
}
@@ -118,11 +116,4 @@ export class SubscribeDialogComponent implements OnInit {
}
});
}
public openSnackBar(message: string, action = '') {
this.snackBar.open(message, action, {
duration: 2000,
});
}
}

12
src/app/dialogs/update-progress-dialog/update-progress-dialog.component.ts
View File

@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { PostsService } from 'app/posts.services';
import { MatSnackBar } from '@angular/material/snack-bar';
import { UpdaterStatus } from '../../../api-types';
@Component({
@@ -14,7 +13,7 @@ export class UpdateProgressDialogComponent implements OnInit {
updateInterval = 250;
errored = false;
constructor(private postsService: PostsService, private snackBar: MatSnackBar) { }
constructor(private postsService: PostsService) { }
ngOnInit(): void {
this.getUpdateProgress();
@@ -28,16 +27,9 @@ export class UpdateProgressDialogComponent implements OnInit {
if (res) {
this.updateStatus = res;
if (this.updateStatus && this.updateStatus['error']) {
this.openSnackBar('Update failed. Check logs for more details.');
this.postsService.openSnackBar($localize`Update failed. Check logs for more details.`);
}
}
});
}
public openSnackBar(message: string, action: string = '') {
this.snackBar.open(message, action, {
duration: 2000,
});
}
}

4
src/app/main/main.component.ts
View File

@@ -384,7 +384,7 @@ export class MainComponent implements OnInit {
}, () => { // can't access server
this.downloadingfile = false;
this.current_download = null;
this.postsService.openSnackBar($localize`Download failed!', 'OK.`);
this.postsService.openSnackBar($localize`Download failed!`, 'OK.');
});
if (!this.autoplay && urls.length === 1) {
@@ -771,7 +771,7 @@ export class MainComponent implements OnInit {
} else if (this.current_download['finished'] && this.current_download['error']) {
this.downloadingfile = false;
this.current_download = null;
this.postsService.openSnackBar($localize`Download failed!', 'OK.`);
this.postsService.openSnackBar($localize`Download failed!`, 'OK.');
}
} else {
// console.log('failed to get new download');

12
src/app/player/player.component.ts
View File

@@ -3,7 +3,6 @@ import { VgApiService } from '@videogular/ngx-videogular/core';
import { PostsService } from 'app/posts.services';
import { ActivatedRoute, Router } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { ShareMediaDialogComponent } from '../dialogs/share-media-dialog/share-media-dialog.component';
import { FileType } from '../../api-types';
@@ -109,7 +108,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
}
constructor(public postsService: PostsService, private route: ActivatedRoute, private dialog: MatDialog, private router: Router,
public snackBar: MatSnackBar, private cdr: ChangeDetectorRef) {
private cdr: ChangeDetectorRef) {
}
processConfig(): void {
@@ -147,7 +146,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
this.postsService.getFile(this.uid, this.uuid).subscribe(res => {
this.db_file = res['file'];
if (!this.db_file) {
this.postsService.openSnackBar($localize`Failed to get file information from the server.', 'Dismiss`);
this.postsService.openSnackBar($localize`Failed to get file information from the server.`, 'Dismiss');
return;
}
this.postsService.incrementViewCount(this.db_file['uid'], null, this.uuid).subscribe(() => undefined, err => {
@@ -169,6 +168,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
this.uids = this.subscription.videos.map(video => video['uid']);
this.parseFileNames();
}, () => {
// TODO: Make translatable
this.postsService.openSnackBar(`Failed to find subscription ${this.sub_id}`, 'Dismiss');
});
}
@@ -183,10 +183,10 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
this.show_player = true;
this.parseFileNames();
} else {
this.postsService.openSnackBar($localize`Failed to load playlist!', '`);
this.postsService.openSnackBar($localize`Failed to load playlist!`);
}
}, () => {
this.postsService.openSnackBar($localize`Failed to load playlist!', '`);
this.postsService.openSnackBar($localize`Failed to load playlist!`);
});
}
@@ -351,7 +351,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
width: '60vw'
});
dialogRef.afterClosed().subscribe(res => {
dialogRef.afterClosed().subscribe(() => {
if (!this.playlist_id) {
this.getFile();
} else {

3
src/app/settings/settings.component.ts
View File

@@ -176,6 +176,7 @@ export class SettingsComponent implements OnInit {
if (confirmed) {
this.postsService.deleteCategory(category['uid']).subscribe(res => {
if (res['success']) {
// TODO: Make translatable
this.postsService.openSnackBar(`Successfully deleted ${category['name']}!`);
this.postsService.reloadCategories();
}
@@ -233,7 +234,7 @@ export class SettingsComponent implements OnInit {
window['external']['AddFavorite'](url, title);
} else if (window['chrome']) {
// Google Chrome
this.postsService.openSnackBar($localize`Chrome users must drag the \'Alternate URL\' link to your bookmarks.`);
this.postsService.openSnackBar($localize`Chrome users must drag the 'Alternate URL' link to your bookmarks.`);
} else if (window['sidebar']) {
// Firefox
window['sidebar'].addPanel(title, url, '');