Update the alias strings to use FTL plural logic

mozilla · May 28, 2021 · 9fac97d · 9fac97d
1 parent 236705a
commit 9fac97d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/privaterelay/locales/en-us/privaterelay/app.ftl b/privaterelay/locales/en-us/privaterelay/app.ftl
@@ -195,15 +195,17 @@ banner-choose-subdomain-label = Your domain is:
 # $subdomain (url) - User-set subdomain
 banner-choose-subdomain-label = You can make up any address @{ $subdomain }
 
-# Variables:
-# $number (number) - User-set subdomain
-remaining-aliases-promo-label = { $number } aliases. You can make unlimited!
 
-remaining-aliases-label-html = <span>1</span> remaining alias
+remaining-aliases-promo-label = { $number -> 
+    [one] { $number } remaining alias. 
+   *[other] { $number } remaining aliases.
+}
+
+remaining-aliases-promo-label-unlimited = { $number -> 
+    [one] { $number } alias. You can make unlimited!
+   *[other] { $number } aliases. You can make unlimited!
+}
 
-# Variables:
-# $number (number) - Number of remaining aliases. This will always be more than 1. 
-remaining-aliases-label-plural-html = <span>{ $number }</span> remaining aliases
 remaining-aliases-cta = Buy unlimited aliases
 onboarding-headline = Three ways to create an alias
 onboarding-tip-1 = Right here - just select the button in the upper right corner

diff --git a/privaterelay/templates/includes/remaining-aliases.html b/privaterelay/templates/includes/remaining-aliases.html
@@ -9,13 +9,9 @@
   <span class="num-remaining-aliases bold">
     {% with request.user.profile_set.first as user_profile %}
       {% if settings.PREMIUM_ENABLED and user_profile.has_unlimited %}
-        {% ftlmsg 'remaining-aliases-promo-label' number=relay_addresses|length %}
+        {% ftlmsg 'remaining-aliases-promo-label-unlimited' number=relay_addresses|length %}
       {% else %}
-          {% if relay_addresses|length == 4 %}
-            {% ftlmsg 'remaining-aliases-label-html' %}
-          {% else %}
-            {% ftlmsg 'remaining-aliases-label-plural-html' number=remaining_free_aliases_count %}
-          {% endif %}
+          {% ftlmsg 'remaining-aliases-promo-label' number=remaining_free_aliases_count %}
           {% if settings.PREMIUM_ENABLED %}
             <a href="https://accounts.stage.mozaws.net/subscriptions/products/{{ settings.PREMIUM_PROD_ID }}?plan={{ settings.PREMIUM_PRICE_ID }}" target="_blank">{% ftlmsg 'remaining-aliases-cta' %}</a>
           {% endif %}