feat(next): clean up ftl files #18191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xlisachan
reviewed
Jan 7, 2025
| next-continue-with-google-button = Continue with { -brand-google } | ||
| next-continue-with-apple-button = Continue with { -brand-apple } | ||
| next-payment-confirm-with-legal-links-static-3 = I authorize { -brand-mozilla } to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription. | ||
| continue-with-google-button = Continue with { -brand-google } |
There was a problem hiding this comment.
Ah, I thought we could reuse the continue-with-google-button and continue-with-apple-button ftl ids that are in fxa-settings.
There was a problem hiding this comment.
If these string IDs already exist in another file these should be re-named to something to avoid having two strings with the same ID (even if they are in different files).
There was a problem hiding this comment.
Just for clarification, these are the ids/strings that are in fxa-settings:
continue-with-google-button = Continue with { -brand-google }
continue-with-apple-button = Continue with { -brand-apple }
We would not be able to reuse them in payments-next?
bcolsson
requested changes
Jan 7, 2025
| next-continue-with-google-button = Continue with { -brand-google } | ||
| next-continue-with-apple-button = Continue with { -brand-apple } | ||
| next-payment-confirm-with-legal-links-static-3 = I authorize { -brand-mozilla } to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription. | ||
| continue-with-google-button = Continue with { -brand-google } |
There was a problem hiding this comment.
If these string IDs already exist in another file these should be re-named to something to avoid having two strings with the same ID (even if they are in different files).
| next-continue-with-apple-button = Continue with { -brand-apple } | ||
| next-payment-confirm-with-legal-links-static-3 = I authorize { -brand-mozilla } to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription. | ||
| continue-with-google-button = Continue with { -brand-google } | ||
| continue-with-apple-button = Continue with { -brand-apple } |
There was a problem hiding this comment.
This string will also should be renamed.
Because: - payments-next.ftl should only have ftl ids in use and should have no duplicate ftl ids. - Ftl ids not found in payments.ftl should not have next- prefix on the flt id. This commit: - Removes a few duplicate ftl ids and moves them to a common file - Remove next- prefix from a few flt ids Closes #FXA-7842
StaberindeZA
force-pushed
the
fxa-7842-remove-dup-ftl-ids
branch
from
4e0e1aa to
dbed6e1
Compare
bcolsson
approved these changes
Jan 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because
This pull request
Issue that this pull request solves
Closes: #FXA-7842
Checklist
Put an
xin the boxes that apply