From 3123d2ed9220ab1103a800041e4e46d0f6fbf6c8 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Fri, 3 May 2013 19:00:31 +0200
Subject: Standardize flash messages a bit

---
 hyperkitty/views/accounts.py | 10 +++-------
 hyperkitty/views/list.py     |  9 +++------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'hyperkitty/views')

diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index 284eb15..70d7109 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -35,17 +35,12 @@ from social_auth.backends import SocialAuthBackend
 
 from hyperkitty.models import UserProfile, Rating, Favorite
 from hyperkitty.views.forms import RegistrationForm, UserProfileForm
-from hyperkitty.lib import get_store
+from hyperkitty.lib import get_store, FLASH_MESSAGES
 
 
 logger = logging.getLogger(__name__)
 
 
-FLASH_MESSAGES = {
-    "updated-ok": "The profile was successfully updated.",
-}
-
-
 def login_view(request, *args, **kwargs):
     if "extra_context" not in kwargs:
         kwargs["extra_context"] = {}
@@ -120,7 +115,8 @@ def user_profile(request, user_email=None):
     flash_messages = []
     flash_msg = request.GET.get("msg")
     if flash_msg:
-        flash_msg = { "type": "success", "msg": FLASH_MESSAGES[flash_msg] }
+        flash_msg = { "type": FLASH_MESSAGES[flash_msg][0],
+                      "msg": FLASH_MESSAGES[flash_msg][1] }
         flash_messages.append(flash_msg)
 
     context = {
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 1203c7d..000b7b3 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -33,6 +33,7 @@ from django.http import Http404
 
 from hyperkitty.models import Tag, Favorite
 from hyperkitty.lib import get_months, get_store, get_display_dates, daterange
+from hyperkitty.lib import FLASH_MESSAGES
 from hyperkitty.lib.voting import get_votes
 from forms import SearchForm
 
@@ -41,11 +42,6 @@ if settings.USE_MOCKUPS:
     from hyperkitty.lib.mockup import generate_top_author, generate_thread_per_category
 
 
-FLASH_MESSAGES = {
-    "sent-ok": "The message has been sent successfully.",
-}
-
-
 def archives(request, mlist_fqdn, year=None, month=None, day=None):
     if year is None and month is None:
         today = datetime.date.today()
@@ -147,7 +143,8 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr
     flash_messages = []
     flash_msg = request.GET.get("msg")
     if flash_msg:
-        flash_msg = { "type": "success", "msg": FLASH_MESSAGES[flash_msg] }
+        flash_msg = { "type": FLASH_MESSAGES[flash_msg][0],
+                      "msg": FLASH_MESSAGES[flash_msg][1] }
         flash_messages.append(flash_msg)
 
     context = {
-- 
cgit