Skip to content

Commit 2fe255a

Browse files
Merge branch 'dev' of https://github.com/Dative-GPI/bones into dev
2 parents 1578519 + cd9076a commit 2fe255a

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

src/Bones.UI/composables/useTranslations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export function useTranslations() {
1414

1515
let translation = _translations.value.find(t => t.code === code)?.value ?? defaultValue;
1616
if (translation && parameters.length) {
17-
for (let p of parameters) {
18-
translation = translation.replace(`{${parameters.indexOf(p)}}`, p.toString());
17+
for (let i = 0; i < parameters.length; i++) {
18+
translation = translation.replace(`{${i}}`, parameters[i].toString());
1919
}
2020
}
2121
return translation;
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { useTranslations } from '@dative-gpi/bones-ui';
2+
3+
describe('Translation plugin', () => {
4+
const { $tr } = useTranslations();
5+
6+
it('should return the correct default value with formatted parameter', () => {
7+
const result = $tr('code', 'default value : {0}m', "72");
8+
expect(result).toBe('default value : 72m');
9+
});
10+
11+
it('should return the correct default value with formatted parameters', () => {
12+
const result = $tr('code', 'default value : {0}m, {1}°C', "72", 85);
13+
expect(result).toBe('default value : 72m, 85°C');
14+
});
15+
16+
it('should return the correct default value with equals formatted parameters', () => {
17+
const result = $tr('code', 'default value : {0}m, {1}°C', "72", "72");
18+
expect(result).toBe('default value : 72m, 72°C');
19+
});
20+
});
21+

0 commit comments

Comments
 (0)