summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@parabola.nu>2018-07-17 21:05:31 +0100
committerroot <root@parabola.nu>2018-07-17 21:05:31 +0100
commit87ae23f3ce0adfea5a01247aea53dd57e3da4841 (patch)
treec0e4e0bbd509cd282d1601348311bfc9a08cb46d
parent40b3ec7b953d0aeb3289936c69771e3e9989ee9c (diff)
These changes were sitting on the server, and were timestamped 2017-11-07
-rw-r--r--main/templatetags/bugs.py1
-rw-r--r--releng/management/commands/syncisos.py2
-rw-r--r--templates/releng/release_list.html4
-rw-r--r--templates/sitemaps/news_sitemap.xml.jinja2
4 files changed, 6 insertions, 3 deletions
diff --git a/main/templatetags/bugs.py b/main/templatetags/bugs.py
index b548859a..7e00ce57 100644
--- a/main/templatetags/bugs.py
+++ b/main/templatetags/bugs.py
@@ -3,4 +3,5 @@ register = template.Library()
@register.simple_tag
def bug_link(bugid):
+ # FIXME: this needs rebranded, but I'm not sure it gets called anywhere
return "<a href=\"https://bugs.archlinux.org/task/{0}\">FS#{0}</a>".format(bugid)
diff --git a/releng/management/commands/syncisos.py b/releng/management/commands/syncisos.py
index 060ab2c1..b98c3e78 100644
--- a/releng/management/commands/syncisos.py
+++ b/releng/management/commands/syncisos.py
@@ -45,6 +45,8 @@ class Command(BaseCommand):
isonames = Iso.objects.values_list('name', flat=True)
active_isos = parser.parse(settings.ISO_LIST_URL)
+ print(active_isos)
+ print(isonames)
for iso in active_isos:
# create any names that don't already exist
if iso not in isonames:
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 3f442d07..0f1e6e1c 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -12,14 +12,14 @@
<div id="release-list" class="box">
<h2>Releases</h2>
- <p>This is a list of ISO releases made by the Arch Linux release
+ <p>This is a list of ISO releases made by the {{BRANDING_DISTRONAME}} release
engineering team. These are typically done on a monthly cadence, containing
the latest kernel and base packages from the package repositories. Click
the version of each release to read any additional notes or details about
each release.</p>
<p>Torrents and magnet URIs are available to download the releases.
Releases listed as not available may still be seeded by peers, but are no
- longer registered via the official Arch Linux torrent tracker. We always
+ longer registered via the official {{BRANDING_DISTRONAME}} torrent tracker. We always
recommend running the latest available release.</p>
<table id="release-table" class="results">
diff --git a/templates/sitemaps/news_sitemap.xml.jinja b/templates/sitemaps/news_sitemap.xml.jinja
index 97dd17b5..1a0be848 100644
--- a/templates/sitemaps/news_sitemap.xml.jinja
+++ b/templates/sitemaps/news_sitemap.xml.jinja
@@ -6,7 +6,7 @@
{% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
{% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
<news:news>
- <news:publication><news:name>Arch Linux News</news:name><news:language>en</news:language></news:publication>
+ <news:publication><news:name>{{BRANDING_DISTRONAME}} News</news:name><news:language>en</news:language></news:publication>
{% if url.item.postdate %}<news:publication_date>{{ url.item.postdate|date("c") }}</news:publication_date>{% endif %}
{% if url.item.title %}<news:title>{{ url.item.title }}</news:title>{% endif %}
</news:news>