aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+admin/users/shared/user.service.ts9
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html4
-rw-r--r--client/src/app/+my-account/my-account-videos/my-account-videos.component.html2
-rw-r--r--client/src/app/login/login.component.html2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.html1
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html2
6 files changed, 14 insertions, 6 deletions
diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index a0e2f666d..470beef08 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -4,7 +4,7 @@ import { Injectable } from '@angular/core'
4import { BytesPipe } from 'ngx-pipes' 4import { BytesPipe } from 'ngx-pipes'
5import { SortMeta } from 'primeng/components/common/sortmeta' 5import { SortMeta } from 'primeng/components/common/sortmeta'
6import { Observable } from 'rxjs' 6import { Observable } from 'rxjs'
7import { ResultList, UserCreate, UserUpdate, User } from '../../../../../../shared' 7import { ResultList, UserCreate, UserUpdate, User, UserRole } from '../../../../../../shared'
8import { environment } from '../../../../environments/environment' 8import { environment } from '../../../../environments/environment'
9import { RestExtractor, RestPagination, RestService } from '../../../shared' 9import { RestExtractor, RestPagination, RestService } from '../../../shared'
10import { I18n } from '@ngx-translate/i18n-polyfill' 10import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -81,7 +81,14 @@ export class UserService {
81 81
82 const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0) 82 const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0)
83 83
84 const roleLabels: { [ id in UserRole ]: string } = {
85 [UserRole.USER]: this.i18n('User'),
86 [UserRole.ADMINISTRATOR]: this.i18n('Administrator'),
87 [UserRole.MODERATOR]: this.i18n('Moderator')
88 }
89
84 return Object.assign(user, { 90 return Object.assign(user, {
91 roleLabel: roleLabels[user.role],
85 videoQuota, 92 videoQuota,
86 videoQuotaUsed 93 videoQuotaUsed
87 }) 94 })
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html
index 8caff972f..c542cc675 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html
@@ -1,5 +1,5 @@
1<div class="delete-me"> 1<div class="delete-me">
2 <p>Once you delete your account, there is no going back. Please be certain.</p> 2 <p i18n>Once you delete your account, there is no going back. Please be certain.</p>
3 3
4 <button (click)="deleteMe()">Delete your account</button> 4 <button (click)="deleteMe()" i18n>Delete your account</button>
5</div> \ No newline at end of file 5</div> \ No newline at end of file
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
index 276d01408..a6911e4bf 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
@@ -43,7 +43,7 @@
43 43
44 <my-edit-button [routerLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button> 44 <my-edit-button [routerLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button>
45 45
46 <my-button i18n label="Change ownership" 46 <my-button i18n-label label="Change ownership"
47 className="action-button-change-ownership" 47 className="action-button-change-ownership"
48 icon="icon-im-with-her" 48 icon="icon-im-with-her"
49 (click)="changeOwnership($event, video)" 49 (click)="changeOwnership($event, video)"
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 910583193..93dbed525 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -48,7 +48,7 @@
48 </div> 48 </div>
49 </div> 49 </div>
50 50
51 <input type="submit" value="Login" [disabled]="!form.valid"> 51 <input type="submit" i18n-value value="Login" [disabled]="!form.valid">
52 </form> 52 </form>
53</div> 53</div>
54 54
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 46869268c..33c766d87 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
@@ -18,6 +18,7 @@
18 <my-help i18n-preHtml preHtml="Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag."></my-help> 18 <my-help i18n-preHtml preHtml="Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag."></my-help>
19 <tag-input 19 <tag-input
20 [validators]="tagValidators" [errorMessages]="tagValidatorsMessages" 20 [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
21 i18n-placeholder placeholder="+ Tag" i18n-secondaryPlaceholder secondaryPlaceholder="Enter a new tag"
21 formControlName="tags" maxItems="5" modelAsStrings="true" 22 formControlName="tags" maxItems="5" modelAsStrings="true"
22 ></tag-input> 23 ></tag-input>
23 </div> 24 </div>
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html
index 2f0c9abb5..a933a64f0 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html
@@ -8,7 +8,7 @@
8 </div> 8 </div>
9 <span class="button-file-extension">(.torrent)</span> 9 <span class="button-file-extension">(.torrent)</span>
10 10
11 <div class="torrent-or-magnet">Or</div> 11 <div class="torrent-or-magnet" i18n>Or</div>
12 12
13 <div class="form-group form-group-magnet-uri"> 13 <div class="form-group form-group-magnet-uri">
14 <label i18n for="magnetUri">Paste magnet URI</label> 14 <label i18n for="magnetUri">Paste magnet URI</label>