Merge remote-tracking branch 'upstream/dev' into feature/unsaved-changes

This commit is contained in:
Michael Shamoon 2021-01-25 23:16:18 -08:00
parent 3f73cd5bfc
commit 2a7bb27a78
20 changed files with 198 additions and 177 deletions

View file

@ -1,4 +1,4 @@
import { Component, OnInit, OnDestroy, Renderer2 } from '@angular/core';
import { Component, Inject, LOCALE_ID, OnInit, Renderer2 } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
@ -44,7 +44,8 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent {
public savedViewService: SavedViewService,
private documentListViewService: DocumentListViewService,
private toastService: ToastService,
private settings: SettingsService
private settings: SettingsService,
@Inject(LOCALE_ID) public currentLocale: string
) { }
ngOnInit() {