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

Adjust search results note for i18n, adjust typeahead helper

pull/3888/head
Rigel Kent 2021-03-24 14:48:31 +01:00
parent 3cc20a1aca
commit a3caabe228
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+admin/plugins/plugin-search/plugin-search.component.html
View File

@ -20,8 +20,8 @@
<my-global-icon iconName="search"></my-global-icon> <my-global-icon iconName="search"></my-global-icon>
<ng-container i18n> <ng-container i18n>
{{ pagination.totalItems }} {pagination.totalItems, plural, =1 {result} other {results}} for "{{ search }}" {{ pagination.totalItems }} {pagination.totalItems, plural, =1 {result} other {results}} for {{ search }}"
</ng-container> </ng-container>
</ng-container> </ng-container>
</div> </div>

10
client/src/app/+search/search.component.html
View File

@ -2,14 +2,12 @@
<div class="results-header"> <div class="results-header">
<div class="first-line"> <div class="first-line">
<div class="results-counter" *ngIf="pagination.totalItems"> <div class="results-counter" *ngIf="pagination.totalItems">
<span i18n>{{ pagination.totalItems | myNumberFormatter }} {pagination.totalItems, plural, =1 {result} other {results}} </span> <span class="mr-1" i18n>{{ pagination.totalItems | myNumberFormatter }} {pagination.totalItems, plural, =1 {result} other {results}}</span>
<span i18n *ngIf="advancedSearch.searchTarget === 'local'">on this instance</span> <span class="mr-1" i18n *ngIf="advancedSearch.searchTarget === 'local'">on this instance</span>
<span i18n *ngIf="advancedSearch.searchTarget === 'search-index'">on the vidiverse</span> <span class="mr-1" i18n *ngIf="advancedSearch.searchTarget === 'search-index'">on the vidiverse</span>
<span *ngIf="currentSearch" i18n> <span *ngIf="currentSearch" i18n>for <span class="search-value">{{ currentSearch }}</span></span>
for <span class="search-value">{{ currentSearch }}</span>
</span>
</div> </div>
<div <div

4
client/src/app/header/search-typeahead.component.html
View File

@ -34,7 +34,8 @@
<!-- search instructions, when search input is empty --> <!-- search instructions, when search input is empty -->
<div *ngIf="areInstructionsDisplayed()" id="typeahead-instructions" class="overflow-hidden"> <div *ngIf="areInstructionsDisplayed()" id="typeahead-instructions" class="overflow-hidden">
<div class="d-flex justify-content-between"> <span class="text-muted" i18n>Your query will be matched against video names or descriptions, channel names.</span>
<div class="d-flex justify-content-between mt-3">
<label class="small-title" i18n>ADVANCED SEARCH</label> <label class="small-title" i18n>ADVANCED SEARCH</label>
<div class="advanced-search-status c-help"> <div class="advanced-search-status c-help">
<span [ngClass]="canSearchAnyURI ? 'text-success' : 'text-muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows."> <span [ngClass]="canSearchAnyURI ? 'text-success' : 'text-muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.">
@ -55,7 +56,6 @@
<em>UUID</em> <span class="text-muted" i18n>will list the matching video</span> <em>UUID</em> <span class="text-muted" i18n>will list the matching video</span>
</li> </li>
</ul> </ul>
<span class="text-muted" i18n>Any other input will return matching video or channel names.</span>
</div> </div>
</div> </div>