Skip to content

Commit

Permalink
Merge pull request #4538 from mozilla/fix-circle-2024-03-25
Browse files Browse the repository at this point in the history
CircleCI Fix: Remove merged strings from pending.ftl
  • Loading branch information
rafeerahman authored Mar 25, 2024
2 parents c61dbed + 4fb28c3 commit eaf97a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ If you're not yet ready to submit some strings for translation, you can
tentatively add them to `frontend/pendingTranslations.ftl`. Strings in that file
will show up until strings with the same ID are added to the l10n repository.
Similarly, there is a `pending_locales/pending.ftl` where temporary backend locales strings can be stored. Once the strings from the pull request in [the l10n repo](https://github.com/mozilla-l10n/fx-private-relay-l10n) has been merged into the Relay repo, these respective strings need to be removed from `pending_locales/pending.ftl` to avoid failing CircleCI tests.
#### Commit translations for release
To commit updates to the app's translations (e.g., before a release), we need
Expand Down
5 changes: 0 additions & 5 deletions privaterelay/pending_locales/en/pending.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# This is the Django equivalent of frontend/pendingTranslations.ftl

# Variables:
# $duplicate_address (string) - User-set email address that already exists
api-error-duplicate-address = { $duplicate_address }” already exists. Please try again with a different mask name.
api-error-address-not-editable = You cannot edit an existing domain address field.

0 comments on commit eaf97a4

Please sign in to comment.