Skip to content

Commit

Permalink
Merge branch 'master' into gh-3078
Browse files Browse the repository at this point in the history
  • Loading branch information
retorquere committed Nov 28, 2024
2 parents 4bac59b + 9e56f21 commit 53941fc
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions content/translators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Shim } from './os'
import * as client from './client'
const $OS = client.is7 ? Shim : OS
import merge from 'lodash.merge'
import { pick } from './object'
import { Cache } from './db/cache'
import { Serializer } from './item-export-format'

Expand Down Expand Up @@ -401,7 +400,7 @@ export const Translators = new class { // eslint-disable-line @typescript-eslint

public displayOptions(translatorID: string, displayOptions: any): any {
const defaults = this.byId[translatorID]?.displayOptions || {}
return pick(merge({}, defaults, displayOptions), Object.keys(defaults))
return merge({}, defaults, displayOptions)
}

public async exportItems(job: ExportJob): Promise<string> {
Expand Down

0 comments on commit 53941fc

Please sign in to comment.