[aggregator] Marked all user-facing strings for translation

Refs #1648

Author: marksweb

aggregator/feeds.py

@@ -1,5 +1,6 @@
 from django.contrib.syndication.views import Feed
 from django.shortcuts import get_object_or_404
+from django.utils.translation import gettext_lazy as _
 from django_hosts.resolvers import reverse
 
 from .models import FeedItem, FeedType
@@ -42,7 +43,7 @@ def items(self, obj):
         return qs[:25]
 
     def title(self, obj):
-        return "Django community aggregator: %s" % obj.name
+        return _("Django community aggregator: %s") % obj.name
 
     def link(self, obj):
         return reverse("aggregator-feed", args=[obj.slug], host="www")
@@ -52,8 +53,8 @@ def description(self, obj):
 
 
 class CommunityAggregatorFirehoseFeed(BaseCommunityAggregatorFeed):
-    title = "Django community aggregator firehose"
-    description = "All activity from the Django community aggregator"
+    title = _("Django community aggregator firehose")
+    description = _("All activity from the Django community aggregator")
 
     def link(self):
         return reverse("aggregator-firehose-feed", host="www")

aggregator/forms.py

@@ -1,4 +1,5 @@
 from django import forms
+from django.utils.translation import gettext_lazy as _
 
 from .models import Feed
 
@@ -9,7 +10,7 @@ class FeedModelForm(forms.ModelForm):
         widget=forms.TextInput(
             attrs={
                 "class": "required",
-                "placeholder": "Title of the resource / blog",
+                "placeholder": _("Title of the resource / blog"),
             }
         ),
     )
