diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-06 10:05:06 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 11:19:16 +0200 |
commit | 60979b076de00a7c7f6dde26617cd39357d9fc6d (patch) | |
tree | b652fc74c9dafdf9eee210eb79db76e236aa8c83 | |
parent | b2977eecb8eb5d599df0c6a7ab99a437a6a969c7 (diff) | |
download | PeerTube-60979b076de00a7c7f6dde26617cd39357d9fc6d.tar.gz PeerTube-60979b076de00a7c7f6dde26617cd39357d9fc6d.tar.zst PeerTube-60979b076de00a7c7f6dde26617cd39357d9fc6d.zip |
Fix tests
-rw-r--r-- | client/src/app/videos/+video-edit/video-import.component.html | 2 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-upload.component.ts | 2 | ||||
-rw-r--r-- | server/tests/client.ts | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-edit/video-import.component.html b/client/src/app/videos/+video-edit/video-import.component.html index cfad5e289..6b431f6f6 100644 --- a/client/src/app/videos/+video-edit/video-import.component.html +++ b/client/src/app/videos/+video-edit/video-import.component.html | |||
@@ -6,7 +6,7 @@ | |||
6 | <label i18n for="targetUrl">URL</label> | 6 | <label i18n for="targetUrl">URL</label> |
7 | <my-help | 7 | <my-help |
8 | helpType="custom" i18n-customHtml | 8 | helpType="custom" i18n-customHtml |
9 | 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." | 9 | 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." |
10 | ></my-help> | 10 | ></my-help> |
11 | 11 | ||
12 | <input type="text" id="targetUrl" [(ngModel)]="targetUrl" /> | 12 | <input type="text" id="targetUrl" [(ngModel)]="targetUrl" /> |
diff --git a/client/src/app/videos/+video-edit/video-upload.component.ts b/client/src/app/videos/+video-edit/video-upload.component.ts index e6c391d2f..c5e9c1592 100644 --- a/client/src/app/videos/+video-edit/video-upload.component.ts +++ b/client/src/app/videos/+video-edit/video-upload.component.ts | |||
@@ -100,7 +100,7 @@ export class VideoUploadComponent extends FormReactive implements OnInit, OnDest | |||
100 | 100 | ||
101 | if (this.videoUploaded === true) { | 101 | if (this.videoUploaded === true) { |
102 | // FIXME: cannot concatenate strings inside i18n service :/ | 102 | // FIXME: cannot concatenate strings inside i18n service :/ |
103 | text = this.i18n('Your video was uploaded in your account and is private.') + | 103 | text = this.i18n('Your video was uploaded to your account and is private.') + |
104 | this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?') | 104 | this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?') |
105 | } else { | 105 | } else { |
106 | text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?') | 106 | text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?') |
diff --git a/server/tests/client.ts b/server/tests/client.ts index 48f2ee4fc..b33a653b1 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts | |||
@@ -123,6 +123,12 @@ describe('Test a client controllers', function () { | |||
123 | it('Should update the customized configuration and have the correct index html tags', async function () { | 123 | it('Should update the customized configuration and have the correct index html tags', async function () { |
124 | await updateCustomSubConfig(server.url, server.accessToken, { | 124 | await updateCustomSubConfig(server.url, server.accessToken, { |
125 | instance: { | 125 | instance: { |
126 | name: 'PeerTube updated', | ||
127 | shortDescription: 'my short description', | ||
128 | description: 'my super description', | ||
129 | terms: 'my super terms', | ||
130 | defaultClientRoute: '/videos/recently-added', | ||
131 | defaultNSFWPolicy: 'blur', | ||
126 | customizations: { | 132 | customizations: { |
127 | javascript: 'alert("coucou")', | 133 | javascript: 'alert("coucou")', |
128 | css: 'body { background-color: red; }' | 134 | css: 'body { background-color: red; }' |