X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.html;h=44de716a398a67455b9db4c851f5b0fffcc4a921;hb=c9e3565dc8d0e5ce0dcbdb4fe8deb7a257d9e2a0;hp=b8682ffe0ae264d02d20012a4b77bc3baa6a423a;hpb=5fb2e2888ce032c638e4b75d07458642f0833e52;p=github%2FChocobozzz%2FPeerTube.git

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 b8682ffe0..44de716a3 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
@@ -1,3 +1,4 @@
+<h1 class="sr-only" i18n>Configuration</h1>
 <form role="form" [formGroup]="form">
 
   <div ngbNav #nav="ngbNav" class="nav-tabs">
@@ -342,7 +343,7 @@
               <div class="form-group">
                 <my-peertube-checkbox
                   inputName="signupEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Signup enabled"
+                  i18n-labelText labelText="Enable Signup"
                 >
                   <ng-container ngProjectAs="description">
                     <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
@@ -430,7 +431,7 @@
                   <div class="form-group">
                     <my-peertube-checkbox
                       inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                      i18n-labelText labelText="Blacklist new videos automatically"
+                      i18n-labelText labelText="Block new videos automatically"
                     >
                     <ng-container ngProjectAs="description">
                       <span i18n>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</span>
@@ -461,7 +462,7 @@
                     i18n-labelText labelText="Allow users to do remote URI/handle search"
                   >
                     <ng-container ngProjectAs="description">
-                      <span i18n>Add ability for <strong>your users</strong> to fetch remote videos/actors by their URI, that may not be federated with your instance</span>
+                      <span i18n>Allow <strong>your users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
                     </ng-container>
                   </my-peertube-checkbox>
                 </div>
@@ -472,7 +473,7 @@
                     i18n-labelText labelText="Allow anonymous to do remote URI/handle search"
                   >
                     <ng-container ngProjectAs="description">
-                      <span i18n>Add ability for <strong>anonymous</strong> to fetch remote videos/actors by their URI, that may not be federated with your instance</span>
+                      <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
                     </ng-container>
                   </my-peertube-checkbox>
                 </div>
@@ -483,39 +484,46 @@
                 <div class="form-group">
                   <my-peertube-checkbox
                     inputName="searchIndexEnabled" formControlName="enabled"
-                    i18n-labelText labelText="Enable search index"
+                    i18n-labelText labelText="Enable global search"
                   >
+                    <ng-container ngProjectAs="description">
+                      <p i18n>⚠️ This functionality depends heavily on the moderation of instances followed by the search index you select.</p>
 
-                  <ng-container ngProjectAs="extra">
-                    <div [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }">
-                      <label i18n for="searchIndexUrl">Search index URL</label>
-                      <input
-                        type="text"  id="searchIndexUrl" class="form-control"
-                        formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }"
-                      >
-                      <div *ngIf="formErrors.search.searchIndex.url" class="form-error">{{ formErrors.search.searchIndex.url }}</div>
-                    </div>
+                      <span i18n>
+                        You should only use moderated search indexes in production, or <a href="https://framagit.org/framasoft/peertube/search-index">host your own</a>.
+                      </span>
+                    </ng-container>
 
-                    <div class="mt-3">
-                      <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
-                        inputName="searchIndexDisableLocalSearch" formControlName="disableLocalSearch"
-                        i18n-labelText labelText="Disable local search"
-                      ></my-peertube-checkbox>
-                    </div>
+                    <ng-container ngProjectAs="extra">
+                      <div [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }">
+                        <label i18n for="searchIndexUrl">Search index URL</label>
+                        <input
+                          type="text"  id="searchIndexUrl" class="form-control"
+                          formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }"
+                        >
+                        <div *ngIf="formErrors.search.searchIndex.url" class="form-error">{{ formErrors.search.searchIndex.url }}</div>
+                      </div>
 
-                    <div class="mt-3">
-                      <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
-                        inputName="searchIndexIsDefaultSearch" formControlName="isDefaultSearch"
-                        i18n-labelText labelText="Set search index as default"
-                      >
-                        <ng-container ngProjectAs="description">
-                          <span i18n>The local search is used by default</span>
-                        </ng-container>
-                      </my-peertube-checkbox>
-                    </div>
+                      <div class="mt-3">
+                        <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                          inputName="searchIndexDisableLocalSearch" formControlName="disableLocalSearch"
+                          i18n-labelText labelText="Disable local search in search bar"
+                        ></my-peertube-checkbox>
+                      </div>
 
-                  </ng-container>
-                </my-peertube-checkbox>
+                      <div class="mt-3">
+                        <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                          inputName="searchIndexIsDefaultSearch" formControlName="isDefaultSearch"
+                          i18n-labelText labelText="Search bar uses the global search index by default"
+                        >
+                          <ng-container ngProjectAs="description">
+                            <span i18n>Otherwise the local search stays used by default</span>
+                          </ng-container>
+                        </my-peertube-checkbox>
+                      </div>
+
+                    </ng-container>
+                  </my-peertube-checkbox>
                 </div>
 
               </ng-container>
@@ -580,7 +588,7 @@
                         <p i18n>⚠️ This functionality requires a lot of attention and extra moderation.</p>
 
                         <span i18n>
-                          You should only follow indexes you trust, or <a href="https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow">host your own</a>.
+                          You should only follow moderated indexes in production, or <a href="https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow">host your own</a>.
                         </span>
                       </ng-container>
 
@@ -664,16 +672,16 @@
                 <div class="form-group">
                   <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
                     <ng-template ptTemplate="label">
-                      <ng-container i18n>Instance whitelisted by Twitter</ng-container>
+                      <ng-container i18n>Instance allowed by Twitter</ng-container>
                     </ng-template>
 
                     <ng-template ptTemplate="help">
                       <ng-container i18n>
-                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
-                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
+                        If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
+                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<br /><br />
                         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                         <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
-                        to see if you instance is whitelisted.
+                        to see if you instance is allowed.
                       </ng-container>
                     </ng-template>
                   </my-peertube-checkbox>