Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Fix placeholder replacement #347

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Fix placeholder replacement #347

merged 1 commit into from
Oct 22, 2021

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Oct 21, 2021

Fixes

Fixes #340 by @sarayourfriend

Description

This PR fixes the bug in which only the first ###placeholder### in an ngx translated string was converted into the expected {placeholder} form. The fix was adding the g global flag to the regex expression.

Testing Instructions

First, to see the problem, you can checkout main branch, run npm i18n:get-translations, and search for ### in the locales folder. You will see that there are ### placeholders left in the json files.
Then, when you checkout this branch, run npm i18n:get-translations, and search for ### in the locales folder, you should see that these placeholders are only found in the pot files.
i18n:get-translations

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@obulat obulat added 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository labels Oct 21, 2021
@obulat obulat self-assigned this Oct 21, 2021
@obulat obulat requested a review from a team as a code owner October 21, 2021 17:21
Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Glad it was relatively simple to fix 😁

Copy link
Member

@krysal krysal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great!

@obulat obulat merged commit aca87f1 into main Oct 22, 2021
@obulat obulat deleted the fix/replace_all_placeholders branch October 22, 2021 03:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Malformed variable interpolation for translations
3 participants