From 22640baf3489fc38a7e9ba3e3ad1e915ce9ec2b2 Mon Sep 17 00:00:00 2001 From: Rafee Date: Mon, 25 Mar 2024 15:06:49 -0400 Subject: [PATCH 1/2] Remove merged strings from pending.ftl --- privaterelay/pending_locales/en/pending.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/privaterelay/pending_locales/en/pending.ftl b/privaterelay/pending_locales/en/pending.ftl index ff57e8d7b6..5f35a2cc62 100644 --- a/privaterelay/pending_locales/en/pending.ftl +++ b/privaterelay/pending_locales/en/pending.ftl @@ -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. From 4fb28c31815ef1011e18e47b22fd859eaa5a0365 Mon Sep 17 00:00:00 2001 From: Rafee Rahman <59676643+rafeerahman@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:35:22 -0400 Subject: [PATCH 2/2] Readme update for backend locales strings --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 33683d0511..db6f691699 100644 --- a/README.md +++ b/README.md @@ -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