fix RSS host : no global setting needed anymore

diff --git a/INSTALL b/INSTALL
index ac36a4a8e210cf2fa766c39b499748c00eecc1de..b66871896f52ff47b0e97687e511eaacf5e5f127 100644 (file)
--- 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 ebb602700773a1fd3ee2ea4a3581941eee7d2151..3873624fbd1a83ae09dea1b0c6cc0a0e8de5377f 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -43,7 +43,7 @@
 <img src="images/user_red.png" style="vertical-align:middle" />
 {% 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 0cdd5342fc55451b1f45c7ae57a71d83daf5528f..2b53590b4b927ae3daf2d9867cf8986f084b55bf 100644 (file)
--- 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']