fix: localization types

GlobalArtInc · Jun 2, 2024 · 87563fb · 87563fb
1 parent f3fb44c
commit 87563fb
Show file tree

Hide file tree

Showing 5 changed files with 3,775 additions and 2,891 deletions.
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
 		"url": "https://github.com/GlobalartInc/nestcord"
 	},
 	"dependencies": {
-		"@globalart/text-utils": "^1.0.1",
+		"@globalart/text-utils": "^1.0.2",
 		"@nestjs/axios": "^3.0.2",
 		"@nestjs/schedule": "^4.0.2",
 		"axios": "^1.7.2",

diff --git a/packages/localization/adapters/default-localization.adapter.ts b/packages/localization/adapters/default-localization.adapter.ts
@@ -1,4 +1,4 @@
-import { replacePlaceholdersInString } from '@globalart/text-utils';
+import { replacePlaceholdersInObjectWithFlatten } from '@globalart/text-utils';
 import { BaseLocalizationAdapter } from './base-localization.adapter';
 import { LocalizationInterceptor } from '../interceptors';
 
@@ -8,13 +8,13 @@ interface DefaultLocalizationAdapterOptions {
 }
 
 export class DefaultLocalizationAdapter extends BaseLocalizationAdapter<DefaultLocalizationAdapterOptions> {
-  public getTranslation(key: string, locale: string, placeholders?: Record<string, string>): string {
+  public getTranslation(key: string, locale: string, placeholders?: unknown): string {
     const translation = this.getTranslations(locale)[key] || this.getFallbackTranslation(key);
 
-    return placeholders ? replacePlaceholdersInString(translation, placeholders) : translation;
+    return placeholders ? replacePlaceholdersInObjectWithFlatten(translation, placeholders) : translation;
   }
 
-  public translate(key: string, placeholders?: Record<string, string>): string {
+  public translate(key: string, placeholders?: unknown): string {
     const currentTranslationFn = LocalizationInterceptor.getCurrentTranslationFn();
 
     return currentTranslationFn

diff --git a/packages/localization/adapters/nested-localization.adapter.ts b/packages/localization/adapters/nested-localization.adapter.ts
@@ -1,4 +1,4 @@
-import { replacePlaceholdersInString } from '@globalart/text-utils';
+import { replacePlaceholdersInObjectWithFlatten } from '@globalart/text-utils';
 import { BaseLocalizationAdapter } from './base-localization.adapter';
 import { LocalizationInterceptor } from '../interceptors';
 
@@ -16,7 +16,7 @@ export class NestedLocalizationAdapter extends BaseLocalizationAdapter<NestedLoc
     const translations = this.getTranslations(locale);
     const translation = this.findTranslation(translations, key) || this.getFallbackTranslation(key);
 
-    return replacePlaceholdersInString(translation, placeholders);
+    return replacePlaceholdersInObjectWithFlatten(translation, placeholders);
   }
 
   public translate(key: string, placeholders?: Record<string, string>): string {