github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-30 01:08:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Point old wiki links to their new URLs.

Browse Source
This commit is contained in:
Ricky Ramirez
2013-02-18 23:20:17 -08:00
committed by bsimpson63
parent a5b09b4bf5
commit 9391310c6e
18 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/controllers/api.py
View File

@@ -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)

2
r2/r2/controllers/front.py
View File

@@ -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),

2
r2/r2/lib/menus.py
View File

@@ -85,7 +85,7 @@ menu = MenuHandler(hot = _('hot'),
# reddit header strings
prefs = _("preferences"),
submit = _("submit"),
help = _("help"),
wiki = _("wiki"),
blog = _("blog"),
logout = _("logout"),

12
r2/r2/lib/pages/pages.py
View File

@@ -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,

2
r2/r2/templates/feedbackblurb.html
View File

@@ -34,7 +34,7 @@
<dl>
<dt>Making a press inquiry?</dt>
<dd><a href="/help/press">Get our press contact details</a>.</dd>
<dd><a href="/wiki/press">Get our press contact details</a>.</dd>
<dt>Are your submissions not showing up? Subreddit marked as spam? Is the spam filter acting up?</dt>
<dd>
&#32;<a href="/message/compose?to=${g.admin_message_acct|u}">Send a private message to the admins.</a>&#32;(We really do want to help)

2
r2/r2/templates/frametoolbar.html
View File

@@ -102,7 +102,7 @@
</a>
%endif
<a target="_top" href="/help/toolbar">
<a target="_top" href="/wiki/toolbar">
<img src="${static('help.png')}"
width="11" height="11"
alt="${_('help')}" title="${_('help')}" />

2
r2/r2/templates/gold.html
View File

@@ -93,7 +93,7 @@
${radio_type("goldtype", "gift", _("Give reddit gold to someone else"),
"", thing.goldtype == "gift")}<br/>
${radio_type("goldtype", "creddits", _('Buy reddit gold "creddits"'),
unsafe("<a href='/help/creddits'>details</a>"),
unsafe("<a href='/wiki/creddits'>details</a>"),
thing.goldtype == "creddits")}<br/>
</%utils:round_field>
</form>

4
r2/r2/templates/messagecompose.html
View File

@@ -106,7 +106,7 @@ function admincheck(elem) {
<li>If you think your posts are being caught in the spam filter,
please write to
&#32;
<a href="http://www.reddit.com/help/faq#HowcanItellwhomoderatesagivenreddit">
<a href="http://www.reddit.com/wiki/faq#wiki_how_can_i_tell_who_moderates_a_given_reddit.3F">
the moderators of the subreddit
</a>
&#32;
@@ -120,7 +120,7 @@ function admincheck(elem) {
inquiring about, and that's actually the reason you're writing, please
message
&#32;
<a href="http://www.reddit.com/help/faq#HowcanItellwhomoderatesagivenreddit">
<a href="http://www.reddit.com/wiki/faq#wiki_how_can_i_tell_who_moderates_a_given_reddit.3F">
all of the moderators of the subreddit
</a>
&#32; (using the "message the mods" feature located at the top of the

2
r2/r2/templates/newlink.html
View File

@@ -115,7 +115,7 @@ ${thing.captcha}
target="_blank"),
good_reddiquette=dict(
link_text=_("good reddiquette"),
path="/help/reddiquette",
path="/wiki/reddiquette",
target="_blank"),
)}
</div>

2
r2/r2/templates/pagenamenav.html
View File

@@ -43,7 +43,7 @@
<%def name="help()">
<span class="hover pagename redditname">
${plain_link(thing.title, "/help", _sr_path=False)}
${plain_link(thing.title, "/wiki", _sr_path=False)}
</span>
</%def>

4
r2/r2/templates/prefoptions.html
View File

@@ -281,7 +281,7 @@
&#32;
<span class="little gray">
(
<a href="http://www.reddit.com/help/noindex">${_("details")}</a>
<a href="http://www.reddit.com/wiki/noindex">${_("details")}</a>
)
</span>
<br />
@@ -289,7 +289,7 @@
&#32;
<span class="little gray">
(
<a href="http://www.reddit.com/help/localjs">
<a href="http://www.reddit.com/wiki/localjs">
${_("details")}
</a>
)

