Merge branch 'dev' into feature-permissions

src-ui/src/app/app.module.ts

@@ -89,6 +89,7 @@ import { PermissionsGroupComponent } from './components/common/input/permissions
 import { IfOwnerDirective } from './directives/if-owner.directive'
 import { IfObjectPermissionsDirective } from './directives/if-object-permissions.directive'
 
+import localeAr from '@angular/common/locales/ar'
 import localeBe from '@angular/common/locales/be'
 import localeCs from '@angular/common/locales/cs'
 import localeDa from '@angular/common/locales/da'
@@ -111,6 +112,7 @@ import localeZh from '@angular/common/locales/zh'
 import { PermissionsDialogComponent } from './components/common/permissions-dialog/permissions-dialog.component'
 import { PermissionsFormComponent } from './components/common/input/permissions/permissions-form/permissions-form.component'
 
+registerLocaleData(localeAr)
 registerLocaleData(localeBe)
 registerLocaleData(localeCs)
 registerLocaleData(localeDa)

src-ui/src/app/components/document-detail/document-detail.component.html

@@ -149,7 +149,7 @@
 
                 <li [ngbNavItem]="4" class="d-md-none">
                     <a ngbNavLink>Preview</a>
-                    <ng-template ngbNavContent *ngIf="pdfPreview.offsetParent === undefined">
+                    <ng-template ngbNavContent *ngIf="!pdfPreview.offsetParent">
                         <div class="position-relative">
                             <ng-container *ngIf="getContentType() === 'application/pdf'">
                                 <div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer">
@@ -191,9 +191,9 @@
             <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
             <ng-container>
-                <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) === false">Discard</button>&nbsp;
-                <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) === false || error">Save & next</button>&nbsp;
-                <button type="submit" class="btn btn-primary" *appIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) === false || error">Save</button>&nbsp;
+                <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Discard</button>&nbsp;
+                <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true || error">Save & next</button>&nbsp;
+                <button type="submit" class="btn btn-primary" *appIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true || error">Save</button>&nbsp;
             </ng-container>
         </form>
     </div>

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html

@@ -25,7 +25,13 @@
           </h5>
         </div>
         <p class="card-text">
-          <span *ngIf="document.__search_hit__" [innerHtml]="document.__search_hit__.highlights"></span>
+          <span *ngIf="document.__search_hit__ && document.__search_hit__.highlights" [innerHtml]="document.__search_hit__.highlights"></span>
+          <span *ngIf="document.__search_hit__ && document.__search_hit__.comment_highlights">
+            <svg width="1em" height="1em" fill="currentColor" class="me-2">
+              <use xlink:href="assets/bootstrap-icons.svg#chat-left-text"/>
+            </svg>
+            <span [innerHtml]="document.__search_hit__.comment_highlights"></span>
+          </span>
           <span *ngIf="!document.__search_hit__" class="result-content">{{contentTrimmed}}</span>
         </p>
 

src-ui/src/app/data/paperless-document.ts

@@ -10,6 +10,7 @@ export interface SearchHit {
   rank?: number
 
   highlights?: string
+  comment_highlights?: string
 }
 
 export interface PaperlessDocument extends ObjectWithPermissions {

src-ui/src/app/services/settings.service.ts

@@ -163,6 +163,12 @@ export class SettingsService {
         englishName: 'English (US)',
         dateInputFormat: 'mm/dd/yyyy',
       },
+      {
+        code: 'ar-ar',
+        name: $localize`Arabic`,
+        englishName: 'Arabic',
+        dateInputFormat: 'yyyy-mm-dd',
+      },
       {
         code: 'be-by',
         name: $localize`Belarusian`,