From 98f0929f168a336079456f65b6ca41e84b22efff Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Sep 2015 22:37:27 +0200 Subject: Handle entry in language Fix #1333 --- src/Wallabag/CoreBundle/Entity/Entry.php | 31 +++++++++++++++++++++++++++++++ src/Wallabag/CoreBundle/Entity/User.php | 5 ++--- 2 files changed, 33 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Entity') diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index e684c9b1..7108889e 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -94,6 +94,13 @@ class Entry */ private $mimetype; + /** + * @var string + * + * @ORM\Column(name="language", type="text", nullable=true) + */ + private $language; + /** * @var int * @@ -450,4 +457,28 @@ class Entry { return $this->previewPicture; } + + /** + * Set language. + * + * @param string $language + * + * @return Entry + */ + public function setLanguage($language) + { + $this->language = $language; + + return $this; + } + + /** + * Get language. + * + * @return string + */ + public function getLanguage() + { + return $this->language; + } } diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index eeae331e..a6002352 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php @@ -7,7 +7,6 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\AdvancedUserInterface; -use Symfony\Component\Validator\Constraints as Assert; use JMS\Serializer\Annotation\ExclusionPolicy; use JMS\Serializer\Annotation\Expose; use FOS\UserBundle\Model\User as BaseUser; @@ -74,8 +73,8 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable public function __construct() { parent::__construct(); - $this->entries = new ArrayCollection(); - $this->tags = new ArrayCollection(); + $this->entries = new ArrayCollection(); + $this->tags = new ArrayCollection(); } /** -- cgit v1.2.3