Merge pull request #784 from vinissimus/canary

1.3.4

.all-contributorsrc

@@ -278,7 +278,6 @@
  ]
  },
  {
-
  "login": "testerez",
  "name": "Tom Esterez",
  "avatar_url": "https://avatars.githubusercontent.com/u/815236?v=4",
@@ -288,15 +287,15 @@
  ]
  },
  {
- "login": "dndhm",
+  "login": "dndhm",
  "name": "Dan Needham",
  "avatar_url": "https://avatars.githubusercontent.com/u/1122983?v=4",
  "profile": "http://www.dan-needham.com",
  "contributions": [
  "code",
  "test",
  "doc"
-  ]
+ ]
  },
  {
  "login": "bmvantunes",
@@ -306,7 +305,16 @@
  "contributions": [
  "code"
  ]
- }
+ },
+ {
+ "login": "kaan-atakan",
+ "name": "Kaan Atakan",
+ "avatar_url": "https://avatars.githubusercontent.com/u/56063979?v=4",
+ "profile": "https://github.com/kaan-atakan",
+ "contributions": [
+ "code"
+ ]
+ }
  ],
  "contributorsPerLine": 7,
  "projectName": "next-translate",

README.md

@@ -959,6 +959,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
  <td align="center"><a href="https://github.com/testerez"><img src="https://avatars.githubusercontent.com/u/815236?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Esterez</b></sub></a><br /><a href="https://github.com/vinissimus/next-translate/commits?author=testerez" title="Code">💻</a></td>
  <td align="center"><a href="http://www.dan-needham.com"><img src="https://avatars.githubusercontent.com/u/1122983?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dan Needham</b></sub></a><br /><a href="https://github.com/vinissimus/next-translate/commits?author=dndhm" title="Code">💻</a> <a href="https://github.com/vinissimus/next-translate/commits?author=dndhm" title="Tests">⚠️</a> <a href="https://github.com/vinissimus/next-translate/commits?author=dndhm" title="Documentation">📖</a></td>
  <td align="center"><a href="https://www.youtube.com/BrunoAntunesPT"><img src="https://avatars.githubusercontent.com/u/9042965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bruno Antunes</b></sub></a><br /><a href="https://github.com/vinissimus/next-translate/commits?author=bmvantunes" title="Code">💻</a></td>
+ <td align="center"><a href="https://github.com/kaan-atakan"><img src="https://avatars.githubusercontent.com/u/56063979?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kaan Atakan</b></sub></a><br /><a href="https://github.com/vinissimus/next-translate/commits?author=kaan-atakan" title="Code">💻</a></td>
  </tr>
 </table>
 

__tests__/useTranslation.test.js

@@ -44,6 +44,28 @@ describe('useTranslation', () => {
  expect(container.textContent).toBe(expected)
  })
 
+ test('interpolation should not be lazy', () => {
+ const Inner = () => {
+ const { t } = useTranslation()
+ return t('common:key', {
+ something: 'something',
+ somethingElse: 'something else',
+ })
+ }
+
+ const expected = 'something else'
+
+ const { container } = render(
+ <I18nProvider
+ lang="en"
+ namespaces={{ common: { key: '{{somethingElse}}' } }}
+ >
+ <Inner />
+ </I18nProvider>
+ )
+ expect(container.textContent).toBe(expected)
+ })
+
  test('should return the key as fallback using wrong the nested translations', () => {
  const i18nKey = 'ns:grandfather.parent'
  const expected = 'ns:grandfather.parent'

package.json

@@ -1,6 +1,6 @@
 {
  "name": "next-translate",
- "version": "1.3.3",
+ "version": "1.3.4",
  "description": "Tiny and powerful i18n tools (Next plugin + API) to translate your Next.js pages.",
  "license": "MIT",
  "keywords": [

src/transCore.tsx

@@ -183,7 +183,7 @@ function interpolation({
  } = config.interpolation || {}
 
  const regexEnd =
- suffix === '' ? '' : `\\s*,?\\s*([\\w-]+)?\\s*${escapeRegex(suffix)}`
+ suffix === '' ? '' : `(?:[\\s,]+([\\w-]*))?\\s*${escapeRegex(suffix)}`
  return Object.keys(query).reduce((all, varKey) => {
  const regex = new RegExp(
  `${escapeRegex(prefix)}\\s*${varKey}${regexEnd}`,