use description from settings in meta tags

diff --git a/panikweb/context_processors.py b/panikweb/context_processors.py
index 658192a11c6fc29048aa43b4ffa03f11c495adfd..68067c8738a132571c7dd277d71e581e8397c5b6 100644 (file)
--- a/panikweb/context_processors.py
+++ b/panikweb/context_processors.py
@@ -7,7 +7,8 @@ def panikweb(request):
     d = {
         'site_url': request.build_absolute_uri('/').strip('/'),
         'radio_name': settings.RADIO_NAME,
-        'radio_long_name': settings.RADIO_LONG_NAME,
+        'radio_long_name': settings.RADIO_LONG_NAME or settings.RADIO_NAME,
+        'radio_meta_description': settings.RADIO_META_DESCRIPTION or '',
         'pwa_settings': cache_during_request(PwaSettings.singleton),
     }
     d.update(settings.TEMPLATE_VARS)

diff --git a/panikweb/templates/base.html b/panikweb/templates/base.html
index f48681f493712c19b5a4676dd9a690b3cfb26a71..69e69a6f65e987895b1668fd0bd243659273d85f 100644 (file)
--- a/panikweb/templates/base.html
+++ b/panikweb/templates/base.html
@@ -15,16 +15,16 @@
 
     <meta name="og:site_name" content="{{ radio_name }}"/>
     {% block head %}
-    <meta name="description" content="En vous branchant sur le 105.4 FM, vous pénétrerez plus avant dans l'œil du cyclone…" />
+    <meta name="description" content="{{ radio_meta_description }}" />
 
     <meta property="og:title" content="{{ radio_long_name }}" />
     <meta property="og:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
-    <meta property="og:description" content="En vous branchant sur le 105.4 FM, vous pénétrerez plus avant dans l'œil du cyclone…" />
+    <meta property="og:description" content="{{ radio_meta_description }}" />
 
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:title" content="{{ radio_long_name }}" />
     <meta name="twitter:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
-    <meta name="twitter:description" content="En vous branchant sur le 105.4 FM, vous pénétrerez plus avant dans l'œil du cyclone…" />
+    <meta name="twitter:description" content="{{ radio_meta_description }}" />
 
     {% endblock %}