From 9391310c6ebcfa5973aefaa28829cb61451779d2 Mon Sep 17 00:00:00 2001 From: Ricky Ramirez Date: Mon, 18 Feb 2013 23:20:17 -0800 Subject: [PATCH] Point old wiki links to their new URLs. --- r2/r2/controllers/api.py | 2 +- r2/r2/controllers/front.py | 2 +- r2/r2/lib/menus.py | 2 +- r2/r2/lib/pages/pages.py | 12 ++++++------ r2/r2/templates/feedbackblurb.html | 2 +- r2/r2/templates/frametoolbar.html | 2 +- r2/r2/templates/gold.html | 2 +- r2/r2/templates/messagecompose.html | 4 ++-- r2/r2/templates/newlink.html | 2 +- r2/r2/templates/pagenamenav.html | 2 +- r2/r2/templates/prefoptions.html | 4 ++-- r2/r2/templates/printablebuttons.html | 2 +- r2/r2/templates/promotelinkform.html | 2 +- r2/r2/templates/redditfooter.html | 4 ++-- r2/r2/templates/searchform.html | 4 ++-- r2/r2/templates/selfserveblurb.html | 2 +- r2/r2/templates/spotlightlisting.html | 2 +- r2/r2/templates/userawards.html | 4 ++-- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 4d0293fdc..4e8046495 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -359,7 +359,7 @@ class ApiController(RedditController, OAuth2ResourceController): (c.user.name, filled_quota), "info") verify_link = "/verify?reason=submit" - reddiquette_link = "/help/reddiquette" + reddiquette_link = "/wiki/reddiquette" if c.user.email_verified: msg = strings.verified_quota_msg % dict(reddiquette=reddiquette_link) diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index ef7f84f26..fed865504 100755 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -784,7 +784,7 @@ class FrontController(RedditController, OAuth2ResourceController): simple=True).render() return res - search_help_page = "/help/search" + search_help_page = "/wiki/search" verify_langs_regex = re.compile(r"\A[a-z][a-z](,[a-z][a-z])*\Z") @base_listing @validate(query=VLength('q', max_length=512), diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py index 1e95a02ba..6cf672f85 100644 --- a/r2/r2/lib/menus.py +++ b/r2/r2/lib/menus.py @@ -85,7 +85,7 @@ menu = MenuHandler(hot = _('hot'), # reddit header strings prefs = _("preferences"), submit = _("submit"), - help = _("help"), + wiki = _("wiki"), blog = _("blog"), logout = _("logout"), diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 4826383d8..5fc75f4d3 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -568,9 +568,9 @@ class RedditFooter(CachedTemplate): separator = ""), NavMenu([ - NamedButton("help", False, nocname=True), - OffsiteButton(_("FAQ"), dest = "/help/faq", nocname=True), - OffsiteButton(_("reddiquette"), nocname=True, dest = "/help/reddiquette"), + NamedButton("wiki", False, nocname=True), + OffsiteButton(_("FAQ"), dest = "/wiki/faq", nocname=True), + OffsiteButton(_("reddiquette"), nocname=True, dest = "/wiki/reddiquette"), NamedButton("rules", False, nocname=True), NamedButton("feedback", False), ], @@ -1448,7 +1448,7 @@ class ProfilePage(Reddit): rb = Reddit.rightbox(self) tc = TrophyCase(self.user) - helplink = ( "/help/awards", _("what's this?") ) + helplink = ( "/wiki/awards", _("what's this?") ) scb = SideContentBox(title=_("trophy case"), helplink=helplink, content=[tc], extra_class="trophy-area") @@ -1717,7 +1717,7 @@ class SubscriptionBox(Templated): if not c.user.gold: self.goldlink = "/gold" self.goldmsg = _("raise it to %s") % Subreddit.gold_limit - self.prelink = ["/help/faq#HowmanyredditscanIsubscribeto", + self.prelink = ["/wiki/faq#wiki_how_many_reddits_can_i_subscribe_to.3F", _("%s visible") % Subreddit.sr_limit] else: self.goldlink = "/gold/about" @@ -1726,7 +1726,7 @@ class SubscriptionBox(Templated): visible = min(len(srs), Subreddit.gold_limit) bonus = {"bonus": extra} self.goldmsg = _("%(bonus)s bonus reddits") % bonus - self.prelink = ["/help/faq#HowmanyredditscanIsubscribeto", + self.prelink = ["/wiki/faq#wiki_how_many_reddits_can_i_subscribe_to.3F", _("%s visible") % visible] Templated.__init__(self, srs=srs, goldlink=self.goldlink, diff --git a/r2/r2/templates/feedbackblurb.html b/r2/r2/templates/feedbackblurb.html index 7815dd589..c6d3f2c60 100644 --- a/r2/r2/templates/feedbackblurb.html +++ b/r2/r2/templates/feedbackblurb.html @@ -34,7 +34,7 @@
Making a press inquiry?
-
Get our press contact details.
+
Get our press contact details.
Are your submissions not showing up? Subreddit marked as spam? Is the spam filter acting up?
Send a private message to the admins. (We really do want to help) diff --git a/r2/r2/templates/frametoolbar.html b/r2/r2/templates/frametoolbar.html index 1030883e1..138c5bf7e 100644 --- a/r2/r2/templates/frametoolbar.html +++ b/r2/r2/templates/frametoolbar.html @@ -102,7 +102,7 @@ %endif - + ${_('help')} diff --git a/r2/r2/templates/gold.html b/r2/r2/templates/gold.html index db718c60d..3340ec98c 100644 --- a/r2/r2/templates/gold.html +++ b/r2/r2/templates/gold.html @@ -93,7 +93,7 @@ ${radio_type("goldtype", "gift", _("Give reddit gold to someone else"), "", thing.goldtype == "gift")}
${radio_type("goldtype", "creddits", _('Buy reddit gold "creddits"'), - unsafe("details"), + unsafe("details"), thing.goldtype == "creddits")}
diff --git a/r2/r2/templates/messagecompose.html b/r2/r2/templates/messagecompose.html index 386eae803..6494fe178 100644 --- a/r2/r2/templates/messagecompose.html +++ b/r2/r2/templates/messagecompose.html @@ -106,7 +106,7 @@ function admincheck(elem) {
  • If you think your posts are being caught in the spam filter, please write to - + the moderators of the subreddit @@ -120,7 +120,7 @@ function admincheck(elem) { inquiring about, and that's actually the reason you're writing, please message - + all of the moderators of the subreddit (using the "message the mods" feature located at the top of the diff --git a/r2/r2/templates/newlink.html b/r2/r2/templates/newlink.html index 97c55b7e0..17df9ecb0 100755 --- a/r2/r2/templates/newlink.html +++ b/r2/r2/templates/newlink.html @@ -115,7 +115,7 @@ ${thing.captcha} target="_blank"), good_reddiquette=dict( link_text=_("good reddiquette"), - path="/help/reddiquette", + path="/wiki/reddiquette", target="_blank"), )} diff --git a/r2/r2/templates/pagenamenav.html b/r2/r2/templates/pagenamenav.html index d065f737a..4ca4663ef 100644 --- a/r2/r2/templates/pagenamenav.html +++ b/r2/r2/templates/pagenamenav.html @@ -43,7 +43,7 @@ <%def name="help()"> - ${plain_link(thing.title, "/help", _sr_path=False)} + ${plain_link(thing.title, "/wiki", _sr_path=False)} diff --git a/r2/r2/templates/prefoptions.html b/r2/r2/templates/prefoptions.html index 83e28dc12..c228717a4 100644 --- a/r2/r2/templates/prefoptions.html +++ b/r2/r2/templates/prefoptions.html @@ -281,7 +281,7 @@ ( - ${_("details")} + ${_("details")} )
    @@ -289,7 +289,7 @@ ( - + ${_("details")} ) diff --git a/r2/r2/templates/printablebuttons.html b/r2/r2/templates/printablebuttons.html index adcc07d04..5fc1eeeb0 100644 --- a/r2/r2/templates/printablebuttons.html +++ b/r2/r2/templates/printablebuttons.html @@ -112,7 +112,7 @@ %endif / - + help diff --git a/r2/r2/templates/promotelinkform.html b/r2/r2/templates/promotelinkform.html index 052a8887c..a8a6c9e53 100644 --- a/r2/r2/templates/promotelinkform.html +++ b/r2/r2/templates/promotelinkform.html @@ -391,7 +391,7 @@ ${self.javascript_setup()} %endif %else:
    - By clicking "next" you agree to the Self Serve Advertising Rules. + By clicking "next" you agree to the Self Serve Advertising Rules.
    %endif diff --git a/r2/r2/templates/redditfooter.html b/r2/r2/templates/redditfooter.html index 15abc67f1..3a294bad1 100644 --- a/r2/r2/templates/redditfooter.html +++ b/r2/r2/templates/redditfooter.html @@ -48,9 +48,9 @@ _("Use of this site constitutes acceptance of our " "%(user_agreement)s and %(privacy_policy)s"), nocname=True, user_agreement = dict(link_text=_("User Agreement {Genitive}"), - path="http://reddit.com/help/useragreement"), + path="http://reddit.com/wiki/useragreement"), privacy_policy = dict(link_text=_("Privacy Policy {Genitive}"), - path="http://reddit.com/help/privacypolicy"))}. + path="http://reddit.com/wiki/privacypolicy"))}. © ${_("%(year)d reddit inc. All rights reserved.") % \ dict(year=datetime.datetime.now().timetuple()[0])}

    diff --git a/r2/r2/templates/searchform.html b/r2/r2/templates/searchform.html index 9ba8a5438..b677acb68 100644 --- a/r2/r2/templates/searchform.html +++ b/r2/r2/templates/searchform.html @@ -47,10 +47,10 @@

    • e.g. reddit:aww site:imgur.com dog

    -

    ${_('see the search faq for details.')}

    +

    ${_('see the search faq for details.')}

    -

    ${_('advanced search: by author, community...')}

    +

    ${_('advanced search: by author, community...')}