2
r2/r2/templates/printablebuttons.html
View File

@@ -112,7 +112,7 @@
%endif
/&#32;
<a class="nonbutton" href="/help/moderation#Distinguishing">
<a class="nonbutton" href="/wiki/moderation#Distinguishing">
help
</a>
&#32;

2
r2/r2/templates/promotelinkform.html
View File

@@ -391,7 +391,7 @@ ${self.javascript_setup()}
%endif
%else:
<div class="rules">
By clicking "next" you agree to the&#32;<a href="http://www.reddit.com/help/selfservicepromotion">Self Serve Advertising Rules.</a>
By clicking "next" you agree to the&#32;<a href="http://www.reddit.com/wiki/selfservicepromotion">Self Serve Advertising Rules.</a>
</div>
%endif

4
r2/r2/templates/redditfooter.html
View File

@@ -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"))}.
&copy; ${_("%(year)d reddit inc. All rights reserved.") % \
dict(year=datetime.datetime.now().timetuple()[0])}
</p>

4
r2/r2/templates/searchform.html
View File

@@ -47,10 +47,10 @@
</dl>
<p>e.g.&#32;<code>reddit:aww site:imgur.com dog</code></p>
<p><a href="http://www.reddit.com/help/search">${_('see the search faq for details.')}</a></p>
<p><a href="http://www.reddit.com/wiki/search">${_('see the search faq for details.')}</a></p>
</div>
<p><a href="http://www.reddit.com/help/search" id="search_showmore">${_('advanced search: by author, community...')}</a></p>
<p><a href="http://www.reddit.com/wiki/search" id="search_showmore">${_('advanced search: by author, community...')}</a></p>
</%def>
<form action="${add_sr('/search')}" id="search" role="search">

2
r2/r2/templates/selfserveblurb.html
View File

@@ -86,7 +86,7 @@ from r2.lib.template_helpers import static
</div>
<div class="bottom-box-title">Start advertising today!</div>
<p><a href="/selfserviceoatmeal">A comic that explains it all.</a><br/>
Have questions? Read the&#32;<a href="/help/selfserve">FAQ</a>, or send us an&#32; <a href="mailto:selfservicesupport@reddit.com?subject=Questions about reddit advertising">email</a>.
Have questions? Read the&#32;<a href="/wiki/selfserve">FAQ</a>, or send us an&#32; <a href="mailto:selfservicesupport@reddit.com?subject=Questions about reddit advertising">email</a>.
<br/>
Interested in a bigger campaign?&#32;<a href="mailto:marketing@reddit.com?subject=campaign%20inquiry">Talk to our sales team</a>.
</p>

2
r2/r2/templates/spotlightlisting.html
View File

@@ -58,7 +58,7 @@
<p>
${text_with_links(
_("This sponsored link is an advertisement generated with our %(self_serve_advertisement_tool)s."),
self_serve_advertisement_tool=dict(link_text=_("self-serve advertisement tool"), path="http://www.reddit.com/help/selfservicepromotion")
self_serve_advertisement_tool=dict(link_text=_("self-serve advertisement tool"), path="http://www.reddit.com/wiki/selfservicepromotion")
)}
</p>
<p>

4
r2/r2/templates/userawards.html
View File

@@ -25,7 +25,7 @@
<h1>${heading}</h1>
%for award in awards:
<div class="award-square mini">
<a href="/help/awards/#${award.codename}">
<a href="/wiki/awards/#${award.codename}">
<img src="${award.imgurl % 70}" />
<br/>
<span class="award-name mini">${award.title}</span>
@@ -44,7 +44,7 @@
%for award, winner, trophy in thing.regular_winners:
<div class="award-square">
<a href="/help/awards/#${award.codename}">
<a href="/wiki/awards/#${award.codename}">
<img src="${award.imgurl % 70}" />
<span class="award-name">${award.title}</span>
</a>