Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CircleCI Fix: Remove merged strings from pending.ftl #4538

Merged
merged 2 commits into from
Mar 25, 2024
Merged

CircleCI Fix: Remove merged strings from pending.ftl #4538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22640ba
Remove merged strings from pending.ftl
rafeerahman Mar 25, 2024
4fb28c3
Readme update for backend locales strings
rafeerahman Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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.