Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Bones.UI/composables/useTranslations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export function useTranslations() {
const $tr = (code: string, defaultValue: string, ...parameters: (string | number)[]): string => {
let translation = _translations.value.find(t => t.code === code)?.value ?? defaultValue;
if (translation && parameters.length) {
for (let p of parameters) {
translation = translation.replace(`{${parameters.indexOf(p)}}`, p.toString());
for (let i = 0; i < parameters.length; i++) {
translation = translation.replace(`{${i}}`, parameters[i].toString());
}
}
return translation;
Expand Down
21 changes: 21 additions & 0 deletions tests/Bones.UI.Tests/tests/plugins.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { useTranslations } from '@dative-gpi/bones-ui';

describe('Translation plugin', () => {
const { $tr } = useTranslations();

it('should return the correct default value with formatted parameter', () => {
const result = $tr('code', 'default value : {0}m', "72");
expect(result).toBe('default value : 72m');
});

it('should return the correct default value with formatted parameters', () => {
const result = $tr('code', 'default value : {0}m, {1}°C', "72", 85);
expect(result).toBe('default value : 72m, 85°C');
});

it('should return the correct default value with equals formatted parameters', () => {
const result = $tr('code', 'default value : {0}m, {1}°C', "72", "72");
expect(result).toBe('default value : 72m, 72°C');
});
});