Skip to content

Commit

Permalink
Move all new strings into FTL file
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxxcrawford
maxxcrawford committed Jun 11, 2021
1 parent 958df90 commit c7d6b16
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
13 changes: 10 additions & 3 deletions privaterelay/locales/en-US/app.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ faq-question-7-answer = We now support attachment forwarding. However, there is

# Variables:
# $email (string) - User email address
profile-label-welcome = Welcome, { $email }!
profile-label-welcome-html = <span>Welcome,</span> { $email }! = Welcome, { $email }!
profile-headline-manage-relay = Manage your { -brand-name-relay } aliases
profile-headline-manage-domain = Manage your domain aliases
profile-supports-email-forwarding = { -brand-name-firefox-relay } supports email forwarding (including attachments) of email up to { email-size-limit } in size
Expand All @@ -144,6 +144,7 @@ profile-label-saved = Label saved!
profile-label-generate-new-alias = Generate New Alias
profile-label-delete = Delete
profile-label-upgrade = Get unlimited aliases
profile-label-create-domain = Create your Email Domain
# This string is followed by an email address
profile-label-forward-emails = Forward emails to:
Expand All @@ -167,7 +168,9 @@ profile-blocked-copy = { -brand-name-firefox-relay } will delete messages before
profile-forwarded-copy = { -brand-name-firefox-relay } will send messages to your inbox when you select forwarding for this alias.
profile-forwarded-note = Note:
profile-forwarded-note-copy = Email (including attachments) larger than { email-size-limit } are not currently supported and will not be forwarded.
profile-stat-label-blocked = Emails Blocked
profile-stat-label-forwarded = Emails Forwarded
profile-stat-label-aliases-used = Email aliases used
## Banner Messages (displayed on the profile page)

