UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-01-22 10:35:37 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix: resolve file conflicts

Browse Source
This commit is contained in:
yassinedorbozgithub 2025-01-07 17:03:35 +01:00
commit 54e5a38661
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/i18n/services/i18n.service.ts
View File

@ -1,12 +1,12 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { Injectable, InternalServerErrorException } from '@nestjs/common';
import { Injectable } from '@nestjs/common';
import {
I18nService as NativeI18nService,
Path,
@ -29,16 +29,12 @@ export class I18nService<
options?: TranslateOptions,
): IfAnyOrNever<R, string, R> {
options = {
lang: this.i18nOptions.fallbackLanguage,
defaultValue: key,
...options,
lang: options.lang || this.i18nOptions.fallbackLanguage,
defaultValue: options.defaultValue || key,
};
let { lang } = options;
if (!lang) {
throw new InternalServerErrorException('I18nService: lang is undefined');
}
lang = this.resolveLanguage(lang);
// Translate block message, button text, ...

7
api/src/utils/pagination/pagination-query.pipe.ts
View File

@ -22,11 +22,10 @@ export class PageQueryPipe<T>
transform(value: PageQueryParams) {
let skip: number | undefined = undefined;
let limit: number | undefined = undefined;
if ('limit' in value) {
skip =
value?.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0;
if (value && 'limit' in value) {
skip = value.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0;
limit =
value?.limit && parseInt(value.limit) > 0
value.limit && parseInt(value.limit) > 0
? parseInt(value.limit)
: config.pagination.limit;
}