n2words 1.22.0 → 1.23.0
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/README.md +1 -1
- package/dist/fr-BE.js +1 -1
- package/dist/fr-BE.js.map +1 -1
- package/dist/fr.js +1 -1
- package/dist/fr.js.map +1 -1
- package/dist/n2words.js +1 -1
- package/dist/n2words.js.map +1 -1
- package/lib/i18n/fr.d.ts +1 -1
- package/lib/i18n/fr.js +7 -5
- package/package.json +1 -1
package/lib/i18n/fr.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Converts a value to cardinal (written) form.
|
|
3
|
-
* @param {number|string|bigint} value Number to be
|
|
3
|
+
* @param {number|string|bigint} value Number to be converted.
|
|
4
4
|
* @param {object} [options] Options for class.
|
|
5
5
|
* @returns {string} Value in cardinal (written) format.
|
|
6
6
|
* @throws {Error} Value cannot be invalid.
|
package/lib/i18n/fr.js
CHANGED
|
@@ -6,7 +6,9 @@ export class N2WordsFR extends BaseLanguage {
|
|
|
6
6
|
negativeWord: 'moins',
|
|
7
7
|
separatorWord: 'virgule',
|
|
8
8
|
zero: 'zéro',
|
|
9
|
-
_region: 'FR'
|
|
9
|
+
_region: 'FR',
|
|
10
|
+
withHyphenSeparator: false,
|
|
11
|
+
spaceSeparator: (options.withHyphenSeparator === true ? '-' : ' '),
|
|
10
12
|
}, options);
|
|
11
13
|
|
|
12
14
|
super(options, [
|
|
@@ -77,17 +79,17 @@ export class N2WordsFR extends BaseLanguage {
|
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
if (nNumber < cNumber && cNumber < 100) {
|
|
80
|
-
if (nNumber % 10n == 1 && cNumber != 80) return { [`${cText}
|
|
82
|
+
if (nNumber % 10n == 1 && cNumber != 80) return { [`${cText}${this.spaceSeparator}et${this.spaceSeparator}${nText}`]: cNumber + nNumber };
|
|
81
83
|
return { [`${cText}-${nText}`]: cNumber + nNumber };
|
|
82
84
|
}
|
|
83
|
-
if (nNumber > cNumber) return { [`${cText}
|
|
84
|
-
return { [`${cText}
|
|
85
|
+
if (nNumber > cNumber) return { [`${cText}${this.spaceSeparator}${nText}`]: cNumber * nNumber };
|
|
86
|
+
return { [`${cText}${this.spaceSeparator}${nText}`]: cNumber + nNumber };
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
89
|
|
|
88
90
|
/**
|
|
89
91
|
* Converts a value to cardinal (written) form.
|
|
90
|
-
* @param {number|string|bigint} value Number to be
|
|
92
|
+
* @param {number|string|bigint} value Number to be converted.
|
|
91
93
|
* @param {object} [options] Options for class.
|
|
92
94
|
* @returns {string} Value in cardinal (written) format.
|
|
93
95
|
* @throws {Error} Value cannot be invalid.
|