@@ -18,7 +19,7 @@ class FeedModelForm(forms.ModelForm):
         widget=forms.TextInput(
             attrs={
                 "class": "required",
-                "placeholder": (
+                "placeholder": _(
                     "Link to the RSS/Atom feed. Please only use "
                     "Django-specific feeds."
                 ),
@@ -30,7 +31,7 @@ class FeedModelForm(forms.ModelForm):
         widget=forms.TextInput(
             attrs={
                 "class": "required",
-                "placeholder": "Link to main page (i.e. blog homepage)",
+                "placeholder": _("Link to main page (i.e. blog homepage)"),
             }
         ),
     )
@@ -43,7 +44,9 @@ def clean_feed_url(self):
         feed_url = self.cleaned_data.get("feed_url")
         if feed_url and "//stackoverflow.com" in feed_url:
             raise forms.ValidationError(
-                "Stack Overflow questions tagged with 'django' will appear "
-                "here automatically."
+                _(
+                    "Stack Overflow questions tagged with 'django' will appear "
+                    "here automatically."
+                )
             )
         return feed_url

aggregator/models.py

@@ -6,6 +6,7 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 from django_push.subscriber import signals as push_signals
 from django_push.subscriber.models import Subscription
@@ -34,9 +35,9 @@ def items(self):
 PENDING_FEED = "P"
 
 STATUS_CHOICES = (
-    (PENDING_FEED, "Pending"),
-    (DENIED_FEED, "Denied"),
-    (APPROVED_FEED, "Approved"),
+    (PENDING_FEED, _("Pending")),
+    (DENIED_FEED, _("Denied")),
+    (APPROVED_FEED, _("Approved")),
 )
 
 
@@ -200,13 +201,13 @@ def feed_updated(sender, notification, **kwargs):
 push_signals.updated.connect(feed_updated)
 
 CONTINENTS = [
-    ("Africa", "Africa"),
-    ("North America", "North America"),
-    ("South America", "South America"),
-    ("Europe", "Europe"),
-    ("Asia", "Asia"),
-    ("Oceania", "Oceania"),
-    ("Antarctica", "Antarctica"),
+    ("Africa", _("Africa")),
+    ("North America", _("North America")),
+    ("South America", _("South America")),
+    ("Europe", _("Europe")),
+    ("Asia", _("Asia")),
+    ("Oceania", _("Oceania")),
+    ("Antarctica", _("Antarctica")),
 ]
 
 

aggregator/views.py

@@ -1,6 +1,7 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.translation import gettext as _
 from django.views.generic.list import ListView
 
 from .forms import FeedModelForm
@@ -70,8 +71,10 @@ def add_feed(request, feed_type_slug):
         messages.add_message(
             request,
             messages.INFO,
-            "Your feed has entered moderation. "
-            "Please allow up to 1 week for processing.",
+            _(
+                "Your feed has entered moderation. "
+                "Please allow up to 1 week for processing."
+            ),
         )
         return redirect("community-index")
 

djangoproject/templates/aggregator/delete-confirm.html

@@ -1,16 +1,19 @@
 {% extends "base_community.html" %}
+{% load i18n %}
 
 {% block content %}
-  <h1>Community</h1>
+  <h1>{% translate "Community" %}</h1>
 
-  <h2 class="deck">Really delete {{ feed }}?</h2>
+  <h2 class="deck">{% blocktranslate %}Really delete {{ feed }}?{% endblocktranslate %}</h2>
 
   <p>
-    We haven't implemented an undo feature yet, so all items will be deleted immediately.
+    {% blocktranslate trimmed %}
+      We haven't implemented an undo feature yet, so all items will be deleted immediately.
+    {% endblocktranslate %}
   </p>
 
   <form class="wide" action="." method="post">
     {% csrf_token %}
-    <p class="submit"><input class="cta" type="submit" value="Yes, delete the feed."></p>
+    <p class="submit"><input class="cta" type="submit" value="{% translate "Yes, delete the feed." %}"></p>
   </form>
 {% endblock %}

djangoproject/templates/aggregator/denied.html

@@ -1,7 +1,8 @@
 {% extends "base_community.html" %}
+{% load i18n %}
 
 {% block content %}
-    <h1>Community</h1>
+    <h1>{% translate "Community" %}</h1>
 
-    <h2>Sorry, you can't do that.</h2>
+    <h2>{% translate "Sorry, you can't do that." %}</h2>
 {% endblock %}

djangoproject/templates/aggregator/edit-feed.html

@@ -1,12 +1,13 @@
 {% extends "base_community.html" %}
+{% load i18n %}
 
 {% block content %}
-  <h1>Community</h1>
+  <h1>{% translate "Community" %}</h1>
 
   {% if adding %}
-    <h2 class="deck">Add a {{ feed_type }} feed:</h2>
+    <h2 class="deck">{% blocktranslate with type=feed_type %}Add a {{ type }} feed:{% endblocktranslate %}</h2>
   {% else %}
-    <h2 class="deck">Edit {{ feed }}:</h2>
+    <h2 class="deck">{% blocktranslate %}Edit {{ feed }}:{% endblocktranslate %}</h2>
   {% endif %}
 
   <form method="POST" action="" id="add_feed_form" class="wide form-input">
@@ -20,9 +21,9 @@ <h2 class="deck">Edit {{ feed }}:</h2>
       </p>
     {% endfor %}
     {% if adding %}
-      <p class="submit"><input class="cta" type="submit" value="Add Feed"></p>
+      <p class="submit"><input class="cta" type="submit" value="{% translate "Add Feed" %}"></p>
     {% else %}
-      <p class="submit"><input class="cta" type="submit" value="Save"></p>
+      <p class="submit"><input class="cta" type="submit" value="{% translate "Save" %}"></p>
     {% endif %}
   </form>
 

djangoproject/templates/aggregator/feeditem_list.html

@@ -1,22 +1,26 @@
 {% extends "base_community.html" %}
+{% load i18n %}
 
 {% block content %}
-  <h1>Django community: {{ feed_type.name }}
-    <a class="rss" href="{% url 'aggregator-feed' feed_type.slug %}">RSS</a></h1>
-  <h2 class="deck">
-    This page, updated regularly, aggregates {{ feed_type.name }}
-    from the Django community.
+  {% url 'aggregator-feed' feed_type.slug as feed_url %}
+  <h1>{% blocktranslate trimmed with name=feed_type.name %}Django community: {{ feed_type.name }}
+    <a class="rss" href="{{ feed_url }}">RSS</a>{% endblocktranslate %}</h1>
+  <h2 class="deck">{% blocktranslate trimmed with name=feed_type.name %}
+    This page, updated regularly, aggregates {{ name }}
+    from the Django community.{% endblocktranslate %}
   </h2>
 
   <ul class="list-news">
     {% for item in object_list %}
       <li>
         <h2><a href="{{ item.link }}">{{ item.title }}</a></h2>
-        <span class='meta'>Posted on {{ item.date_modified|date:"F j, Y" }} at {{ item.date_modified|date:"g:i A" }} by <a href="{{ item.feed.public_url }}">{{ item.feed.title }}</a> <a class="rss" href="{{ item.feed.feed_url }}">RSS</a></span>
+        <span class='meta'>{% blocktranslate trimmed with date_modified=item.date_modified|date:"DATE_FORMAT" time_modified=item.date_modified|date:"TIME_FORMAT" public_url=item.feed.public_url title=item.feed.title feed_url=item.feed.feed_url %}
+          Posted on {{ date_modified }} at {{ time_modified }} by <a href="{{ public_url }}">{{ title }}</a> <a class="rss" href="{{ feed_url }}">RSS</a>
+        {% endblocktranslate %}</span>
         <div>
           {{ item.summary|striptags|truncatewords:"200" }}
         </div>
-        <p class="small"><a class="link-readmore" href="{{ item.link }}">Read this post in context</a></p>
+        <p class="small"><a class="link-readmore" href="{{ item.link }}">{% translate "Read this post in context" %}</a></p>
       </li>
     {% endfor %}
   </ul>
@@ -27,13 +31,13 @@ <h2><a href="{{ item.link }}">{{ item.title }}</a></h2>
         {% if page_obj.has_previous %}
           <li><a class="previous" href="?page={{ page_obj.previous_page_number }}">
             <i class="icon icon-chevron-left"></i>
-            <span class="visuallyhidden">Previous</span>
+            <span class="visuallyhidden">{% translate "Previous" context "pagination" %}</span>
           </a></li>
         {% endif %}
         {% if page_obj.has_next %}
           <li><a class="next" href="?page={{ page_obj.next_page_number }}">
             <i class="icon icon-chevron-right"></i>
-            <span class="visuallyhidden">Next</span>
+            <span class="visuallyhidden">{% translate "Next" context "pagination" %}</span>
           </a></li>
         {% endif %}
       </ul>

djangoproject/templates/aggregator/index.html

@@ -1,58 +1,59 @@
 {% extends "base_community.html" %}
+{% load i18n %}
 
 {% block layout_class %}column-container sidebar-right{% endblock %}
 
 {% block content %}
 
-  <h2 class="community-title">Get Help</h2>
+  <h2 class="community-title">{% translate "Get Help" %}</h2>
   <div class="community-cta-wrapper">
     <a href="https://forum.djangoproject.com/" class="community-cta-a">
       <div class="community-cta">
         <div>
           {% include "svg_logos/forum.html" %}
         </div>
-        <h3>Forum - Post a question</h3>
+        <h3>{% translate "Forum - Post a question" %}</h3>
       </div>
     </a>
     <a href="https://discord.gg/xcRH6mN4fa" class="community-cta-a">
       <div class="community-cta">
         <div>
           {% include "svg_logos/discord.html" %}
         </div>
-        <h3>Discord - Chat with us</h3>
+        <h3>{% translate "Discord - Chat with us" %}</h3>
       </div>
     </a>
   </div>
 
-  <h2 class="community-title">Get Involved</h2>
+  <h2 class="community-title">{% translate "Get Involved" %}</h2>
   <div class="community-cta-wrapper">
     <a href="https://docs.djangoproject.com/en/dev/internals/contributing/bugs-and-features/#reporting-bugs" class="community-cta-a">
       <div class="community-cta">
         <div>
           {% include "svg_logos/bug.html" %}
         </div>
-        <h3>Report an issue</h3>
+        <h3>{% translate "Report an issue" %}</h3>
       </div>
     </a>
     <a href="https://docs.djangoproject.com/en/dev/internals/contributing/" class="community-cta-a">
       <div class="community-cta">
         <div>
           {% include "svg_logos/notepad.html" %}
         </div>
-        <h3>Contribute to Django</h3>
+        <h3>{% translate "Contribute to Django" %}</h3>
       </div>
     </a>
     <a href="/community/local/" class="community-cta-a">
       <div class="community-cta">
         <div>
           {% include "svg_logos/world.html" %}
         </div>
-        <h3>Local Django Community</h3>
+        <h3>{% translate "Local Django Community" %}</h3>
       </div>
     </a>
   </div>
 
-  <h2>Django RSS feeds</h2>
+  <h2>{% translate "Django RSS feeds" %}</h2>
   <ul class="list-collapsing">
     {% for feedtype, latest_feeds in feedtype_list %}
       <li id="{{ feedtype.slug }}">
@@ -61,26 +62,30 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
           <dl class="list-links">
             {% for item in latest_feeds %}
               <dt><a href="{{ item.link }}">{{ item.title }}</a></dt>
-              <dd>{{ item.date_modified|date:"N jS, Y \a\t P" }} by <a href="{{ item.feed.public_url }}">{{ item.feed.title }}</a></dd>
+              <dd>
+                {% blocktranslate trimmed with modified_date=item.date_modified|date:"DATETIME_FORMAT" public_url=item.feed.public_url title=item.feed.title %}
+                  {{ modified_date }} by <a href="{{ public_url }}">{{ title }}</a>
+                {% endblocktranslate %}
+              </dd>
             {% endfor %}
           </dl>
           <p class="meta">
             {% if latest_feeds %}
-              <a href="{% url 'community-feed-list' feedtype.slug %}">View more</a>
+              <a href="{% url 'community-feed-list' feedtype.slug %}">{% translate "View more" %}</a>
             {% endif %}
             {% if latest_feeds and feedtype.can_self_add %}
-              or
+              {% translate "or" context "view more OR add your feed" %}
             {% endif %}
             {% if feedtype.can_self_add %}
-              <a href="{% url 'community-add-feed' feedtype.slug %}">Add your feed</a>
+              <a href="{% url 'community-add-feed' feedtype.slug %}">{% translate "Add your feed" %}</a>
             {% endif %}
           </p>
         </div>
       </li>
     {% endfor %}
   </ul>
 
-  <h2>Mailing Lists</h2>
+  <h2>{% translate "Mailing Lists" %}</h2>
   {% include "includes/mailing_lists.html" %}
 
 {% endblock %}