From 7077f10e144b0d2f467dd016be2af87b734a3de8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Jan 2018 13:52:00 -0500 Subject: branding: Replace now-configurable strings in templates --- templates/base.html | 10 +++++----- templates/mirrors/mirror_details.html | 3 ++- templates/mirrors/mirrorlist_generate.html | 7 ++++--- templates/packages/flag.html | 2 +- templates/packages/flaghelp.html | 2 +- templates/packages/opensearch.xml | 4 ++-- templates/public/download.html | 5 +++-- templates/public/feeds.html | 14 +++++++------- templates/public/index.html | 23 ++++++++++++----------- templates/public/svn.html | 6 +++--- templates/releng/add.html | 2 +- templates/releng/results.html | 1 + 12 files changed, 42 insertions(+), 37 deletions(-) diff --git a/templates/base.html b/templates/base.html index df789601..a5e747a8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static from staticfiles %}{% load wiki %} @@ -18,11 +18,11 @@
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 9a553e69..5fe1c585 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -4,6 +4,7 @@ {% load mirror_status %} {% load flags %} {% load admin_urls %} +{% load bugs %} {% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %} @@ -63,7 +64,7 @@ Flyspray Issue: - {% if mirror.bug %}FS#{{ mirror.bug }}{% endif %} + {% if mirror.bug %}{% bug_link mirror.bug %}{% endif %} Notes: diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html index 71ba6557..7501a9af 100644 --- a/templates/mirrors/mirrorlist_generate.html +++ b/templates/mirrors/mirrorlist_generate.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load package_extras %} +{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Pacman Mirrorlist Generator{% endblock %} {% block content %} @@ -7,8 +8,8 @@

Pacman Mirrorlist Generator

-

This page generates the most up-to-date mirrorlist possible for Arch - Linux. The data used here comes straight from the developers' internal +

This page generates the most up-to-date mirrorlist possible for {{ BRANDING_DISTRONAME }}. + The data used here comes straight from the developers' internal mirror database used to track mirror availability and tiering. There are two main options: get a mirrorlist with every available mirror, or get a mirrorlist tailored to your geography.

@@ -29,7 +30,7 @@

The following form can generate a custom up-to-date pacman mirrorlist based on geography and + title="{{ BRANDING_WIKINAME }}: Pacman">pacman mirrorlist based on geography and desired protocol(s). Simply replace the contents of /etc/pacman.d/mirrorlist with your generated list. Additionally, the mirror status data can be incorporated into the generated diff --git a/templates/packages/flag.html b/templates/packages/flag.html index 34f1c7fb..e66d3472 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -29,7 +29,7 @@

Note: Do not use this facility if the package is broken! The package will be unflagged and the report will be ignored! - Use the + Use the bugtracker to file a bug instead.

Please confirm your flag request for {{package.pkgname}}:

diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index eb2226f2..5f013cd7 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -29,7 +29,7 @@ with your additional text.

Note: Please do not use this facility if the - package is broken! Use the bugtracker instead.

diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml index e7e13617..4c0f9acf 100644 --- a/templates/packages/opensearch.xml +++ b/templates/packages/opensearch.xml @@ -1,9 +1,9 @@ {% load static from staticfiles %} - Arch Packages + {{ BRANDING_SHORTNAME }} Packages {{ BRANDING_DISTRONAME }} Package Repository Search Search the {{ BRANDING_DISTRONAME }} package repositories by keyword in package names and descriptions. - linux archlinux package software + {{ BRANDING_OSEARCH_TAGS }} {{ domain }}{% static "favicon.ico" %} {{ domain }}{% static "logos/icon-transparent-64x64.png" %} en-us diff --git a/templates/public/download.html b/templates/public/download.html index dcf93d70..ae8273c7 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -2,6 +2,7 @@ {% load cache %} {% load static from staticfiles %} {% load flags %} +{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %} @@ -45,9 +46,9 @@
{{ release.info_html }}
{% endif %} -

Existing Arch Users

+

Existing {{ BRANDING_SHORTNAME }} Users

-

If you are an existing Arch user, there is no need to download a new ISO +

If you are an existing {{ BRANDING_SHORTNAME }} user, there is no need to download a new ISO to update your existing system. You may be looking for an updated mirrorlist instead.

diff --git a/templates/public/feeds.html b/templates/public/feeds.html index e72cf616..2957692f 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base.html" %}{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %} {% block content %} @@ -6,7 +6,7 @@

RSS Feeds

-

Several RSS feeds are available for consumption from the Arch website. +

Several RSS feeds are available for consumption from the {{ BRANDING_SHORTNAME }} website. The majority of these are package-related and allow feeds to be customized for the updates you care about.

@@ -15,10 +15,10 @@

Grab the news item feed to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.

-

The Arch Wiki: Recent changes feed - is also available to track document changes from the Arch Wiki.

+

The {{ BRANDING_WIKINAME }}: Recent changes feed + is also available to track document changes from the {{ BRANDING_WIKINAME }}.

Package Feeds

@@ -73,7 +73,7 @@

Development Feeds

Subscribe to any of the following to track bug tickets and feature - requests from the {{ BRANDING_DISTRONAME }} Bugtracker:

+ requests from the {{ BRANDING_DISTRONAME }} Bugtracker:

diff --git a/templates/public/index.html b/templates/public/index.html index 5c71496d..1189fff8 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load cache %} {% load static from staticfiles %} +{% load wiki %} {% block head %} @@ -26,10 +27,10 @@ on the range of skillsets and uses for Arch that stem from it. Please check out our forums and mailing lists - to get your feet wet. Also glance through our wiki - if you want to learn more about Arch.

+ title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists + to get your feet wet. Also glance through our wiki + if you want to learn more about {{ BRANDING_SHORTNAME }}.

Learn more...

@@ -41,7 +42,7 @@ - RSS Feed {% for news in news_updates %}{% if forloop.counter0 < 5 %} @@ -88,7 +89,7 @@

Recent Updates (more)

- RSS Feed
@@ -109,7 +110,7 @@