From 98d0ca5e7a5ca84936a5facff3ce7c8f0e2da596 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Tue, 22 Jan 2013 14:48:04 -0800 Subject: [PATCH] Move announcement_message to ZooKeeper. --- r2/example.ini | 4 ++-- r2/r2/lib/pages/pages.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/r2/example.ini b/r2/example.ini index c4ac88658..3214e3852 100644 --- a/r2/example.ini +++ b/r2/example.ini @@ -40,8 +40,6 @@ heavy_load_mode = false # directory to write cProfile stats dumps to (disabled if not set) profile_directory = -# a message placed in the infobar -announcement_message = # the site's tagline, used in the title and description short_description = open source is awesome @@ -558,6 +556,8 @@ beaker.session_secret = somesecret frontpage_dart = false # links that get their own infrastructure (comma-delimited list of id36s) fastlane_links = +# a message placed in the infobar +announcement_message = # spotlight links for subreddit discovery sr_discovery_links = # probability of the subreddit suggester showing up in the spotlight box diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 1e38e46e2..8f127e29e 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -173,8 +173,8 @@ class Reddit(Templated): elif (c.firsttime == 'mobile_suggest' and c.render_style != 'compact'): infotext = strings.iphone_first - elif g.announcement_message: - infotext = g.announcement_message + elif g.live_config.get("announcement_message"): + infotext = g.live_config["announcement_message"] if isinstance(c.site, DomainSR) and c.site.domain.endswith("imgur.com"): self.infobar = InfoBar(