]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #3024 from wallabag/store-date
authorNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 18 Apr 2017 11:12:28 +0000 (13:12 +0200)
committerGitHub <noreply@github.com>
Tue, 18 Apr 2017 11:12:28 +0000 (13:12 +0200)
Added publication date and author

13 files changed:
1  2 
src/Wallabag/CoreBundle/Entity/Entry.php
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml

index bbb1fb53378d8eb62961aef0bb6ecc76d2bd4e46,8d385eb470b8e9174a1a58adbccfa8b43461a172..b71c467cf6ba3942812e670510cccbe00fd14b6f
@@@ -121,6 -121,24 +121,24 @@@ class Entr
       */
      private $updatedAt;
  
+     /**
+      * @var \DateTime
+      *
+      * @ORM\Column(name="published_at", type="datetime", nullable=true)
+      *
+      * @Groups({"entries_for_user", "export_all"})
+      */
+     private $publishedAt;
+     /**
+      * @var array
+      *
+      * @ORM\Column(name="published_by", type="json_array", nullable=true)
+      *
+      * @Groups({"entries_for_user", "export_all"})
+      */
+     private $publishedBy;
      /**
       * @ORM\OneToMany(targetEntity="Wallabag\AnnotationBundle\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
       * @ORM\JoinTable
       */
      private $previewPicture;
  
 -    /**
 -     * @var bool
 -     *
 -     * @ORM\Column(name="is_public", type="boolean", nullable=true, options={"default" = false})
 -     *
 -     * @Groups({"export_all"})
 -     */
 -    private $isPublic;
 -
      /**
       * @var string
       *
          $this->domainName = $domainName;
      }
  
 -    /**
 -     * @return bool
 -     */
 -    public function isPublic()
 -    {
 -        return $this->isPublic;
 -    }
 -
 -    /**
 -     * @param bool $isPublic
 -     */
 -    public function setIsPublic($isPublic)
 -    {
 -        $this->isPublic = $isPublic;
 -    }
 -
      /**
       * @return ArrayCollection<Tag>
       */
  
          return $this;
      }
+     /**
+      * @return \Datetime
+      */
+     public function getPublishedAt()
+     {
+         return $this->publishedAt;
+     }
+     /**
+      * @param \Datetime $publishedAt
+      *
+      * @return Entry
+      */
+     public function setPublishedAt(\Datetime $publishedAt)
+     {
+         $this->publishedAt = $publishedAt;
+         return $this;
+     }
+     /**
+      * @return string
+      */
+     public function getPublishedBy()
+     {
+         return $this->publishedBy;
+     }
+     /**
+      * @param string $publishedBy
+      *
+      * @return Entry
+      */
+     public function setPublishedBy($publishedBy)
+     {
+         $this->publishedBy = $publishedBy;
+         return $this;
+     }
  }
index ff89a6d1fa32ffb7e6bc1e139f1079031541ef2c,3e841a18b1529ee14891662f5036cafffe096972..72493fe39d41f09c762d5dc29f9b1b84a3ecdcb4
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Oprettelsesdato'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Gem ny artikel'
          placeholder: 'http://website.com'
          # page_title: 'Edit an entry'
          # title_label: 'Title'
          url_label: 'Url'
 -        # is_public_label: 'Public'
          save_label: 'Gem'
      public:
          # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
index 99b15b0d5925db3967b675c79bb96db752050ffd,3358b5d35224026cf64a67d25384b1d92c0a7b76..dbad8b16fabbf5edf596940aecc449fbdb70afce
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen'
          created_at: 'Erstellungsdatum'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Neuen Artikel speichern'
          placeholder: 'https://website.de'
          page_title: 'Eintrag bearbeiten'
          title_label: 'Titel'
          url_label: 'URL'
 -        is_public_label: 'Öffentlich'
          save_label: 'Speichern'
      public:
          shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
index 273ba25dabaad11c11cc0da1b9f5ec88289e5b1e,30f443504371ffc617aaa138f23bd75d56439811..7da9fe6b7cec186f73de9530596712f98ecd3544
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Creation date'
+         published_at: 'Publication date'
+         published_by: 'Published by'
      new:
          page_title: 'Save new entry'
          placeholder: 'http://website.com'
          page_title: 'Edit an entry'
          title_label: 'Title'
          url_label: 'Url'
 -        is_public_label: 'Public'
          save_label: 'Save'
      public:
          shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
index 87c6954ff6543d2d07f4ef10507cc4b195f7c1bf,363c94fb1d7a57f0270837727561484d4a080b73..6e21614e25cd7623f31f5fc54d6dfb2c5e4625fc
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones'
          created_at: 'Fecha de creación'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Guardar un nuevo artículo'
          placeholder: 'http://sitioweb.com'
          page_title: 'Editar un artículo'
          title_label: 'Título'
          url_label: 'URL'
 -        is_public_label: 'Es público'
          save_label: 'Guardar'
      public:
          shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
