From 23a4cdc9653100ddea0314098cca174278cd78df Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Fri, 14 Jun 2013 03:01:41 -0700 Subject: [PATCH] Add auto description attribution to copied multireddits. --- r2/r2/lib/strings.py | 1 + r2/r2/public/static/js/multi.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py index 70f52d4c1..ee0d824a1 100644 --- a/r2/r2/lib/strings.py +++ b/r2/r2/lib/strings.py @@ -217,6 +217,7 @@ Note: there are a couple of places outside of your subreddit where someone can c awesomeness_goes_here = _('awesomeness goes here'), add_multi_sr = _('add a subreddit to your multi.'), open_multi = _('open this multi'), + copied_from = _('copied from %(source)s'), ) class StringHandler(object): diff --git a/r2/r2/public/static/js/multi.js b/r2/r2/public/static/js/multi.js index 310af481f..8a8c83c8a 100644 --- a/r2/r2/public/static/js/multi.js +++ b/r2/r2/public/static/js/multi.js @@ -148,6 +148,10 @@ r.multi.MultiReddit = Backbone.Model.extend({ var attrs = _.clone(this.attributes) delete attrs.path attrs.visibility = 'private' + attrs.description_md = this.get('description_md') + '\n\n' + r.strings('copied_from', { + // ensure that linking happens (currently /user/foo is not autolinked) + source: '[' + this.get('path') + '](' + this.get('path') + ')' + }) newMulti.set(attrs) return newMulti }