@sumaris-net/ngx-components 2.11.6 → 2.11.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/doc/changelog.md +6 -0
- package/esm2022/src/app/shared/validator/form-error-adapter.class.mjs +5 -5
- package/fesm2022/sumaris-net.ngx-components.mjs +4 -4
- package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +1 -1
- package/src/app/shared/validator/form-error-adapter.class.d.ts +8 -2
- package/src/assets/manifest.json +1 -1
- package/src/theme/_mixins.scss +2 -1
- package/src/theme/_ngx-components.globals.scss +10 -4
- package/src/theme/_ngx-components.table.scss +1 -1
package/doc/changelog.md
CHANGED
|
@@ -831,3 +831,9 @@ enh: Environment: add useHash property to configure Angular router to use hash U
|
|
|
831
831
|
# 2.11.3
|
|
832
832
|
- fix(app-text-form): Input `autoHeight` is now deprecated (use `autoSize` instead)
|
|
833
833
|
- enh(app-text-form): Add new inputs `autoSizeMinRows` and `autoSizeMaxRows`
|
|
834
|
+
|
|
835
|
+
# 2.11.7
|
|
836
|
+
- fix(css): Dark theme: fix style
|
|
837
|
+
|
|
838
|
+
# 2.11.8
|
|
839
|
+
- fix(form-error): Add options to `IFormPathTranslator.translateFormPath()`
|
|
@@ -73,12 +73,12 @@ export class FormErrorTranslator {
|
|
|
73
73
|
}, ''));
|
|
74
74
|
}
|
|
75
75
|
translateFormPath(path, opts) {
|
|
76
|
-
if (opts?.pathTranslator) {
|
|
77
|
-
return opts.pathTranslator.translateFormPath(path);
|
|
76
|
+
if (opts?.pathTranslator && opts.pathTranslator !== this) {
|
|
77
|
+
return opts.pathTranslator.translateFormPath(path, opts);
|
|
78
78
|
}
|
|
79
79
|
// For v2.8.x compatibility
|
|
80
|
-
if (opts['controlPathTranslator']) {
|
|
81
|
-
return opts['controlPathTranslator'].translateControlPath(path);
|
|
80
|
+
if (opts['controlPathTranslator'] && opts['controlPathTranslator'] !== this) {
|
|
81
|
+
return opts['controlPathTranslator'].translateControlPath(path, opts);
|
|
82
82
|
}
|
|
83
83
|
const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
|
|
84
84
|
return this.translateContext.instant(i18nKey, opts?.i18nSuffix);
|
|
@@ -120,4 +120,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
120
120
|
type: Inject,
|
|
121
121
|
args: [APP_FORM_ERROR_I18N_KEYS]
|
|
122
122
|
}] }] });
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-error-adapter.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/validator/form-error-adapter.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAG7E,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;;;;AAKhD,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,cAAc,CAAoB,kBAAkB,CAAC,CAAC;AAmClG,MAAM,OAAO,mBAAmB;IAIpB;IACA;IAJO,aAAa,CAAoB;IAElD,YACU,SAA2B,EAC3B,gBAAyC,EACH,aAAgC;QAFtE,cAAS,GAAT,SAAS,CAAkB;QAC3B,qBAAgB,GAAhB,gBAAgB,CAAyB;QAGjD,IAAI,CAAC,aAAa,GAAG;YACnB,GAAG,gBAAgB,CAAC,eAAe;YACnC,GAAG,aAAa;SACjB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,OAAwB,EAAE,IAA6D;QACzG,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAE5C,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;QACnD,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC;QACpD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,CACL,MAAM;YACN,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACvC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvC,oCAAoC;gBACpC,IAAI,YAAY,EAAE,CAAC;oBACjB,kCAAkC;oBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAEpD,mCAAmC;oBACnC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACtI,IAAI,YAAY,CAAC,YAAY,CAAC;wBAAE,OAAO,GAAG,CAAC;oBAC3C,gBAAgB;oBAChB,IAAI,GAAG,CAAC,MAAM;wBAAE,GAAG,IAAI,SAAS,CAAC;oBACjC,OAAO,GAAG,GAAG,QAAQ,GAAG,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9D,CAAC;gBAED,8BAA8B;gBAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC1D,IAAI,KAAK,CAAC,SAAS,CAAC;oBAAE,OAAO,GAAG,CAAC;gBACjC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;YACzD,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,MAAkB,EAAE,IAAgC;QAClE,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;QACnD,OAAO,CACL,MAAM;YACN,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACvC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;gBAChC,oCAAoC;gBAEpC,IAAI,UAAU,EAAE,CAAC;oBACf,kCAAkC;oBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAEpD,mCAAmC;oBACnC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACpH,IAAI,YAAY,CAAC,YAAY,CAAC;wBAAE,OAAO,GAAG,CAAC;oBAC3C,gBAAgB;oBAChB,IAAI,GAAG,CAAC,MAAM;wBAAE,GAAG,IAAI,SAAS,CAAC;oBACjC,OAAO,GAAG,GAAG,QAAQ,GAAG,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9D,CAAC;gBAED,8BAA8B;gBAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACxD,IAAI,KAAK,CAAC,SAAS,CAAC;oBAAE,OAAO,GAAG,CAAC;gBACjC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;YACzD,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,IAAY,EAAE,IAA6D;QAC3F,IAAI,IAAI,EAAE,cAAc,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;QACD,2BAA2B;QAC3B,IAAI,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACtF,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,IAAY,EAAE,IAAiC;QAClE,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,cAAc,CAAC,QAAgB,EAAE,YAAkB;QACjD,MAAM,OAAO,GACX,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;YAC5B,mEAAmE;YACnE,cAAc,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAElE,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAChE,IAAI,OAAO,KAAK,WAAW;YAAE,OAAO,WAAW,CAAC;QAEhD,+CAA+C;QAC/C,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnD,IAAI,YAAY,KAAK,WAAW;gBAAE,OAAO,WAAW,CAAC;QACvD,CAAC;QAED,6BAA6B;QAC7B,OAAO,CAAC,KAAK,CACX,oDAAoD,QAAQ,gFAAgF,CAC7I,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;wGAnHU,mBAAmB,yFAMR,wBAAwB;4GANnC,mBAAmB,cADN,MAAM;;4FACnB,mBAAmB;kBAD/B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;0BAO7B,QAAQ;;0BAAI,MAAM;2BAAC,wBAAwB","sourcesContent":["import { changeCaseToUnderscore, isEmptyArray, isNil } from '../functions';\nimport { Inject, Injectable, InjectionToken, Optional } from '@angular/core';\nimport { TranslateService } from '@ngx-translate/core';\nimport { AbstractControl } from '@angular/forms';\nimport { AppFormUtils } from '../../core/form/form.utils';\nimport { SharedValidators } from './validators';\nimport { ObjectMap } from '../types';\nimport { FormErrors } from '../forms';\nimport { TranslateContextService } from '../services/translate-context.service';\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormPathTranslator {\n  translateFormPath: (path: string) => string;\n}\n\nexport interface FormErrorTranslateOptions {\n  i18nPrefix?: string;\n  i18nSuffix?: string;\n  pathTranslator?: IFormPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n/**\n * @deprecated use IFormPathTranslator instead\n */\nexport interface IFormControlPathTranslator {\n  /**\n   * @Deprecated use 'translateControlPath' from IFormPathTranslator interface\n   */\n  translateControlPath: (path: string) => string;\n}\n\n/**\n * @Deprecated use 'FormErrorTranslateOptions' instead\n */\nexport interface FormErrorTranslatorOptions extends FormErrorTranslateOptions {\n  /**\n   * @Deprecated use 'pathTranslator' instead\n   */\n  controlPathTranslator?: IFormControlPathTranslator;\n}\n\n@Injectable({ providedIn: 'root' })\nexport class FormErrorTranslator implements IFormPathTranslator, IFormControlPathTranslator {\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    private translateContext: TranslateContextService,\n    @Optional() @Inject(APP_FORM_ERROR_I18N_KEYS) errorI18nKeys: ObjectMap<string>\n  ) {\n    this.errorI18nKeys = {\n      ...SharedValidators.I18N_ERROR_KEYS,\n      ...errorI18nKeys,\n    };\n  }\n\n  translateFormErrors(control: AbstractControl, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string {\n    if (!control || !control.invalid) return '';\n\n    const separator = (opts && opts.separator) || ', ';\n    const recursive = !opts || opts.recursive !== false;\n    const errors = AppFormUtils.getFormErrors(control, { recursive });\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const childControl = control.get(path);\n        // Should be a control map of errors\n        if (childControl) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          const columnErrors = Object.keys(childControl.errors).map((errorKey) => this.translateError(errorKey, childControl.errors[errorKey]));\n          if (isEmptyArray(columnErrors)) return res;\n          // Add separator\n          if (res.length) res += separator;\n          return res + i18nPath + ': ' + columnErrors.join(separator);\n        }\n\n        // Or try as global form error\n        const formError = this.translateError(path, errors[path]);\n        if (isNil(formError)) return res;\n        return res + (res.length ? separator : '') + formError;\n      }, '')\n    );\n  }\n\n  translateErrors(errors: FormErrors, opts?: FormErrorTranslateOptions): string {\n    const separator = (opts && opts.separator) || ', ';\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const pathErrors = errors[path];\n        // Should be a control map of errors\n\n        if (pathErrors) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          const columnErrors = Object.keys(pathErrors).map((errorKey) => this.translateError(errorKey, pathErrors[errorKey]));\n          if (isEmptyArray(columnErrors)) return res;\n          // Add separator\n          if (res.length) res += separator;\n          return res + i18nPath + ': ' + columnErrors.join(separator);\n        }\n\n        // Or try as global form error\n        const formError = this.translateError(path, pathErrors);\n        if (isNil(formError)) return res;\n        return res + (res.length ? separator : '') + formError;\n      }, '')\n    );\n  }\n\n  translateFormPath(path: string, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string {\n    if (opts?.pathTranslator) {\n      return opts.pathTranslator.translateFormPath(path);\n    }\n    // For v2.8.x compatibility\n    if (opts['controlPathTranslator']) {\n      return opts['controlPathTranslator'].translateControlPath(path);\n    }\n    const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();\n    return this.translateContext.instant(i18nKey, opts?.i18nSuffix);\n  }\n\n  /**\n   * @Deprecated use translateFormPath() instead\n   * @param path\n   * @param opts\n   */\n  translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string {\n    return this.translateFormPath(path, opts);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n    const i18nKey =\n      this.errorI18nKeys[errorKey] ||\n      // Try to generate a standard error key, like 'ERROR.FIELD_xxx_xxx'\n      'ERROR.FIELD_' + changeCaseToUnderscore(errorKey).toUpperCase();\n\n    let i18nMessage = this.translate.instant(i18nKey, errorContent);\n    if (i18nKey !== i18nMessage) return i18nMessage;\n\n    // Try to use the error content, as an i18n key\n    if (typeof errorContent === 'string') {\n      i18nMessage = this.translate.instant(errorContent);\n      if (errorContent !== i18nMessage) return i18nMessage;\n    }\n\n    // Not translated: show error\n    console.error(\n      `[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`\n    );\n\n    return errorKey;\n  }\n}\n"]}
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-error-adapter.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/validator/form-error-adapter.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { changeCaseToUnderscore, isEmptyArray, isNil } from '../functions';\nimport { Inject, Injectable, InjectionToken, Optional } from '@angular/core';\nimport { TranslateService } from '@ngx-translate/core';\nimport { AbstractControl } from '@angular/forms';\nimport { AppFormUtils } from '../../core/form/form.utils';\nimport { SharedValidators } from './validators';\nimport { ObjectMap } from '../types';\nimport { FormErrors } from '../forms';\nimport { TranslateContextService } from '../services/translate-context.service';\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormPathTranslator {\n  translateFormPath: (path: string, opts?: { i18nPrefix?: string; i18nSuffix?: string }) => string;\n}\n\nexport interface FormErrorTranslateOptions {\n  i18nPrefix?: string;\n  i18nSuffix?: string;\n  pathTranslator?: IFormPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n/**\n * @deprecated use IFormPathTranslator instead\n */\nexport interface IFormControlPathTranslator {\n  /**\n   * @Deprecated use 'translateControlPath' from IFormPathTranslator interface\n   */\n  translateControlPath: (path: string, opts?: { i18nPrefix?: string; i18nSuffix?: string }) => string;\n}\n\n/**\n * @Deprecated use 'FormErrorTranslateOptions' instead\n */\nexport interface FormErrorTranslatorOptions extends FormErrorTranslateOptions {\n  /**\n   * @Deprecated use 'pathTranslator' instead\n   */\n  controlPathTranslator?: IFormControlPathTranslator;\n}\n\n@Injectable({ providedIn: 'root' })\nexport class FormErrorTranslator implements IFormPathTranslator, IFormControlPathTranslator {\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    private translateContext: TranslateContextService,\n    @Optional() @Inject(APP_FORM_ERROR_I18N_KEYS) errorI18nKeys: ObjectMap<string>\n  ) {\n    this.errorI18nKeys = {\n      ...SharedValidators.I18N_ERROR_KEYS,\n      ...errorI18nKeys,\n    };\n  }\n\n  translateFormErrors(control: AbstractControl, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string {\n    if (!control || !control.invalid) return '';\n\n    const separator = (opts && opts.separator) || ', ';\n    const recursive = !opts || opts.recursive !== false;\n    const errors = AppFormUtils.getFormErrors(control, { recursive });\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const childControl = control.get(path);\n        // Should be a control map of errors\n        if (childControl) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          const columnErrors = Object.keys(childControl.errors).map((errorKey) => this.translateError(errorKey, childControl.errors[errorKey]));\n          if (isEmptyArray(columnErrors)) return res;\n          // Add separator\n          if (res.length) res += separator;\n          return res + i18nPath + ': ' + columnErrors.join(separator);\n        }\n\n        // Or try as global form error\n        const formError = this.translateError(path, errors[path]);\n        if (isNil(formError)) return res;\n        return res + (res.length ? separator : '') + formError;\n      }, '')\n    );\n  }\n\n  translateErrors(errors: FormErrors, opts?: FormErrorTranslateOptions): string {\n    const separator = (opts && opts.separator) || ', ';\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const pathErrors = errors[path];\n        // Should be a control map of errors\n\n        if (pathErrors) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          const columnErrors = Object.keys(pathErrors).map((errorKey) => this.translateError(errorKey, pathErrors[errorKey]));\n          if (isEmptyArray(columnErrors)) return res;\n          // Add separator\n          if (res.length) res += separator;\n          return res + i18nPath + ': ' + columnErrors.join(separator);\n        }\n\n        // Or try as global form error\n        const formError = this.translateError(path, pathErrors);\n        if (isNil(formError)) return res;\n        return res + (res.length ? separator : '') + formError;\n      }, '')\n    );\n  }\n\n  translateFormPath(path: string, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string {\n    if (opts?.pathTranslator && opts.pathTranslator !== this) {\n      return opts.pathTranslator.translateFormPath(path, opts);\n    }\n    // For v2.8.x compatibility\n    if (opts['controlPathTranslator'] && opts['controlPathTranslator'] !== this) {\n      return opts['controlPathTranslator'].translateControlPath(path, opts);\n    }\n    const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();\n    return this.translateContext.instant(i18nKey, opts?.i18nSuffix);\n  }\n\n  /**\n   * @Deprecated use translateFormPath() instead\n   * @param path\n   * @param opts\n   */\n  translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string {\n    return this.translateFormPath(path, opts);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n    const i18nKey =\n      this.errorI18nKeys[errorKey] ||\n      // Try to generate a standard error key, like 'ERROR.FIELD_xxx_xxx'\n      'ERROR.FIELD_' + changeCaseToUnderscore(errorKey).toUpperCase();\n\n    let i18nMessage = this.translate.instant(i18nKey, errorContent);\n    if (i18nKey !== i18nMessage) return i18nMessage;\n\n    // Try to use the error content, as an i18n key\n    if (typeof errorContent === 'string') {\n      i18nMessage = this.translate.instant(errorContent);\n      if (errorContent !== i18nMessage) return i18nMessage;\n    }\n\n    // Not translated: show error\n    console.error(\n      `[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`\n    );\n\n    return errorKey;\n  }\n}\n"]}
|
|
@@ -3906,12 +3906,12 @@ class FormErrorTranslator {
|
|
|
3906
3906
|
}, ''));
|
|
3907
3907
|
}
|
|
3908
3908
|
translateFormPath(path, opts) {
|
|
3909
|
-
if (opts?.pathTranslator) {
|
|
3910
|
-
return opts.pathTranslator.translateFormPath(path);
|
|
3909
|
+
if (opts?.pathTranslator && opts.pathTranslator !== this) {
|
|
3910
|
+
return opts.pathTranslator.translateFormPath(path, opts);
|
|
3911
3911
|
}
|
|
3912
3912
|
// For v2.8.x compatibility
|
|
3913
|
-
if (opts['controlPathTranslator']) {
|
|
3914
|
-
return opts['controlPathTranslator'].translateControlPath(path);
|
|
3913
|
+
if (opts['controlPathTranslator'] && opts['controlPathTranslator'] !== this) {
|
|
3914
|
+
return opts['controlPathTranslator'].translateControlPath(path, opts);
|
|
3915
3915
|
}
|
|
3916
3916
|
const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
|
|
3917
3917
|
return this.translateContext.instant(i18nKey, opts?.i18nSuffix);
|