diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py index dcf7f8795..cbe8875be 100644 --- a/r2/r2/lib/strings.py +++ b/r2/r2/lib/strings.py @@ -122,7 +122,7 @@ string_dict = dict( (in the middle of the toolbar, to the right of the comments button). """), - submit_link = _("""You are submitting a link. The key to a successful submission is interesting content and a deceptive title."""), + submit_link = _("""You are submitting a link. The key to a successful submission is interesting content and a descriptive title."""), submit_text = _("""You are submitting a text-based post. Speak your mind. A title is required, but expanding further in the text field is not. Beginning your title with "vote up if" is violation of intergalactic law."""), ) diff --git a/r2/r2/templates/linkcompressed.html b/r2/r2/templates/linkcompressed.html index a07de43eb..c4d278b42 100644 --- a/r2/r2/templates/linkcompressed.html +++ b/r2/r2/templates/linkcompressed.html @@ -26,10 +26,6 @@ <%def name="domain()"> - <% from r2.models import FakeSubreddit, Default %> - %if isinstance(c.site, FakeSubreddit) and thing.subreddit.name != "reddit.com": - [${unsafe(self.subreddit())}] - %endif (${thing.domain}) @@ -46,15 +42,19 @@ <%def name="tagline()"> <% if thing.hide_score: - taglinetext = _("posted %(when)s ago by %(author)s") + taglinetext = _("submitted %(when)s ago by %(author)s") else: - taglinetext = _("%(points)s posted %(when)s ago by %(author)s") + taglinetext = _("%(points)s submitted %(when)s ago by %(author)s") taglinetext = taglinetext.replace(" ", " ") %> ${unsafe(taglinetext % dict(points = capture(self.score, thing, likes=thing.likes), when = thing.timesince, author= self.author(friend = thing.friend)))} + <% from r2.models import FakeSubreddit, Default %> + %if isinstance(c.site, FakeSubreddit): + ${unsafe( _( "to %(reddit)s") % dict(reddit=" " + self.subreddit())) } + %endif