summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 23:43:42 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 23:43:42 -0400
commit94f972bb892dbf9a86f089f1872ae6d849c0cd0e (patch)
tree2a3480a33a6039b75609db8c236dc6754b7b46c0
parent39ae185aed362c9081cb8832e90cd2fe08ff3900 (diff)
use a BRANDING_OSEARCH_TAGS for templates/packages/opensearch.xml
-rw-r--r--README.BRANDING3
-rw-r--r--main/context_processors.py6
-rw-r--r--settings.py2
-rw-r--r--templates/packages/opensearch.xml2
4 files changed, 6 insertions, 7 deletions
diff --git a/README.BRANDING b/README.BRANDING
index 027d7f9b..d155ed10 100644
--- a/README.BRANDING
+++ b/README.BRANDING
@@ -13,9 +13,6 @@ Files used to configure branding/url stuff
Files with minor Arch stuff that's just easier to patch
-------------------------------------------------------
-`templates/packages/opensearch.xml`
- * `<Tags>` includes `archlinux`
-
`templates/packages/flaghelp.html`
* link to "arch-general" mailing list
diff --git a/main/context_processors.py b/main/context_processors.py
index 2543a3de..94e83e72 100644
--- a/main/context_processors.py
+++ b/main/context_processors.py
@@ -4,13 +4,15 @@ def secure(request):
def branding(request):
from django.conf import settings
return {
+ 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
+ 'BUGTRACKER_URL': settings.BUGTRACKER_URL,
+
'BRANDING_APPNAME': settings.BRANDING_APPNAME,
'BRANDING_DISTRONAME': settings.BRANDING_DISTRONAME,
'BRANDING_SHORTNAME': settings.BRANDING_SHORTNAME,
'BRANDING_WIKINAME': settings.BRANDING_WIKINAME,
'BRANDING_EMAIL': settings.BRANDING_EMAIL,
- 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
- 'BUGTRACKER_URL': settings.BUGTRACKER_URL,
+ 'BRANDING_OSEARCH_TAGS': settings.BRANDING_OSEARCH_TAGS,
}
# vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index de8afe66..7dfe7195 100644
--- a/settings.py
+++ b/settings.py
@@ -148,7 +148,7 @@ BRANDING_DISTRONAME = 'Parabola GNU/Linux-libre'
BRANDING_SHORTNAME = 'Parabola'
BRANDING_WIKINAME = 'ParabolaWiki'
BRANDING_EMAIL = 'Parabola Website Notification <nobody@parabolagnulinux.org>'
-
+BRANDING_OSEARCH_TAGS = 'gnu linuxlibre parabola package software'
## Import local settings
from local_settings import *
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 26185148..6bb1225a 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -2,7 +2,7 @@
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>{{BRANDING_DISTRONAME}} Packages</ShortName>
<Description>Search the {{BRANDING_DISTRONAME}} package repositories.</Description>
- <Tags>gnu linuxlibre parabola package software</Tags>
+ <Tags>{{BRANDING_OSEARCH_TAGS}}</Tags>
<Image height="16" width="16" type="image/x-icon">{{domain}}/static/favicon.ico</Image>
<Language>en-us</Language>
<InputEncoding>UTF-8</InputEncoding>