github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Quarantine: Change language on interstitial page and in sidebar.

Browse Source 
Conflicts:
	r2/r2/templates/quarantineinterstitial.html
This commit is contained in:
Matt Lee
2015-08-05 10:49:23 -07:00
committed by Florence Yeun
parent 572c5b391d
commit e3c9e37050
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
r2/r2/templates/quarantineinterstitial.html
View File

@@ -24,7 +24,7 @@
from r2.lib.template_helpers import static
%>
<%namespace file="utils.html" import="submit_form, _md"/>
<%namespace file="utils.html" import="submit_form, _md, _mdf"/>
<%namespace name="utils" file="utils.html"/>
<%inherit file="interstitial.html"/>
@@ -46,10 +46,14 @@
<%def name="interstitial_message()">
<p>
<%
quarantine_link = 'https://reddit.zendesk.com/hc/en-us/articles/205701245'
%>
%if thing.can_opt_in:
${_("Communities that are dedicated to distasteful and highly offensive content are quarantined. Content in this community may be shocking or upsetting. Are you certain you want to continue?")}
${_mdf("Communities that are dedicated to shocking or highly offensive content are [quarantined](%(link)s). Content in this community may be upsetting. Are you certain you want to continue?", link=quarantine_link)}
%else:
${_("Communities that are dedicated to distasteful and highly offensive content are quarantined.")}
${_mdf("Communities that are dedicated to shocking or highly offensive content are [quarantined](%(link)s).", link=quarantine_link)}
%endif
</p>
</%def>

5
r2/r2/templates/subredditinfobar.html
View File

@@ -29,7 +29,7 @@
from r2.models.listing import ModListing
%>
<%namespace file="utils.html" import="plain_link, thing_timestamp, text_with_links, _md"/>
<%namespace file="utils.html" import="plain_link, thing_timestamp, text_with_links, _mdf"/>
<%namespace file="printablebuttons.html" import="ynbutton, state_button" />
<div class="titlebox">
@@ -40,7 +40,8 @@
%if thing.quarantine and thing.quarantine_enabled:
<div class="quarantine-notice">
<div class="md-container">
${_md("This community is quarantined because of its distasteful and highly offensive content.", wrap=True)}
${_mdf("This community is [quarantined](%(link)s) because of its shocking or highly offensive content.",
wrap=True, link='https://reddit.zendesk.com/hc/en-us/articles/205701245')}
</div>
<form method='post' action='/api/quarantine_optout'>
<input type="hidden" name="uh" value="${c.modhash}"/>