diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index a14ba3a4f..f8ce49f6a 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -13,7 +13,7 @@ type="text" id="fromName" class="form-control" formControlName="fromName" [ngClass]="{ 'input-error': formErrors.fromName }" > -
{{ formErrors.fromName }}
+
@@ -22,7 +22,7 @@ type="text" id="fromEmail" class="form-control" formControlName="fromEmail" [ngClass]="{ 'input-error': formErrors['fromEmail'] }" > -
{{ formErrors.fromEmail }}
+
@@ -31,14 +31,14 @@ type="text" id="subject" class="form-control" formControlName="subject" [ngClass]="{ 'input-error': formErrors['subject'] }" > -
{{ formErrors.subject }}
+
-
{{ formErrors.body }}
+
{{ error }}
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html index 20cbcec02..729fe5139 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html @@ -22,7 +22,7 @@ {getCacheSize('previews'), plural, =1 {cached image} other {cached images}} -
{{ formErrors.cache.previews.size }}
+
@@ -36,7 +36,7 @@ {getCacheSize('captions'), plural, =1 {cached caption} other {cached captions}}
-
{{ formErrors.cache.captions.size }}
+
@@ -50,7 +50,7 @@ {getCacheSize('torrents'), plural, =1 {cached torrent} other {cached torrents}}
-
{{ formErrors.cache.torrents.size }}
+
@@ -64,7 +64,7 @@ {getCacheSize('storyboards'), plural, =1 {cached storyboard} other {cached storyboards}}
-
{{ formErrors.cache.storyboards.size }}
+ @@ -98,7 +98,7 @@ [ngClass]="{ 'input-error': formErrors['instance.customizations.javascript'] }" > -
{{ formErrors.instance.customizations.javascript }}
+
@@ -127,7 +127,7 @@ color: red; id="customizationCSS" formControlName="css" class="form-control" dir="ltr" [ngClass]="{ 'input-error': formErrors['instance.customizations.css'] }" > -
{{ formErrors.instance.customizations.css }}
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html index 17a069928..18a2d04e5 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html @@ -34,7 +34,7 @@ [clearable]="false" > -
{{ formErrors.instance.defaultClientRoute }}
+
@@ -51,7 +51,7 @@
-
{{ formErrors.trending.videos.algorithms.default }}
+ @@ -126,7 +126,7 @@ -
{{ formErrors.broadcastMessage.level }}
+
@@ -137,7 +137,7 @@ [formError]="formErrors['broadcastMessage.message']" markdownType="to-unsafe-html" > -
{{ formErrors.broadcastMessage.message }}
+
@@ -193,7 +193,7 @@ {form.value['signup']['limit'], plural, =1 {user} other {users}} -
{{ formErrors.signup.limit }}
+ Signup won't be limited to a fixed number of users. @@ -209,7 +209,7 @@ {form.value['signup']['minimumAge'], plural, =1 {year old} other {years old}} -
{{ formErrors.signup.minimumAge }}
+ @@ -230,7 +230,7 @@ -
{{ formErrors.user.videoQuota }}
+
@@ -244,7 +244,7 @@ [clearable]="false" > -
{{ formErrors.user.videoQuotaDaily }}
+
@@ -282,7 +282,7 @@ jobs in parallel
-
{{ formErrors.import.concurrency }}
+
@@ -377,7 +377,7 @@ {form.value['videoChannels']['maxPerUser'], plural, =1 {channel} other {channels}}
-
{{ formErrors.videoChannels.maxPerUser }}
+ @@ -439,7 +439,7 @@ formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }" > -
{{ formErrors.search.searchIndex.url }}
+
@@ -537,7 +537,7 @@ type="text" id="followingsInstanceAutoFollowIndexUrl" class="form-control" formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }" > -
{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}
+
@@ -565,7 +565,7 @@ formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }" > -
{{ formErrors.admin.email }}
+
@@ -600,7 +600,7 @@ formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }" > -
{{ formErrors.services.twitter.username }}
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index cc8e699f3..2b2c2c7df 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -68,7 +68,7 @@
-
+ - + You cannot allow live replay if you don't enable transcoding. diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html index 91f3afd10..f8e49b385 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html @@ -22,7 +22,7 @@ dir="ltr" > -
{{ formErrors.instanceCustomHomepage.content }}
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html index 60f1aee2e..0d1ef1698 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html @@ -16,7 +16,7 @@ formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }" > -
{{ formErrors.instance.name }}
+
@@ -27,7 +27,7 @@ [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }" > -
{{ formErrors.instance.shortDescription }}
+
@@ -118,7 +118,7 @@
-
{{ formErrors.instance.defaultNSFWPolicy }}
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html index 1ba3bdfe0..5f73b18c3 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html @@ -54,7 +54,7 @@ {form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}}
-
{{ formErrors.live.maxInstanceLives }}
+
@@ -66,7 +66,7 @@ {form.value['live']['maxUserLives'], plural, =1 {live} other {lives}}
-
{{ formErrors.live.maxUserLives }}
+
@@ -77,7 +77,7 @@ bindLabel="label" bindValue="value" [clearable]="false" [searchable]="true" > -
{{ formErrors.live.maxDuration }}
+
@@ -178,7 +178,7 @@ formControlName="threads" [clearable]="false" > -
{{ formErrors.live.transcoding.threads }}
+
@@ -193,7 +193,7 @@ > -
{{ formErrors.live.transcoding.profile }}
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html index accf2c28c..f52a85884 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html @@ -175,7 +175,7 @@ [clearable]="false" > -
{{ formErrors.transcoding.threads }}
+
@@ -187,7 +187,7 @@ jobs in parallel
-
{{ formErrors.transcoding.concurrency }}
+
@@ -201,7 +201,7 @@ [clearable]="false" > -
{{ formErrors.transcoding.profile }}
+
diff --git a/client/src/app/+admin/follows/following-list/follow-modal.component.html b/client/src/app/+admin/follows/following-list/follow-modal.component.html index d0761b718..347296838 100644 --- a/client/src/app/+admin/follows/following-list/follow-modal.component.html +++ b/client/src/app/+admin/follows/following-list/follow-modal.component.html @@ -15,7 +15,7 @@ class="form-control" [ngClass]="{ 'input-error': formErrors['hostsOrHandles'] }" ngbAutofocus > -
+ -
+ diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html index 5d267f168..64d06f594 100644 --- a/client/src/app/+login/login.component.html +++ b/client/src/app/+login/login.component.html @@ -49,7 +49,7 @@ >
-
{{ formErrors.username }}
+
⚠️ Most email addresses do not include capital letters. diff --git a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html index 58f65d994..c2bfd6eb6 100644 --- a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html +++ b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html @@ -31,7 +31,7 @@ >
@{{ instanceHost }}
-
+
@@ -42,7 +42,7 @@ type="text" id="display-name" class="form-control d-block" formControlName="display-name" [ngClass]="{ 'input-error': formErrors['display-name'] }" > -
+
@@ -53,7 +53,7 @@ id="description" formControlName="description" class="form-control d-block" [ngClass]="{ 'input-error': formErrors['description'] }" > -
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html index 30ae9dd55..ef11a49e5 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html @@ -19,7 +19,7 @@ type="email" id="new-email" i18n-placeholder placeholder="New email" class="form-control" formControlName="new-email" [ngClass]="{ 'input-error': formErrors['new-email'] }" > -
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html index 2b192ab6d..3976bce74 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html @@ -19,7 +19,7 @@ type="text" id="display-name" class="form-control" formControlName="display-name" [ngClass]="{ 'input-error': formErrors['display-name'] }" > -
+
@@ -30,7 +30,7 @@ id="description" formControlName="description" class="form-control" [ngClass]="{ 'input-error': formErrors['description'] }" > -
+
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html index d0393a2a4..f54381d46 100644 --- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html +++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html @@ -10,7 +10,7 @@ -
{{ formErrors.channel }}
+
diff --git a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html index 611146c1a..2ffad3d39 100644 --- a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html +++ b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html @@ -24,7 +24,7 @@ > -
+
@@ -33,7 +33,7 @@ -
+
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html index 9475820ac..67ce7ea48 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html @@ -35,7 +35,7 @@ type="text" id="displayName" class="form-control" formControlName="displayName" [ngClass]="{ 'input-error': formErrors['displayName'] }" > -
+
@@ -55,7 +55,7 @@ > -
+
@@ -67,7 +67,7 @@ labelForId="videoChannelIdl" [items]="userVideoChannels" formControlName="videoChannelId" > -
+
diff --git a/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.html b/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.html index 56ff0e788..2f824669d 100644 --- a/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.html +++ b/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.html @@ -10,7 +10,7 @@ -
+
diff --git a/client/src/app/+signup/+register/steps/register-step-channel.component.html b/client/src/app/+signup/+register/steps/register-step-channel.component.html index c79256c68..342721f30 100644 --- a/client/src/app/+signup/+register/steps/register-step-channel.component.html +++ b/client/src/app/+signup/+register/steps/register-step-channel.component.html @@ -29,7 +29,7 @@ > -
{{ formErrors.displayName }}
+
@@ -45,9 +45,9 @@
@{{ instanceHost }}
-
{{ formErrors.name }}
+ -
+
diff --git a/client/src/app/+signup/+register/steps/register-step-terms.component.html b/client/src/app/+signup/+register/steps/register-step-terms.component.html index 1d753a3f2..bd63252a5 100644 --- a/client/src/app/+signup/+register/steps/register-step-terms.component.html +++ b/client/src/app/+signup/+register/steps/register-step-terms.component.html @@ -8,7 +8,7 @@ [ngClass]="{ 'input-error': formErrors['registrationReason'] }" > -
{{ formErrors.registrationReason }}
+
@@ -23,6 +23,6 @@ -
{{ formErrors.terms }}
+
diff --git a/client/src/app/+signup/+register/steps/register-step-user.component.html b/client/src/app/+signup/+register/steps/register-step-user.component.html index e978caea8..8715794b6 100644 --- a/client/src/app/+signup/+register/steps/register-step-user.component.html +++ b/client/src/app/+signup/+register/steps/register-step-user.component.html @@ -19,7 +19,7 @@ > -
{{ formErrors.displayName }}
+
@@ -37,7 +37,7 @@ @{{ instanceHost }}
-
{{ formErrors.username }}
+ @@ -54,7 +54,7 @@ formControlName="email" class="form-control" [ngClass]="{ 'input-error': formErrors['email'] }" > -
{{ formErrors.email }}
+
diff --git a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html index 023082f61..e3664845d 100644 --- a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html +++ b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html @@ -10,7 +10,7 @@ formControlName="verify-email-email" class="form-control" [ngClass]="{ 'input-error': formErrors['verify-email-email'] }" > -
{{ formErrors['verify-email-email'] }}
+
diff --git a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html index a3f0dbdb5..0eabfdbe7 100644 --- a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html @@ -15,7 +15,7 @@ > -
+ diff --git a/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.html b/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.html index e8079c74e..387e25192 100644 --- a/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.html @@ -15,7 +15,7 @@ > -
+
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 8342562c3..84c165236 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 @@ -16,7 +16,7 @@
-
+
@@ -35,7 +35,7 @@ -
+
@@ -72,7 +72,7 @@ labelForId="category" [items]="videoCategories" formControlName="category" [clearable]="true" > -
+
@@ -92,7 +92,7 @@ labelForId="licence" [items]="videoLicences" formControlName="licence" [clearable]="true" > -
+
@@ -104,7 +104,7 @@ [clearable]="true" [searchable]="true" [groupBy]="'group'" > -
+
@@ -115,7 +115,7 @@ labelForId="privacy" [items]="videoPrivacies" formControlName="privacy" [clearable]="false" > -
+
@@ -133,7 +133,7 @@ > -
+
@@ -261,7 +261,7 @@ type="text" [id]="'title[' + i + ']'" [name]="'title[' + i + ']'" formControlName="title" /> -
+ @@ -271,7 +271,7 @@
-
+
@@ -353,7 +353,7 @@ labelForId="latencyMode" [items]="latencyModes" formControlName="latencyMode" [clearable]="true" > -
+
@@ -433,7 +433,7 @@ > -
+
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html index 203e9ce62..9465fcffa 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html @@ -37,7 +37,7 @@ -
+
diff --git a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html index ab6967f28..f251cf44f 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html @@ -35,7 +35,7 @@ [ngClass]="{ 'input-error': formErrors['message'] }" class="form-control" > -
+
diff --git a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html index cc7bb6c92..8534c5b71 100644 --- a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html @@ -12,7 +12,7 @@ formControlName="moderationComment" ngbAutofocus i18-placeholder placeholder="Comment this report…" [ngClass]="{ 'input-error': formErrors['moderationComment'] }" class="form-control"> -
+
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.html b/client/src/app/shared/shared-forms/dynamic-form-field.component.html index 2dd6cf4ad..d447395ce 100644 --- a/client/src/app/shared/shared-forms/dynamic-form-field.component.html +++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.html @@ -40,7 +40,7 @@
-
+ diff --git a/client/src/app/shared/shared-forms/input-text.component.html b/client/src/app/shared/shared-forms/input-text.component.html index 4747e2f8f..f2a9139e5 100644 --- a/client/src/app/shared/shared-forms/input-text.component.html +++ b/client/src/app/shared/shared-forms/input-text.component.html @@ -19,4 +19,4 @@
-
{{ formError }}
+ diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.html b/client/src/app/shared/shared-forms/markdown-textarea.component.html index 7f8bd2f62..dea5693f7 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.html +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.html @@ -34,5 +34,5 @@
-
{{ formError }}
+
diff --git a/client/src/app/shared/shared-moderation/batch-domains-modal.component.html b/client/src/app/shared/shared-moderation/batch-domains-modal.component.html index 8306a96bc..b40759a74 100644 --- a/client/src/app/shared/shared-moderation/batch-domains-modal.component.html +++ b/client/src/app/shared/shared-moderation/batch-domains-modal.component.html @@ -15,7 +15,7 @@ class="form-control" [ngClass]="{ 'input-error': formErrors['hosts'] }" ngbAutofocus > -
+