diff options
| author | 2013-05-05 13:29:31 +0200 | |
|---|---|---|
| committer | 2013-05-05 13:29:31 +0200 | |
| commit | 51e9a7abe10b312a6887c75c5a9d51812d356cb4 (patch) | |
| tree | 27208483aac8262cdc42ee492a0f222991a0b4fa /app/controllers/apiController.php | |
| parent | 044908439bdd7280f7539e12441d7dfa6c4d4c63 (diff) | |
| parent | d4e6176a1ae210c011b14839023f91b4014f2881 (diff) | |
Merge branch 'releases' into hotfixes
Diffstat (limited to 'app/controllers/apiController.php')
| -rwxr-xr-x | app/controllers/apiController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/apiController.php b/app/controllers/apiController.php index bc08386b5..025908f3e 100755 --- a/app/controllers/apiController.php +++ b/app/controllers/apiController.php @@ -20,11 +20,11 @@ class apiController extends ActionController { $notes = $e->notes (); if ($notes == '') { $feed = $e->feed (true); - $notes = 'Article publiƩ initialement sur <a href="' . $feed->website () . '">' . $feed->name () . '</a>'; if($author != '') { - $notes .= ' par ' . $author; + $notes = Translate::t ('article_published_on_author', $feed->website (), $feed->name (), $author); + } else { + $notes = Translate::t ('article_published_on', $feed->website (), $feed->name ()); } - $notes .= ', mis en favoris dans <a href="https://github.com/marienfressinaud/FreshRSS">FreshRSS</a>'; } $id = $e->id (); |
