Summary

Fix ngettext and variants with different interpolated variables in strings.

Review Request #11023 — Created May 15, 2020 and submitted May 19, 2020, 12:23 a.m.

Information

Owner

chipx86

Repository

babel-plugin-django-gettext

Branch

master

Bugs

Depends On

Reviewers

Groups

beanbag-misc

People

Description

When using ngettext (and its variants), the generated code would be

wrong if both strings ended up using its own interpolated arguments. For

instance, this code:

N_(`This is ${var1}`,
   `This is ${var2}`,
   2)


... would end up generating the right strings, but the wrong arguments

to pass in. The way we were building up the merged list of variables was

wrong.
This change fixes this by introducing a new merging function for these

lists of variables, which goes through the lists and builds a merged,

deduplicated list of variables that can be passed in.
The unit test coverage has been expanded to include unique variables in

the ngettext-related tests that involve interpolation, and to test

both singular and plural variants in all tests.

Testing Done

Unit tests pass.

Verified this fixed a bug I encountered when testing /r/11022.

Commits

Summary	ID
Fix ngettext and variants with different interpolated variables in strings. When using `ngettext` (and its variants), the generated code would be wrong if both strings ended up using its own interpolated arguments. For instance, this code: ```javascript N_(`This is ${var1}`, `This is ${var2}`, 2) ``` ... would end up generating the right strings, but the wrong arguments to pass in. The way we were building up the merged list of variables was wrong. This change fixes this by introducing a new merging function for these lists of variables, which goes through the lists and builds a merged, deduplicated list of variables that can be passed in. The unit test coverage has been expanded to include unique variables in the `ngettext`-related tests that involve interpolation, and to test both singular and plural variants in all tests.	13871b84bcdc0186a08959f3857a84f05c1a0813

Summary

Fix ngettext and variants with different interpolated variables in strings.

When using `ngettext` (and its variants), the generated code would be wrong if both strings ended up using its own interpolated arguments. For instance, this code: ```javascript N_(`This is ${var1}`, `This is ${var2}`, 2) ``` ... would end up generating the right strings, but the wrong arguments to pass in. The way we were building up the merged list of variables was wrong. This change fixes this by introducing a new merging function for these lists of variables, which goes through the lists and builds a merged, deduplicated list of variables that can be passed in. The unit test coverage has been expanded to include unique variables in the `ngettext`-related tests that involve interpolation, and to test both singular and plural variants in all tests.

13871b84bcdc0186a08959f3857a84f05c1a0813

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Status:: Completed