From 9a562064f054c8b97a95a9e1c6dde190beb2c30b Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 25 Mar 2011 13:01:47 +0100 Subject: [PATCH] fix RSS host : no global setting needed anymore --- INSTALL | 1 - telemeta/templates/telemeta_default/base.html | 2 +- telemeta/web/base.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index ac36a4a8..b6687189 100644 --- a/INSTALL +++ b/INSTALL @@ -139,7 +139,6 @@ Add the following variables: TELEMETA_CACHE_DIR = absolute path to the cache directory that you just created TELEMETA_GMAP_KEY = your Google Map API key TELEMETA_DOWNLOAD_ENABLED = True to enable audio data download - TELEMETA_RSS_HOST = the public hostname of the RSS server TELEMETA_PUBLIC_ACCESS_PERIOD = 51 # (in years) Just paste the lines below:: diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index ebb60270..3873624f 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -43,7 +43,7 @@ {% trans "Welcome" %}, {% if user.first_name and user.last_name %} -{{ user.first_name }} {{ user.last_name }} +{{ user.first_name }} {{ user.last_name }}. {% else %} {{ user.username }}. {% endif %} diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 0cdd5342..2b53590b 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -939,7 +939,7 @@ class WebView(object): rss_item_list = [] organization = settings.TELEMETA_ORGANIZATION subjects = settings.TELEMETA_SUBJECTS - rss_host = settings.TELEMETA.RSS_HOST + rss_host = request.META['HTTP_HOST'] date_now = datetime.datetime.now() revisions = self.get_revisions(request) tags = ['title', 'description', 'comment'] -- 2.39.5