index caafd6d79667b593b6cb6723dd810e633f285a4f,972c2a5d5e4957646def926e134eb28faaf0b6d6..b938c80aa7ad713f4963205d6e17ec04e83996ef
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'اصلی'
          annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
          created_at: 'زمان ساخت'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'ذخیرهٔ مقالهٔ تازه'
          placeholder: 'http://website.com'
          page_title: 'ویرایش مقاله'
          title_label: 'عنوان'
          url_label: 'نشانی'
 -        is_public_label: 'عمومی'
          save_label: 'ذخیره'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
index 72366513bfcb23581c8a6b0360004ba24cafd76c,04b1eeefe65b9e1ee370bfc73b5f400aa66adaa4..9abcda45cf9ba1ceab87c99a4eb567e85a1714aa
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: "original"
          annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations"
          created_at: "Date de création"
+         published_at: "Date de publication"
+         published_by: "Publié par"
      new:
          page_title: "Sauvegarder un nouvel article"
          placeholder: "http://website.com"
          page_title: "Éditer un article"
          title_label: "Titre"
          url_label: "Adresse"
 -        is_public_label: "Public"
          save_label: "Enregistrer"
      public:
          shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
index 52f05b870caa8052d14077ad9a372e1a997e4b71,7f6787c9028cc5d79ca28b13388175ca0c3ecf68..58d0962a0bc326cc2c6fb2de08aeb1cd0786b362
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'originale'
          annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni'
          created_at: 'Data di creazione'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Salva un nuovo contenuto'
          placeholder: 'http://website.com'
          page_title: 'Modifica voce'
          title_label: 'Titolo'
          url_label: 'Url'
 -        is_public_label: 'Pubblico'
          save_label: 'Salva'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
index c8b0e7839d03eb5d32f3c7de5cef6ca4a8e93e6b,5a760b878e623c579f34db39cc332ad3a764c588..825a0efd14e862b57629c47823fc1ded816237f2
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions"
          created_at: 'Data de creacion'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Enregistrar un novèl article'
          placeholder: 'http://website.com'
          page_title: 'Modificar un article'
          title_label: 'Títol'
          url_label: 'Url'
 -        is_public_label: 'Public'
          save_label: 'Enregistrar'
      public:
          shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
index e586ea8453eb874376788c1b5dc3735370e4eb3a,b2df8a0a672050398654e6cf33b1bccfe3dd9be6..b02aa4ec491bea5a211b790890795392893a111b
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'oryginalny'
          annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji'
          created_at: 'Czas stworzenia'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Zapisz nowy wpis'
          placeholder: 'http://website.com'
          page_title: 'Edytuj wpis'
          title_label: 'Tytuł'
          url_label: 'Adres URL'
 -        is_public_label: 'Publiczny'
          save_label: 'Zapisz'
      public:
          shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
index 09ddd7f8af66492e4e47eaeaa24ffd66fe989c7a,fb8c4d2940ccdb4b8b06dfe000d71bade7039e6d..8aa7e5af87a0657e1bc92f0e15b95bc31fe2c03e
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações'
          created_at: 'Data de criação'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Salvar nova entrada'
          placeholder: 'http://website.com'
          page_title: 'Editar uma entrada'
          title_label: 'Título'
          url_label: 'Url'
 -        is_public_label: 'Público'
          save_label: 'Salvar'
      public:
          shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
index cdd0be9fa8561aedda5a0e9481cf542246b9a5de,d702159abfa5aa2e7ca9777f60e8e5686e2ebcff..ce8d8d52109c1e895de68f44461c7e179e0316ae
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'original'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Data creării'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Salvează un nou articol'
          placeholder: 'http://website.com'
          # page_title: 'Edit an entry'
          # title_label: 'Title'
          url_label: 'Url'
 -        # is_public_label: 'Public'
          save_label: 'Salvează'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
index ae05e036b5ea33f8026974e05129d369feb0042f,6525afacb1c48361a6707f0afb0a8eaafebc0523..d890360862119681ca26058b1c78f9eba0641ee3
@@@ -224,6 -224,8 +224,8 @@@ entry
          original_article: 'orijinal'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Oluşturulma tarihi'
+         # published_at: 'Publication date'
+         # published_by: 'Published by'
      new:
          page_title: 'Yeni makaleyi kaydet'
          placeholder: 'http://website.com'
          page_title: 'Makaleyi düzenle'
          title_label: 'Başlık'
          url_label: 'Url'
 -        is_public_label: 'Herkes tarafından erişime açık olsun mu?'
          save_label: 'Kaydet'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"