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

Fix tests

pull/904/merge
Chocobozzz 2018-08-06 10:05:06 +02:00
parent b2977eecb8
commit 60979b076d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
<label i18n for="targetUrl">URL</label> <label i18n for="targetUrl">URL</label>
<my-help <my-help
helpType="custom" i18n-customHtml helpType="custom" i18n-customHtml
customHtml="You can import any URL <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>supported by youtube-dl</a> or URL that points to a raw MP4 file. Failure to secure these rights could cause legal trouble to yourself and your instance." customHtml="You can import any URL <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>supported by youtube-dl</a> or URL that points to a raw MP4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance."
></my-help> ></my-help>
<input type="text" id="targetUrl" [(ngModel)]="targetUrl" /> <input type="text" id="targetUrl" [(ngModel)]="targetUrl" />

2
client/src/app/videos/+video-edit/video-upload.component.ts
View File

@ -100,7 +100,7 @@ export class VideoUploadComponent extends FormReactive implements OnInit, OnDest
if (this.videoUploaded === true) { if (this.videoUploaded === true) {
// FIXME: cannot concatenate strings inside i18n service :/ // FIXME: cannot concatenate strings inside i18n service :/
text = this.i18n('Your video was uploaded in your account and is private.') + text = this.i18n('Your video was uploaded to your account and is private.') +
this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?') this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?')
} else { } else {
text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?') text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?')

6
server/tests/client.ts
View File

@ -123,6 +123,12 @@ describe('Test a client controllers', function () {
it('Should update the customized configuration and have the correct index html tags', async function () { it('Should update the customized configuration and have the correct index html tags', async function () {
await updateCustomSubConfig(server.url, server.accessToken, { await updateCustomSubConfig(server.url, server.accessToken, {
instance: { instance: {
name: 'PeerTube updated',
shortDescription: 'my short description',
description: 'my super description',
terms: 'my super terms',
defaultClientRoute: '/videos/recently-added',
defaultNSFWPolicy: 'blur',
customizations: { customizations: {
javascript: 'alert("coucou")', javascript: 'alert("coucou")',
css: 'body { background-color: red; }' css: 'body { background-color: red; }'