Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur:
  Truncating feed title in trainer dialog.
  Adding French review to press page.
This commit is contained in:
Samuel Clay 2012-05-02 15:59:20 -07:00
commit 049d75c16d
2 changed files with 9 additions and 1 deletions

View file

@ -559,7 +559,7 @@ var classifier_prototype = {
},
make_publisher: function(publisher) {
var $publisher = this.make_classifier(publisher.feed_title, this.feed_id, 'feed');
var $publisher = this.make_classifier(_.truncate(publisher.feed_title, 50), this.feed_id, 'feed');
return $publisher;
},

View file

@ -84,6 +84,14 @@
<span class="NB-press-author">Robin Good</span>,
<span class="NB-press-date">April 21, 2012</span>
</li>
<li>
<a href="http://linuxfr.org/news/newsblur-la-fusion-du-contenu-et-du-contexte">NewsBlur, la fusion du contenu et du contexte</a>
<span class="NB-press-publisher">
<img src="http://linuxfr.org/favicon.ico">
LinuxFr.org</span>,
<span class="NB-press-author">Aissen</span>,
<span class="NB-press-date">May 2, 2012</span>
</li>
<li>
<a href="http://www.girlsync.fr/2012/04/25/newsblur-mon-alternative-a-google-reader/">NewsBlur, mon alternative à Google Reader</a>
<span class="NB-press-publisher">