From 06f8d1c4f0a3a1123df262cd60ac6b5590f3ea7d Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 1 Dec 2011 14:22:32 -0800 Subject: [PATCH] Add support for archived subreddits, with a special submit message. --- r2/r2/lib/pages/pages.py | 5 ++++- r2/r2/lib/strings.py | 1 + r2/r2/models/subreddit.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 65fe4dbb8..e317c2252 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -253,7 +253,10 @@ class Reddit(Templated): kwargs["subtitles"] = [strings.submit_box_text] else: kwargs["disabled"] = True - kwargs["subtitles"] = [strings.submit_box_restricted_text] + if c.site.type == "archived": + kwargs["subtitles"] = [strings.submit_box_archived_text] + else: + kwargs["subtitles"] = [strings.submit_box_restricted_text] ps.append(SideBox(**kwargs)) if self.create_reddit_box and c.user_is_loggedin: diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py index 736223133..9ce2c24fc 100644 --- a/r2/r2/lib/strings.py +++ b/r2/r2/lib/strings.py @@ -125,6 +125,7 @@ string_dict = dict( ), submit_box_text = _('to anything interesting: news article, blog entry, video, picture...'), submit_box_restricted_text = _('submission in this subreddit is restricted to approved submitters.'), + submit_box_archived_text = _('this subreddit is archived and no longer accepting submissions.'), permalink_title = _("%(author)s comments on %(title)s"), link_info_title = _("%(title)s : %(site)s"), banned_subreddit = _("""**this reddit has been banned**\n\nmost likely this was done automatically by our spam filtering program. the program is still learning, and may even have some bugs, so if you feel the ban was a mistake, please submit a link to our [request a reddit listing](%(link)s) and be sure to include the **exact name of the reddit**."""), diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index df1c23223..ddb4664a4 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -266,7 +266,7 @@ class Subreddit(Thing, Printable): if c.user_is_admin: return True - if self.type in ('public', 'restricted'): + if self.type in ('public', 'restricted', 'archived'): return True elif c.user_is_loggedin: #private requires contributorship