Add meta title/desc, logout strings

mozilla · May 28, 2021 · 5df9aaf · 5df9aaf
1 parent 5090c13
commit 5df9aaf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/privaterelay/locales/en/privaterelay/app.ftl b/privaterelay/locales/en/privaterelay/app.ftl
@@ -15,6 +15,11 @@
 -brand-name-firefox-monitor = Firefox Monitor
 -brand-name-pocket = Pocket
 
+### Meta Data
+
+meta-title = { -brand-name-firefox-relay }
+meta-description = { -brand-name-firefox-relay } makes it easy to create email aliases, aliases that forward to your real inbox. Use it to protect your online accounts from hackers and unwanted messages.
+
 ### Header 
 logo-alt= { -brand-name-firefox-relay }
 nav-menu = Menu
@@ -26,6 +31,7 @@ nav-profile-sign-in = Sign In
 nav-profile-manage-fxa = Manage your { -brand-name-firefox-account }
 nav-profile-sign-out = Sign Out
 nav-profile-sign-out-relay = Sign Out of { -brand-name-relay }
+nav-profile-sign-out-confirm = Are you sure you want to sign out?
 
 ### Footer
 nav-footer-privacy = Privacy

diff --git a/privaterelay/templates/account/logout.html b/privaterelay/templates/account/logout.html
@@ -1,22 +1,24 @@
 {% extends "account/base.html" %}
 
-{% load i18n %}
+{% load ftl %}
+{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
+
+{% block head_title %}{% ftlmsg 'nav-profile-sign-out' %}{% endblock %}
 
-{% block head_title %}{% trans "Sign Out" %}{% endblock %}
 
 {% block content %}
 <main class="container px-4 lg:px-0 py-8 mx-auto max-w-4xl">
   <div class="bg-white rounded py-8 sm:mt-8 shadow-md  ">
     <div class="px-8 pb-8">
       <div class="px-8 mt-8 pb-16">
-        <p class="text-center text-2xl mb-8">{% trans 'Are you sure you want to sign out?' %}</p>
+        <p class="text-center text-2xl mb-8">{% ftlmsg 'nav-profile-sign-out-confirm' %}</p>
 
         <form method="post" action="{% url 'account_logout' %}">
           {% csrf_token %}
           {% if redirect_field_value %}
           <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
           {% endif %}
-          <button class="w-full max-w-xs mx-auto block text-center py-2 px-4 leading-normal rounded border border-solid border-purple-700 text-purple-700 hover:bg-purple-700 hover:text-white" type="submit">{% trans 'Sign Out' %}</button>
+          <button class="w-full max-w-xs mx-auto block text-center py-2 px-4 leading-normal rounded border border-solid border-purple-700 text-purple-700 hover:bg-purple-700 hover:text-white" type="submit"> {% ftlmsg 'nav-profile-sign-out' %} </button>
         </form>
 
       </div>

diff --git a/privaterelay/templates/base.html b/privaterelay/templates/base.html
@@ -1,16 +1,15 @@
 {% load socialaccount %}
 {% load static %}
 {% load ftl %}
-{% ftlconf mode=ftl_mode %}
-
+{% ftlconf mode=ftl_mode bundle='privaterelay.ftl_bundles.main' %}
 
 <!DOCTYPE html>
 <html lang="{{ request.LANGUAGE_CODE }}" dir="ltr">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-    <meta name="description" content="Firefox Relay makes it easy to create email aliases, aliases that forward to your real inbox. Use it to protect your online accounts from hackers and unwanted messages." />
-    <title>Firefox Relay</title>
+    <meta name="description" content="{% ftlmsg 'meta-description' %}" />
+    <title>{% ftlmsg 'meta-title' %}</title>
     <link rel="stylesheet" href="{% static 'css/style.css' %}">
     <link rel="stylesheet" href="{% static 'css/inter-ui.css' %}">
     <link rel="stylesheet" href="{% static 'css/metropolis.css' %}">