change reges to fix some issue with interpolation

CHANGELOG.md

@@ -0,0 +1,3 @@
+### 3.0.0
+
+- **BREAKING** changes regex from `/\((\S*)\).*{((.|\n)*)}/` to `/\((\S*)\).*?\[((.|\n)*)\]/` -> from (condition){value} to (condition)[value] to fix [#206](https://github.com/i18next/i18next-intervalPlural-postProcessor/issues/206) and [#221](https://github.com/i18next/i18next-intervalPlural-postProcessor/issues/221)

README.md

@@ -42,10 +42,10 @@ i18next
 // translation: {
 //   key1: '{{count}} item',
 //    key1_plural: '{{count}} items',
-//    key1_interval: '(1){one item};(2-7){a few items};(7-inf){a lot of items};',
+//    key1_interval: '(1)[one item];(2-7)[a few items];(7-inf)[a lot of items];',
 //    key2: '{{count}} item',
 //    key2_plural: '{{count}} items',
-//    key2_interval: '(1){one item};(2-7){a few items};'
+//    key2_interval: '(1)[one item];(2-7)[a few items];'
 // }
 
 i18next.t('key1_interval', { postProcess: 'interval', count: 1 }); // -> one item
@@ -67,7 +67,7 @@ import intervalPlural from 'i18next-intervalplural-postprocessor';
 intervalPlural.setOptions({
   // these are the defaults
   intervalSeparator: ';',
-  intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+  intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/, // pre 3.0 /\((\S*)\).*{((.|\n)*)}/,
   intervalSuffix: '_interval'
 });
 

dist/commonjs/index.js

@@ -29,7 +29,7 @@ exports.default = {
 
   options: {
     intervalSeparator: ';',
-    intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+    intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/,
     intervalSuffix: '_interval'
   },
 

dist/es/index.js

@@ -23,7 +23,7 @@ export default {
 
   options: {
     intervalSeparator: ';',
-    intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+    intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/,
     intervalSuffix: '_interval'
   },
 

dist/umd/i18nextIntervalPluralPostProcessor.js

@@ -168,7 +168,7 @@ var index = {
 
   options: {
     intervalSeparator: ';',
-    intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+    intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/,
     intervalSuffix: '_interval'
   },
 

i18nextIntervalPluralPostProcessor.js

@@ -168,7 +168,7 @@ var index = {
 
   options: {
     intervalSeparator: ';',
-    intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+    intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/,
     intervalSuffix: '_interval'
   },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-intervalplural-postprocessor",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "postProcessor that allows interval based plurals",
   "main": "./index.js",
   "jsnext:main": "dist/es/index.js",

src/index.js

@@ -22,7 +22,7 @@ export default {
 
   options: {
     intervalSeparator: ';',
-    intervalRegex: /\((\S*)\).*{((.|\n)*)}/,
+    intervalRegex: /\((\S*)\).*?\[((.|\n)*)\]/,
     intervalSuffix: '_interval'
   },
 

test/interval.spec.js

@@ -17,31 +17,31 @@ describe('interval plural', () => {
       i18next.addResourceBundle('en', 'test1', {
         key1: '{{count}} item',
         key1_plural: '{{count}} items',
-        key1_interval: '(1){one item};(2-7){a few items};(7-inf){a lot of items};',
+        key1_interval: '(1)[one item];(2-7)[a few items];(7-inf)[a lot of items];',
         key2: '{{count}} item',
         key2_plural: '{{count}} items',
-        key2_interval: '(1){one item};(2-7){a few items};'
+        key2_interval: '(1)[one item];(2-7)[a few items];'
       });
       i18next.addResourceBundle('en', 'test2', {
         key3: '{{count}} item',
         key3_plural: '{{count}} items',
-        key3_interval: '(1){one item};(2-7){a few items};(7-inf){a lot of items};',
+        key3_interval: '(1)[one item];(2-7)[a few items];(7-inf)[a lot of items];',
         key4: '{{count}} item',
         key4_plural: '{{count}} items',
-        key4_interval: '(1){one item};(2-7){a few items};'
+        key4_interval: '(1)[one item];(2-7)[a few items];'
       });
       i18next.addResourceBundle('en', 'test3', {
         key3: '{{count}} item',
         key3_plural: '{{count}} items',
-        key3_interval: '(1) {one item}; (2-7) {a few items}; (7-inf) {a lot of items};',
+        key3_interval: '(1) [one item]; (2-7) [a few items]; (7-inf) [a lot of items];',
         key4: '{{count}} item',
         key4_plural: '{{count}} items',
-        key4_interval: '(1){one item}; (2-7){a few items}; '
+        key4_interval: '(1)[one item]; (2-7)[a few items]; '
       });
       i18next.addResourceBundle('en', 'test4', {
         LIKE_COUNT: '{{count}} person\nlikes this',
         LIKE_COUNT_plura: '{{count}} people\nlike this',
-        LIKE_COUNT_interval: "(0){No one\nlikes this};"
+        LIKE_COUNT_interval: "(0)[No one\nlikes this];"
       });
       i18next.setDefaultNamespace('test1');
     });