Expand All @@ -190,7 +193,10 @@ banner-upgrade-headline = Buy { -brand-name-mozilla-privacy-pack } for more prot
banner-upgrade-copy = With { -brand-name-mozilla-privacy-pack } you get unlimited email address and your own email domain.
banner-upgrade-cta = Upgrade to { -brand-name-mozilla-privacy-pack } now!
banner-choose-subdomain-headline = Choose your own domain
banner-choose-subdomain-copy = You can choose your own domain for “wildcard” aliases. NOTE: YOU CANNOT CHANGE THIS LATER!
banner-choose-subdomain-headline-aliases = Get your email domain for your aliases
banner-choose-subdomain-copy = You can choose your own domain for “wildcard” aliases.
banner-choose-subdomain-warning = NOTE: YOU CANNOT CHANGE THIS LATER!
banner-choose-subdomain-input-placeholder = banner-choose-subdomain-warning
banner-pack-upgrade-headline-html = Upgrade to <strong>{ -brand-name-mozilla-privacy-pack }</strong> to get more protection.
banner-pack-upgrade-copy = Unlimited email aliases, your own email domain, monitor your email for data breaches, VPN included
Expand Down Expand Up @@ -219,6 +225,7 @@ onboarding-headline = Three ways to create an alias
onboarding-tip-1 = Right here - just select the button in the upper right corner
onboarding-tip-2 = By selecting the { -brand-name-firefox-relay } icon when it appears in email fields
onboarding-tip-3 = Via the context menu, just right-click (Windows) or Control-click (macOS) on form fields to access the menu and generate an alias
modal-rename-alias-saved = Label saved!
modal-delete-headline = Permanently delete this alias?
# Variables:
Expand Down
6 changes: 3 additions & 3 deletions privaterelay/templates/includes/banners.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
<img src="/static/images/choose-subdomain.png" alt="">
<div class="border"></div>
<div class="mpp-choose-subdomain-form">
<h2>Get your email domain for your aliases</h2>
<p>You can choose your own domain for “wildcard” aliases.</p>
<h2>{% ftlmsg 'banner-choose-subdomain-headline-aliases' %}</h2>
<p>{% ftlmsg 'banner-choose-subdomain-copy' %}</p>
<form method="post" action="{% url 'profile_subdomain' %}">
{% csrf_token %}
<input type="text" placeholder="Search your new domain" name="subdomain">
<input class="btn btn--gray" type="submit" value="Get it">
</form>
<p class="warning">NOTE: YOU CANNOT CHANGE THIS LATER!</p>
<p class="warning">{% ftlmsg 'banner-choose-subdomain-warning' %}</p>
</div>
</div>
<!-- <div class="banner-gradient-bg">
Expand Down
24 changes: 12 additions & 12 deletions privaterelay/templates/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<div class="mpp-dashbaord-header-container inset">
<div class="mpp-dashbaord-header-title">
<div class="mpp-dashbaord-header-name">
<span>Welcome,</span> {{ request.user.email }}
{% ftlmsg 'profile-label-welcome-html' email=request.user.email %}
</div>
<div class="mpp-dashbaord-header-action">
<button class="mpp-action-link"> <img src="/static/images/icon-check.svg" alt=""> Create your Email Domain</button>
<button class="mpp-action-link"> <img src="/static/images/icon-check.svg" alt=""> {% ftlmsg 'profile-label-create-domain' %}</button>
</div>
</div>
<ul class="mpp-dashbaord-header-stats">
<li><span class="label">Email aliases used</span> <span>5</span> </li>
<li><span class="label">Emails Blocked</span> <span>3</span> </li>
<li><span class="label">Emails Forwarded</span> <span>48</span> </li>
<li><span class="label">{% ftlmsg 'profile-stat-label-aliases-used' %}</span> <span>5</span> </li>
<li><span class="label">{% ftlmsg 'profile-stat-label-forwarded' %}</span> <span>3</span> </li>
<li><span class="label">{% ftlmsg 'profile-stat-label-blocked' %}</span> <span>48</span> </li>
</ul>
</div>
</div>
Expand All @@ -48,7 +48,7 @@
<div class="alias-list">
{% if not user_profile.has_unlimited %}
<div class="dashboard-greeting">
<span class="dashboard-greeting-message">{% ftlmsg 'profile-label-welcome' email=request.user.email %}
<span class="dashboard-greeting-message">{% ftlmsg 'profile-label-welcome-html' email=request.user.email %}
</div>
{% endif %}
{% include "includes/banners.html" %}
Expand Down Expand Up @@ -193,7 +193,7 @@ <h2 class="section-headline dashboard-headline">{% ftlmsg 'profile-headline-mana
<!-- alias label -->
<div class="additional-notes hide-mobile">
<input data-label="" type="text" maxlength="50" value="" aria-label="Edit the label for this alias" class="relay-email-address-label ff-Met">
<span class="saved-confirmation">Label saved!</span>
<span class="saved-confirmation">{% ftlmsg 'modal-rename-alias-saved' %}</span>
<span class="input-error"></span>
</div>

Expand Down Expand Up @@ -224,12 +224,12 @@ <h2 class="section-headline dashboard-headline">{% ftlmsg 'profile-headline-mana
class="relay-address click-copy ff-Met flx jst-cntr al-cntr">
{{ domain_address.address }}@{% user_email_domain user_profile %}
<span class="alias-copied-icon"></span>
<span class="alias-copied-message">Copied!</span>
<span class="alias-copied-message">{% ftlmsg 'profile-label-copied' %}</span>
</button>
</div>
<button class="toggle-details-visibility card-small-text">
<span class="show-details-label detail-label flx">Show Details</span>
<span class="hide-details-label detail-label flx">Hide Details</span>
<span class="show-details-label detail-label flx">{% ftlmsg 'profile-label-details-show' %}</span>
<span class="hide-details-label detail-label flx">{% ftlmsg 'profile-label-details-hide' %}</span>
<span class="detail-label-icon"></span>
</button>
</div>
Expand All @@ -251,7 +251,7 @@ <h2 class="section-headline dashboard-headline">{% ftlmsg 'profile-headline-mana

<!-- forwarding message -->
<section class="relay-email-column hide-mobile details-column flx flx-col">
<span class="relay-email-label email-forwarding-label card-small-text">Forward emails to</span>
<span class="relay-email-label email-forwarding-label card-small-text">{% ftlmsg 'profile-label-forward-emails' %}</span>
<span class="text-dark demi primary-email-address card-small-text">{{ request.user.email }}</span>
</section>
</div>
Expand All @@ -264,7 +264,7 @@ <h2 class="section-headline dashboard-headline">{% ftlmsg 'profile-headline-mana
<input type="hidden" name="api_token" value="{{ user_profile.api_token }}">
<input type="hidden" name="domain_address_id" value="{{ domain_address.id }}">
<button type="submit" name="delete" value="" class="dashboard-delete-button delete-relay-email-button" aria-label="Delete this alias">
<span class="remove-label relay-email-label card-small-text">Delete</span>
<span class="remove-label relay-email-label card-small-text">{% ftlmsg 'profile-label-delete' %}</span>
</button>
</form>
</section> <!--end delete-->
Expand Down

0 comments on commit c7d6b16

Please sign in to comment.