update init i18n params (#154)

shiyiya · Feb 25, 2025 · 74cd472 · 74cd472
1 parent 7588fc5
commit 74cd472
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 278 deletions.
diff --git a/examples/standalone/main.ts b/examples/standalone/main.ts
diff --git a/examples/standalone/package-lock.json b/examples/standalone/package-lock.json
diff --git a/packages/core/src/i18n/index.ts b/packages/core/src/i18n/index.ts
@@ -1,8 +1,8 @@
 import type { Lang } from '../types'
 import { mergeDeep } from '../utils'
 import CN from './zh-CN.json'
-import FA from "./fa.json"
-import PA from "./pa.json"
+import FA from './fa.json'
+import PA from './pa.json'
 export default class I18n {
   public lang: Lang
 
@@ -14,11 +14,16 @@ export default class I18n {
     en: Object.keys(CN).reduce<Record<string, string>>(
       (previous, current) => ((previous[current] = current), previous),
       {}
-    ),
+    )
   }
 
-  constructor(defaultLang: Lang) {
+  constructor(defaultLang: Lang, userLanguages?: Partial<Record<Lang, any>>) {
     this.lang = defaultLang === 'auto' ? (navigator.language as Lang) : defaultLang
+
+    if (userLanguages) {
+      mergeDeep(this.languages, userLanguages)
+    }
+
     if (!this.languages[this.lang]) {
       navigator.languages.some((lang) => {
         if (this.languages[lang as Lang]) {
@@ -37,6 +42,7 @@ export default class I18n {
         return false
       })
     }
+
     if (!this.languages[this.lang]) this.lang = 'en'
   }
 

diff --git a/packages/core/src/player.ts b/packages/core/src/player.ts
@@ -11,6 +11,7 @@ import type {
   PlayerListener,
   PlayerOptions,
   PlayerPlugin,
+  RequiredPartial,
   Source
 } from './types'
 
@@ -28,13 +29,13 @@ const defaultOptions = {
   isLive: false,
   autopause: true,
   isNativeUI: () => isQQBrowser
-}
+} as const
 
 export class Player<Context extends Record<string, any> = Record<string, any>> {
   static players: Player[] = []
 
   container: HTMLElement
-  options: Required<PlayerOptions>
+  options: RequiredPartial<PlayerOptions, 'languages'>
 
   locales: I18n
   eventEmitter: EventEmitter
@@ -62,7 +63,7 @@ export class Player<Context extends Record<string, any> = Record<string, any>> {
       typeof options === 'string' ? { source: { src: options } } : options
     )
 
-    this.locales = new I18n(this.options.lang)
+    this.locales = new I18n(this.options.lang, this.options.languages)
     this.eventEmitter = new EventEmitter()
   }
 

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -57,6 +57,7 @@ export interface PlayerOptions {
   playsinline?: boolean
   preload?: 'auto' | 'metadata' | 'none'
   lang?: Lang
+  languages?: Partial<Record<Lang, any>> 
   isLive?: boolean
   videoAttr?: Record<string, boolean | string>
   isNativeUI?: () => boolean

diff --git a/packages/danmaku/package.json b/packages/danmaku/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oplayer/danmaku",
-  "version": "1.2.25",
+  "version": "1.2.26-beta.0",
   "description": "Danmaku plugin for oplayer",
   "type": "module",
   "main": "./dist/index.es.js",