diff options
| -rw-r--r-- | l10n/fr.js | 1 | ||||
| -rw-r--r-- | l10n/fr.json | 1 | ||||
| -rw-r--r-- | lib/Db/Item.php | 10 | ||||
| -rw-r--r-- | templates/part.content.php | 10 |
4 files changed, 19 insertions, 3 deletions
diff --git a/l10n/fr.js b/l10n/fr.js index 3f3922294..06682e787 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -38,6 +38,7 @@ OC.L10N.register( "Remove keep article unread" : "Marquer l'article comme lu", "by" : "par", "from" : "de", + "shared from": "partagé par", "Play audio" : "Ecouter", "Download audio" : "Télécharger le son", "Download video" : "Télécharger la vidéo", diff --git a/l10n/fr.json b/l10n/fr.json index 25bbdbed8..4ab10bb92 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -36,6 +36,7 @@ "Remove keep article unread" : "Marquer l'article comme lu", "by" : "par", "from" : "de", + "shared from" : "partagé par", "Play audio" : "Ecouter", "Download audio" : "Télécharger le son", "Download video" : "Télécharger la vidéo", diff --git a/lib/Db/Item.php b/lib/Db/Item.php index 6b2b668b2..2a2629d3d 100644 --- a/lib/Db/Item.php +++ b/lib/Db/Item.php @@ -290,6 +290,11 @@ class Item extends Entity implements IAPI, \JsonSerializable return $this->starred; } + public function isShared(): bool + { + return $this->getSharedBy == '' && $this->getSharedWith == ''; + } + public function isUnread(): bool { return $this->unread; @@ -347,7 +352,10 @@ class Item extends Entity implements IAPI, \JsonSerializable 'rtl' => $this->getRtl(), 'intro' => $this->getIntro(), 'fingerprint' => $this->getFingerprint(), - 'categories' => $this->getCategories() + 'categories' => $this->getCategories(), + 'sharedBy' => $this->getSharedBy(), + 'sharedWith' => $this->getSharedWith(), + 'isShared' => $this->isShared() ]; } diff --git a/templates/part.content.php b/templates/part.content.php index 9ce6ae10e..8ea8b168f 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -122,12 +122,18 @@ <span class="author" ng-show="item.author"> <?php p($l->t('by')) ?> {{ ::item.author }} </span> - <span class="source"><?php p($l->t('from')) ?> - <a ng-href="#/items/feeds/{{ ::item.feedId }}/"> + <span ng-if="item.sharedBy == ''" class="source"><?php p($l->t('from')) ?> + <a ng-href="#/items/feeds/{{ item.feedId }}/"> {{ ::Content.getFeed(item.feedId).title }} <img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon"> </a> </span> + <span ng-if="item.sharedBy != ''" class="source"><?php p($l->t('shared from')) ?> + <a ng-href="#/items/feeds/{{ item.feedId }}/"> + {{ :: item.sharedBy}} + <img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon"> + </a> + </span> </div> <div class="enclosure" ng-if="Content.getMediaType(item.enclosureMime) == 'audio'"> |