From 8a3be16acebe3583a2a092dbc57e321fabf4e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Wed, 24 Jun 2015 13:49:02 +0200 Subject: [PATCH 01/90] CS-5779 - Scrolling in playlist is not working for the second playlist if playlists are so long --- .../public/js/playlists/controllers/playlists.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js index 75014be0cc..8cf8667cf9 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js @@ -310,9 +310,13 @@ angular.module('playlistsApp').controller('PlaylistsController', [ */ $scope.setPlaylistInfoOnChange = function (list) { $scope.loadingSpinner = true; + scrollTop(); Playlist.getArticlesByListId(list).then(function (data) { $scope.featuredArticles = data.items; $scope.loadingSpinner = false; + + $scope.isEmpty = false; + $scope.page = 2; $activityIndicator.stopAnimating(); }, function(response) { flashMessage(Translator.trans('Could not refresh the list', {}, 'articles'), 'error'); @@ -325,7 +329,6 @@ angular.module('playlistsApp').controller('PlaylistsController', [ $scope.playlistInfo = list; $scope.playlist.selected.oldLimit = list.maxItems; $scope.formData = {title: list.title} - $scope.page = 2; $scope.isRunning = false; }; @@ -522,6 +525,7 @@ angular.module('playlistsApp').controller('PlaylistsController', [ Playlist.clearLogList(); flashMessage(Translator.trans('List saved', {}, 'articles')); $scope.loadingSpinner = true; + scrollTop(); Playlist.getArticlesByListId({id: Playlist.getListId(), maxItems: $scope.playlist.selected.maxItems}).then(function (data) { $scope.featuredArticles = data.items; $scope.loadingSpinner = false; @@ -565,4 +569,12 @@ angular.module('playlistsApp').controller('PlaylistsController', [ $scope.processing = false; } + + /** + * Scrolls the featured list articles to the top. + */ + var scrollTop = function () { + var el = angular.element('ul#context_list'); + el.scrollTop(0); + } }]); \ No newline at end of file From 7b8f51c154a45509c72ffb582f5676f21acbf33f Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Wed, 24 Jun 2015 15:38:20 +0200 Subject: [PATCH 02/90] Adds check if article to be deleted actually exists --- .../Repository/PlaylistArticleRepository.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php b/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php index c76f63dc90..349d04d930 100644 --- a/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php @@ -50,14 +50,14 @@ public function deleteArticle($articleId, $languageId) 'articleLanguage' => $languageId, )); - try { - $em->remove($article); - $em->getConnection()->commit(); - } catch (\Exception $e) { - $em->getConnection()->rollback(); - $em->close(); - - return $e; + if (!is_null($article)) { + try { + $em->remove($article); + $em->getConnection()->commit(); + } catch (\Exception $e) { + $em->getConnection()->rollback(); + $em->close(); + } } return $article; From 639dd39bd549399f817be212c8cb9e01bde22aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Wed, 24 Jun 2015 15:46:40 +0200 Subject: [PATCH 03/90] fixed articles ordering --- .../upgrade/4.4.x/2015.03.19/init_order_in_playlists.php | 8 ++++++++ .../sql/upgrade/4.4.x/2015.06.03/data-required.sql | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/data-required.sql diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php index d31290e2e2..653ac6d5c2 100644 --- a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php @@ -68,6 +68,14 @@ $logger = $app['monolog']; +try { + $app['db']->query('ALTER TABLE playlist_article DROP INDEX id_playlist'); + $app['db']->query('ALTER TABLE `playlist_article` ADD KEY `IDX_BD05197C8759FDB8` (`id_playlist`), ADD KEY `IDX_BD05197CAA07C9D3813385DE` (`article_no`,`article_language`)'); + $app['db']->query('UPDATE `playlist_article` AS pa LEFT JOIN Articles AS a ON pa.`article_no` = a.`Number` SET pa.`article_language` = a.`IdLanguage`'); +} catch (\Exception $e) { + // ignore when already exist +} + try { $playlists = $app['orm.em']->getRepository('\Newscoop\Entity\Playlist') ->findAll(); diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/data-required.sql deleted file mode 100644 index 77d3b76720..0000000000 --- a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/data-required.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE playlist_article DROP INDEX id_playlist; -ALTER TABLE `playlist_article` ADD `article_language` INT(11) NOT NULL; -ALTER TABLE `playlist_article` ADD KEY `IDX_BD05197C8759FDB8` (`id_playlist`), ADD KEY `IDX_BD05197CAA07C9D3813385DE` (`article_no`,`article_language`); -UPDATE `playlist_article` AS pa LEFT JOIN Articles AS a ON pa.`article_no` = a.`Number` SET pa.`article_language` = a.`IdLanguage`; \ No newline at end of file From 26e5a3f1123167ce3c43b660c21658965328dd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Wed, 24 Jun 2015 15:59:03 +0200 Subject: [PATCH 04/90] replaced sql script with silex script --- .../4.4.x/2015.06.03/playlist_article.php | 28 +++++++++++++++++++ .../sql/upgrade/4.4.x/2015.06.03/tables.sql | 1 + 2 files changed, 29 insertions(+) create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/tables.sql diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php new file mode 100644 index 0000000000..3280cd979f --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php @@ -0,0 +1,28 @@ +register(new Silex\Provider\DoctrineServiceProvider(), array( + 'db.options' => array( + 'driver' => 'pdo_mysql', + 'host' => $Campsite['db']['host'], + 'dbname' => $Campsite['db']['name'], + 'user' => $Campsite['db']['user'], + 'password' => $Campsite['db']['pass'], + 'port' => $Campsite['db']['port'], + 'charset' => 'utf8', + ), +)); + +try { + $app['db']->query('ALTER TABLE playlist_article DROP INDEX id_playlist'); + $app['db']->query('ALTER TABLE `playlist_article` ADD KEY `IDX_BD05197C8759FDB8` (`id_playlist`), ADD KEY `IDX_BD05197CAA07C9D3813385DE` (`article_no`,`article_language`)'); + $app['db']->query('UPDATE `playlist_article` AS pa LEFT JOIN Articles AS a ON pa.`article_no` = a.`Number` SET pa.`article_language` = a.`IdLanguage`'); +} catch (\Exception $e) { + // ignore when already exist +} diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/tables.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/tables.sql new file mode 100644 index 0000000000..8bc18c3eda --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/tables.sql @@ -0,0 +1 @@ +system php ./playlist_article.php From 4a35ecd6dbe58ef4713a2043c56c95ac47b1928d Mon Sep 17 00:00:00 2001 From: Mark Lewis Date: Wed, 24 Jun 2015 19:30:04 +0200 Subject: [PATCH 05/90] AENV-504: make inputfields for width and height for vimeo/youtube snippets mandatory updated metadata in campsite_core and upgrades sql --- .../install/Resources/sql/campsite_core.sql | 65 ++++++++++++++++- .../4.4.x/2015.06.24/data-required.sql | 71 +++++++++++++++++++ .../sql/upgrade/4.4.x/2015.06.24/tables.sql | 23 ++++++ 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/data-required.sql create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/tables.sql diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql index 9868a617b2..4d04c4e659 100644 --- a/newscoop/install/Resources/sql/campsite_core.sql +++ b/newscoop/install/Resources/sql/campsite_core.sql @@ -3389,6 +3389,16 @@ CREATE TABLE SnippetTemplates ( ALTER TABLE Snippets ADD CONSTRAINT SnippetTemplate FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id); +LOCK TABLES `SnippetTemplates` WRITE; +INSERT INTO `SnippetTemplates` (`Id`, `Name`, `Controller`, `TemplateCode`, `Favourite`, `Enabled`, `IconInactive`, `IconActive`, `Created`, `Modified`) +VALUES + (1, 'Embed.ly', 'Newscoop\\NewscoopBundle\\Controller\\EmbedlyController', '{{ title }}', 0, 1, NULL, NULL, '2014-05-12 13:19:43', '2014-05-12 13:19:43'), + (2, 'Youtube', NULL, '', 1, 1, NULL, NULL, '0000-00-00 00:00:00', '0000-00-00 00:00:00'), + (3, 'Vimeo', NULL, '', 1, 1, NULL, NULL, '0000-00-00 00:00:00', '0000-00-00 00:00:00'), + (4, 'Generic', NULL, '{{Generic | raw}}', 0, 1, NULL, NULL, '2014-06-10 14:15:49', '2014-06-10 14:15:49'); + +UNLOCK TABLES; + DROP TABLE IF EXISTS `SnippetTemplateField`; CREATE TABLE SnippetTemplateField ( @@ -3404,6 +3414,35 @@ CREATE TABLE SnippetTemplateField ( ALTER TABLE SnippetTemplateField ADD CONSTRAINT FK_2060662F846113F FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id); +LOCK TABLES `SnippetTemplateField` WRITE; +INSERT INTO `SnippetTemplateField` (`Id`, `Name`, `Type`, `Scope`, `Required`, `TemplateId`) +VALUES + (1, 'URL', 'url', 'frontend', 1, 1), + (2, 'Endpoint', 'text', 'frontend', 0, 1), + (3, 'maxwidth', 'integer', 'frontend', 0, 1), + (4, 'provider_url', 'url', 'backend', 0, 1), + (5, 'description', 'textarea', 'backend', 0, 1), + (6, 'title', 'text', 'backend', 0, 1), + (7, 'type', 'text', 'backend', 0, 1), + (8, 'thumbnail_width', 'integer', 'backend', 0, 1), + (9, 'height', 'integer', 'backend', 0, 1), + (10, 'width', 'integer', 'backend', 0, 1), + (11, 'html', 'textarea', 'backend', 0, 1), + (12, 'author_name', 'text', 'backend', 0, 1), + (13, 'version', 'text', 'backend', 0, 1), + (14, 'provider_name', 'text', 'backend', 0, 1), + (15, 'thumbnail_url', 'url', 'backend', 0, 1), + (16, 'thumbnail_height', 'integer', 'backend', 0, 1), + (17, 'author_url', 'url', 'backend', 0, 1), + (18, 'ID', 'text', 'frontend', 1, 2), + (19, 'width', 'integer', 'frontend', 1, 2), + (20, 'height', 'integer', 'frontend', 1, 2), + (21, 'ID', 'text', 'frontend', 1, 3), + (22, 'width', 'integer', 'frontend', 1, 3), + (23, 'height', 'integer', 'frontend', 1, 3), + (24, 'Generic', 'textarea', 'frontend', 1, 4); +UNLOCK TABLES; + DROP TABLE IF EXISTS `SnippetFields`; CREATE TABLE SnippetFields ( @@ -3420,11 +3459,33 @@ CREATE TABLE SnippetFields ( ALTER TABLE SnippetFields ADD CONSTRAINT FK_1F835121B00DA91C FOREIGN KEY (SnippetId) REFERENCES Snippets (Id); ALTER TABLE SnippetFields ADD CONSTRAINT FK_1F835121EBCA9337 FOREIGN KEY (TemplateFieldId) REFERENCES SnippetTemplateField (Id); +LOCK TABLES `SnippetFields` WRITE; +INSERT INTO `SnippetFields` (`Id`, `Data`, `SnippetId`, `TemplateFieldId`, `Name`) +VALUES + (1, 'https://www.youtube.com/watch?v=AYVUPem_jaM', 1, 1, 'URL'), + (2, NULL, 1, 2, 'Endpoint'), + (3, '0', 1, 3, 'maxwidth'), + (4, 'http://www.youtube.com/', 1, 4, 'provider_url'), + (5, 'Sourcefabric builds open source software to support independent media worldwide. On February 14th, we\'ll announce our tool to help people and organisations write and publish great multi-platform books. Write and publish great books ready for iPad, Kindle, Nook or print within minutes.', 1, 5, 'description'), + (6, 'The future of the book is in your hands', 1, 6, 'title'), + (7, 'video', 1, 7, 'type'), + (8, '480', 1, 8, 'thumbnail_width'), + (9, '309', 1, 9, 'height'), + (10, '550', 1, 10, 'width'), + (11, '', 1, 11, 'html'), + (12, 'Sourcefabric', 1, 12, 'author_name'), + (13, '1.0', 1, 13, 'version'), + (14, 'YouTube', 1, 14, 'provider_name'), + (15, 'http://i1.ytimg.com/vi/AYVUPem_jaM/hqdefault.jpg', 1, 15, 'thumbnail_url'), + (16, '360', 1, 16, 'thumbnail_height'), + (17, 'http://www.youtube.com/user/Sourcefabric', 1, 17, 'author_url'); +UNLOCK TABLES; + DROP TABLE IF EXISTS `ArticleSnippets`; CREATE TABLE ArticleSnippets ( - ArticleId INT NOT NULL, - SnippetId INT NOT NULL, + ArticleNr int(11) NOT NULL, + SnippetId int(11) NOT NULL, INDEX IDX_5080CDE7C53224D (ArticleId), INDEX IDX_5080CDEB00DA91C (SnippetId), PRIMARY KEY(ArticleId, SnippetId) diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/data-required.sql new file mode 100644 index 0000000000..b5cb67be94 --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/data-required.sql @@ -0,0 +1,71 @@ +INSERT INTO `SnippetTemplates` (`Id`, `Name`, `Controller`, `TemplateCode`, `Favourite`, `Enabled`, `IconInactive`, `IconActive`, `Created`, `Modified`) +VALUES + (1, 'Embed.ly', 'Newscoop\\NewscoopBundle\\Controller\\EmbedlyController', '{{ title }}', 0, 1, NULL, NULL, '2014-05-12 13:19:43', '2014-05-12 13:19:43'); + +INSERT INTO `SnippetTemplateField` (`Id`, `Name`, `Type`, `Scope`, `Required`, `TemplateId`) +VALUES + (1, 'URL', 'url', 'frontend', 1, 1), + (2, 'Endpoint', 'text', 'frontend', 0, 1), + (3, 'maxwidth', 'integer', 'frontend', 0, 1), + (4, 'provider_url', 'url', 'backend', 0, 1), + (5, 'description', 'textarea', 'backend', 0, 1), + (6, 'title', 'text', 'backend', 0, 1), + (7, 'type', 'text', 'backend', 0, 1), + (8, 'thumbnail_width', 'integer', 'backend', 0, 1), + (9, 'height', 'integer', 'backend', 0, 1), + (10, 'width', 'integer', 'backend', 0, 1), + (11, 'html', 'textarea', 'backend', 0, 1), + (12, 'author_name', 'text', 'backend', 0, 1), + (13, 'version', 'text', 'backend', 0, 1), + (14, 'provider_name', 'text', 'backend', 0, 1), + (15, 'thumbnail_url', 'url', 'backend', 0, 1), + (16, 'thumbnail_height', 'integer', 'backend', 0, 1), + (17, 'author_url', 'url', 'backend', 0, 1); +INSERT INTO `SnippetTemplates` (`Id`, `Name`, `Controller`, `TemplateCode`, `Favourite`, `Enabled`, `IconInactive`, `IconActive`, `Created`, `Modified`) +VALUES + (2, 'Youtube', NULL, '', 1, 1, NULL, NULL, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); + +INSERT INTO `SnippetTemplateField` (`Id`, `Name`, `Type`, `Scope`, `TemplateId`, `Required`) +VALUES + (18, 'ID', 'text', 'frontend', 2, 1), + (19, 'width', 'integer', 'frontend', 2, 1), + (20, 'height', 'integer', 'frontend', 2, 1); +INSERT INTO `SnippetTemplates` (`Id`, `Name`, `Controller`, `TemplateCode`, `Favourite`, `Enabled`, `IconInactive`, `IconActive`, `Created`, `Modified`) +VALUES + (3, 'Vimeo', NULL, '', 1, 1, NULL, NULL, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); + +INSERT INTO `SnippetTemplateField` (`Id`, `Name`, `Type`, `Scope`, `TemplateId`, `Required`) +VALUES + (21, 'ID', 'text', 'frontend', 3, 1), + (22, 'width', 'integer', 'frontend', 3, 1), + (23, 'height', 'integer', 'frontend', 3, 1); +INSERT INTO `SnippetTemplates` (`Id`, `Name`, `Controller`, `TemplateCode`, `Favourite`, `Enabled`, `IconInactive`, `IconActive`, `Created`, `Modified`) +VALUES + (4, 'Generic', NULL, '{{Generic | raw}}', 0, 1, NULL, NULL, '2014-06-10 14:15:49', '2014-06-10 14:15:49'); + +INSERT INTO `SnippetTemplateField` (`Id`, `Name`, `Type`, `Scope`, `TemplateId`, `Required`) +VALUES + (24, 'Generic', 'textarea', 'frontend', 4, 1); +INSERT INTO `Snippets` (`Id`, `Name`, `Enabled`, `Created`, `Modified`, `TemplateId`) +VALUES + (1, 'Youtube Sourcefabric Booktype Video', 1, '2014-06-10 13:15:10', '2014-06-10 13:15:12', 1); + +INSERT INTO `SnippetFields` (`Id`, `Data`, `SnippetId`, `TemplateFieldId`, `Name`) +VALUES + (1, 'https://www.youtube.com/watch?v=AYVUPem_jaM', 1, 1, 'URL'), + (2, NULL, 1, 2, 'Endpoint'), + (3, '0', 1, 3, 'maxwidth'), + (4, 'http://www.youtube.com/', 1, 4, 'provider_url'), + (5, 'Sourcefabric builds open source software to support independent media worldwide. On February 14th, we\'ll announce our tool to help people and organisations write and publish great multi-platform books. Write and publish great books ready for iPad, Kindle, Nook or print within minutes.', 1, 5, 'description'), + (6, 'The future of the book is in your hands', 1, 6, 'title'), + (7, 'video', 1, 7, 'type'), + (8, '480', 1, 8, 'thumbnail_width'), + (9, '309', 1, 9, 'height'), + (10, '550', 1, 10, 'width'), + (11, '', 1, 11, 'html'), + (12, 'Sourcefabric', 1, 12, 'author_name'), + (13, '1.0', 1, 13, 'version'), + (14, 'YouTube', 1, 14, 'provider_name'), + (15, 'http://i1.ytimg.com/vi/AYVUPem_jaM/hqdefault.jpg', 1, 15, 'thumbnail_url'), + (16, '360', 1, 16, 'thumbnail_height'), + (17, 'http://www.youtube.com/user/Sourcefabric', 1, 17, 'author_url'); diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/tables.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/tables.sql new file mode 100644 index 0000000000..11bc6f6882 --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.24/tables.sql @@ -0,0 +1,23 @@ +SET FOREIGN_KEY_CHECKS=0; + +DROP TABLE IF EXISTS `ArticleSnippets`; +CREATE TABLE `ArticleSnippets` (`ArticleNr` int(11) NOT NULL, `SnippetId` int(11) NOT NULL, KEY `FK_5080CDEB00DA91C` (`SnippetId`), CONSTRAINT `FK_5080CDEB00DA91C` FOREIGN KEY (`SnippetId`) REFERENCES `Snippets` (`Id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +DROP TABLE IF EXISTS `Snippets`; +CREATE TABLE `Snippets` (Id INT AUTO_INCREMENT NOT NULL, Name VARCHAR(255) NOT NULL, Enabled TINYINT(1) NOT NULL, Created DATETIME NOT NULL, Modified DATETIME NOT NULL, TemplateId INT DEFAULT NULL, INDEX IDX_1457978AF846113F (TemplateId), PRIMARY KEY(Id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; + +DROP TABLE IF EXISTS `SnippetTemplates`; +CREATE TABLE `SnippetTemplates` (Id INT AUTO_INCREMENT NOT NULL, Name VARCHAR(255) NOT NULL, Controller VARCHAR(255) DEFAULT NULL, TemplateCode LONGTEXT NOT NULL, Favourite TINYINT(1) DEFAULT NULL, Enabled TINYINT(1) NOT NULL, IconInactive LONGTEXT DEFAULT NULL, IconActive LONGTEXT DEFAULT NULL, Created DATETIME NOT NULL, Modified DATETIME NOT NULL, PRIMARY KEY(Id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; + +DROP TABLE IF EXISTS `SnippetTemplateField`; +CREATE TABLE `SnippetTemplateField` (Id INT AUTO_INCREMENT NOT NULL, Name VARCHAR(255) NOT NULL, Type VARCHAR(255) NOT NULL, Scope VARCHAR(255) NOT NULL, Required TINYINT(1) NOT NULL, TemplateId INT NOT NULL, INDEX IDX_2060662F846113F (TemplateId), PRIMARY KEY(Id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; + +DROP TABLE IF EXISTS `SnippetFields`; +CREATE TABLE `SnippetFields` (Id INT AUTO_INCREMENT NOT NULL, Data LONGTEXT DEFAULT NULL, Name VARCHAR(255) NOT NULL, SnippetId INT NOT NULL, TemplateFieldId INT NOT NULL, INDEX IDX_1F835121B00DA91C (SnippetId), INDEX IDX_1F835121EBCA9337 (TemplateFieldId), PRIMARY KEY(Id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; + +ALTER TABLE SnippetTemplateField ADD CONSTRAINT FK_2060662F846113F FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id); +ALTER TABLE SnippetFields ADD CONSTRAINT FK_1F835121B00DA91C FOREIGN KEY (SnippetId) REFERENCES Snippets (Id); +ALTER TABLE SnippetFields ADD CONSTRAINT FK_1F835121EBCA9337 FOREIGN KEY (TemplateFieldId) REFERENCES SnippetTemplateField (Id); +ALTER TABLE Snippets ADD CONSTRAINT FK_1457978AF846113F FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id); + +SET FOREIGN_KEY_CHECKS=1; From 3669df6a1065bd4e635a531a811a3156da9be52a Mon Sep 17 00:00:00 2001 From: Mark Lewis Date: Wed, 24 Jun 2015 19:32:54 +0200 Subject: [PATCH 06/90] fix spacing --- .../install/Resources/sql/campsite_core.sql | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql index 4d04c4e659..801a3f8910 100644 --- a/newscoop/install/Resources/sql/campsite_core.sql +++ b/newscoop/install/Resources/sql/campsite_core.sql @@ -3434,13 +3434,13 @@ VALUES (15, 'thumbnail_url', 'url', 'backend', 0, 1), (16, 'thumbnail_height', 'integer', 'backend', 0, 1), (17, 'author_url', 'url', 'backend', 0, 1), - (18, 'ID', 'text', 'frontend', 1, 2), - (19, 'width', 'integer', 'frontend', 1, 2), - (20, 'height', 'integer', 'frontend', 1, 2), - (21, 'ID', 'text', 'frontend', 1, 3), - (22, 'width', 'integer', 'frontend', 1, 3), - (23, 'height', 'integer', 'frontend', 1, 3), - (24, 'Generic', 'textarea', 'frontend', 1, 4); + (18, 'ID', 'text', 'frontend', 1, 2), + (19, 'width', 'integer', 'frontend', 1, 2), + (20, 'height', 'integer', 'frontend', 1, 2), + (21, 'ID', 'text', 'frontend', 1, 3), + (22, 'width', 'integer', 'frontend', 1, 3), + (23, 'height', 'integer', 'frontend', 1, 3), + (24, 'Generic', 'textarea', 'frontend', 1, 4); UNLOCK TABLES; DROP TABLE IF EXISTS `SnippetFields`; @@ -3462,23 +3462,23 @@ ALTER TABLE SnippetFields ADD CONSTRAINT FK_1F835121EBCA9337 FOREIGN KEY (Templa LOCK TABLES `SnippetFields` WRITE; INSERT INTO `SnippetFields` (`Id`, `Data`, `SnippetId`, `TemplateFieldId`, `Name`) VALUES - (1, 'https://www.youtube.com/watch?v=AYVUPem_jaM', 1, 1, 'URL'), + (1, 'https://www.youtube.com/watch?v=AYVUPem_jaM', 1, 1, 'URL'), (2, NULL, 1, 2, 'Endpoint'), - (3, '0', 1, 3, 'maxwidth'), - (4, 'http://www.youtube.com/', 1, 4, 'provider_url'), - (5, 'Sourcefabric builds open source software to support independent media worldwide. On February 14th, we\'ll announce our tool to help people and organisations write and publish great multi-platform books. Write and publish great books ready for iPad, Kindle, Nook or print within minutes.', 1, 5, 'description'), - (6, 'The future of the book is in your hands', 1, 6, 'title'), - (7, 'video', 1, 7, 'type'), - (8, '480', 1, 8, 'thumbnail_width'), - (9, '309', 1, 9, 'height'), - (10, '550', 1, 10, 'width'), - (11, '', 1, 11, 'html'), - (12, 'Sourcefabric', 1, 12, 'author_name'), - (13, '1.0', 1, 13, 'version'), - (14, 'YouTube', 1, 14, 'provider_name'), - (15, 'http://i1.ytimg.com/vi/AYVUPem_jaM/hqdefault.jpg', 1, 15, 'thumbnail_url'), - (16, '360', 1, 16, 'thumbnail_height'), - (17, 'http://www.youtube.com/user/Sourcefabric', 1, 17, 'author_url'); + (3, '0', 1, 3, 'maxwidth'), + (4, 'http://www.youtube.com/', 1, 4, 'provider_url'), + (5, 'Sourcefabric builds open source software to support independent media worldwide. On February 14th, we\'ll announce our tool to help people and organisations write and publish great multi-platform books. Write and publish great books ready for iPad, Kindle, Nook or print within minutes.', 1, 5, 'description'), + (6, 'The future of the book is in your hands', 1, 6, 'title'), + (7, 'video', 1, 7, 'type'), + (8, '480', 1, 8, 'thumbnail_width'), + (9, '309', 1, 9, 'height'), + (10, '550', 1, 10, 'width'), + (11, '', 1, 11, 'html'), + (12, 'Sourcefabric', 1, 12, 'author_name'), + (13, '1.0', 1, 13, 'version'), + (14, 'YouTube', 1, 14, 'provider_name'), + (15, 'http://i1.ytimg.com/vi/AYVUPem_jaM/hqdefault.jpg', 1, 15, 'thumbnail_url'), + (16, '360', 1, 16, 'thumbnail_height'), + (17, 'http://www.youtube.com/user/Sourcefabric', 1, 17, 'author_url'); UNLOCK TABLES; DROP TABLE IF EXISTS `ArticleSnippets`; From b7f99aeeaf0c58e8a84b89900eb958c75e1a7887 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 25 Jun 2015 10:10:01 +0200 Subject: [PATCH 07/90] [CS-5846] [Fix] Default order of available articles in featured article lists manager should be by recency --- .../Entity/Repository/ArticleRepository.php | 17 ++++++++++++++++- .../Newscoop/Services/ArticleService.php | 2 +- .../Controller/ArticlesController.php | 3 +-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php index 09987e8fb3..a359925048 100755 --- a/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php @@ -106,6 +106,7 @@ public function getArticles($publication, $type = null, $language = null, $issue public function searchArticles($articleSearchCriteria, $onlyPublished = true, $order = 'desc') { $em = $this->getEntityManager(); + $getLastArticles = true; $queryBuilder = $em->getRepository('Newscoop\Entity\ArticleIndex')->createQueryBuilder('a') ->select('DISTINCT(a.article) as number'); @@ -119,21 +120,25 @@ public function searchArticles($articleSearchCriteria, $onlyPublished = true, $o if (count($keywords) > 0) { $queryBuilder->leftJoin('a.keyword', 'k') ->andWhere($orX); + $getLastArticles = false; } if ($articleSearchCriteria->publication) { $queryBuilder->andWhere('a.publication = :publication') ->setParameter('publication', $articleSearchCriteria->publication); + $getLastArticles = false; } if ($articleSearchCriteria->section) { $queryBuilder->andWhere('a.sectionNumber = :section') ->setParameter('section', $articleSearchCriteria->section); + $getLastArticles = false; } if ($articleSearchCriteria->issue) { $queryBuilder->andWhere('a.issueNumber = :issue') ->setParameter('issue', $articleSearchCriteria->issue); + $getLastArticles = false; } if ($articleSearchCriteria->language) { @@ -142,9 +147,17 @@ public function searchArticles($articleSearchCriteria, $onlyPublished = true, $o if ($languageId) { $queryBuilder->andWhere('a.language = :language') ->setParameter('language', $languageId); + $getLastArticles = false; } } + if ($getLastArticles) { + $queryBuilder = $em->getRepository('Newscoop\Entity\Article') + ->createQueryBuilder('a') + ->select('a.number as number') + ->orderBy('a.uploaded', 'DESC'); + } + $queryBuilder->setMaxResults(80); $articleNumbers = $queryBuilder->getQuery()->getResult(); @@ -217,6 +230,7 @@ public function getArticlesByCriteria($articleSearchCriteria, $ids = array(), $o } if ($articleSearchCriteria->author) { + $queryBuilder->join('a.authors', 'au'); $queryBuilder->andWhere('au.id = :author') ->setParameter('author', $articleSearchCriteria->author); } @@ -232,7 +246,8 @@ public function getArticlesByCriteria($articleSearchCriteria, $ids = array(), $o } if ($articleSearchCriteria->topic) { - $queryBuilder->andWhere('t.id = :topic') + $queryBuilder->join('a.topics', 'att'); + $queryBuilder->andWhere('att.id = :topic') ->setParameter('topic', $articleSearchCriteria->topic); } diff --git a/newscoop/library/Newscoop/Services/ArticleService.php b/newscoop/library/Newscoop/Services/ArticleService.php index 5f99237878..34fba42afb 100755 --- a/newscoop/library/Newscoop/Services/ArticleService.php +++ b/newscoop/library/Newscoop/Services/ArticleService.php @@ -238,7 +238,7 @@ private function updateArticleMeta($article, $attributes) $article->setCommentsLocked($attributes['comments_locked']); $article->setOnFrontPage($attributes['onFrontPage']); $article->setOnSection($attributes['onSection']); - $article->setKeywords($attributes['keywords']); + $article->setKeywords($attributes['keywords']? $attributes['keywords'] : ''); return $article; } diff --git a/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php b/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php index e06bc3a10f..3dff56e5ae 100644 --- a/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php +++ b/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php @@ -275,8 +275,7 @@ public function searchArticlesAction(Request $request) if ($user && $user->isAdmin()) { $onlyPublished = false; } - } catch (AuthenticationException $e) { - } + } catch (AuthenticationException $e) {/* User is not logged in */} $articleSearchCriteria = new ArticleSearchCriteria(); $articleSearchCriteria->fillFromRequest($request); From 3a7b02ffb1fb3d1089b7f5246d1efe75930f960d Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 25 Jun 2015 10:23:14 +0200 Subject: [PATCH 08/90] remove not needed code (wrong merging) --- .../library/Newscoop/Entity/Repository/ArticleRepository.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php index a359925048..7868afd1e3 100755 --- a/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/ArticleRepository.php @@ -230,7 +230,6 @@ public function getArticlesByCriteria($articleSearchCriteria, $ids = array(), $o } if ($articleSearchCriteria->author) { - $queryBuilder->join('a.authors', 'au'); $queryBuilder->andWhere('au.id = :author') ->setParameter('author', $articleSearchCriteria->author); } @@ -246,8 +245,7 @@ public function getArticlesByCriteria($articleSearchCriteria, $ids = array(), $o } if ($articleSearchCriteria->topic) { - $queryBuilder->join('a.topics', 'att'); - $queryBuilder->andWhere('att.id = :topic') + $queryBuilder->andWhere('t.id = :topic') ->setParameter('topic', $articleSearchCriteria->topic); } From 83190f72c56aa9c430776bb05ca52322ca71eaf1 Mon Sep 17 00:00:00 2001 From: localizer Date: Thu, 25 Jun 2015 09:12:35 +0000 Subject: [PATCH 09/90] updated translation resources --- .../NewscoopBundle/Resources/translations/articles.ar.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.az.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.be.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.bn.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.cs.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.da.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.de.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.de_AT.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.el.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.es.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.es_AR.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.fa.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.fr.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.he.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.hr.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.hu.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.hy_AM.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.id.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.it.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ka.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ko.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ku.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.nb_NO.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.nl.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.pl.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ps.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.pt.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.pt_BR.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ro.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.ru.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.sh.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.sq.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.sr.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.sv.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.tr.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.uk.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.zh.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.zh_TW.yml | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml index 97483445eb..13f202efb2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml index 810482fd37..80ba94091e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml index 58f46277fd..a2f03c4f5e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml index 6b5b7fdd2d..0435880d70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml index cecf99fac8..e68e9eaa78 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml index c7a2c37750..448344afe0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml @@ -192,7 +192,7 @@ Snippet: Uddrag 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: 'Er du sikker på du vil ændre lsitens navn? Navnet bruges muligvis i Newscoop skabeloner for at vise listen på hjemmesiden. Spørg hjemmesidens administrator hvis du er i tvivl.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml index 687089ef37..56e8ff34b3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml index 687089ef37..56e8ff34b3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml index 28bf70209f..ef2e32ba90 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index a25d0c783d..4c18e0c6a4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -192,7 +192,7 @@ Snippet: Snippet 'The last article of this list has been removed.': 'The last article of this list has been removed.' Revert: Revert 'Could not automatically refresh the list': 'Could not automatically refresh the list' -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml index 02591c7439..28e3603ec4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml index f958467888..502c0972d2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml index fa0417582b..ee7f0df974 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml index b396aad8d0..da3a5a9fa3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml index ac3e0804cd..ee61041289 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml index 49769ec9c5..d571542b0d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml index ed0106ded4..7e99e2c821 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml index 3d35193c6d..f493e2933e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml index bb5cb0c13a..6072fff647 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml index 0e48a7086b..ef37ea5dff 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml index f4e9e951cb..b904fcc3e2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml index cf1be6ce57..854476cc3d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml @@ -192,7 +192,7 @@ Snippet: Fragment 'The last article of this list has been removed.': null Revert: Cofnij 'Could not automatically refresh the list': 'Nie można odświeżyć tej listy' -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: 'Jesteś pewien że chcesz zmienić nazwę tej listy? Nazwa może być używana w szablonach twojego motywu do wyświetlania zawartości tej listy. Jeśli masz wątpliwości zapytaj osobę odpowiedzialną za używany motyw.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml index 84e6d66706..bf9a17309f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml index 922feed4e3..7fd67add34 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml index ae11dab039..6eb802fd52 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml index 3d561d655a..68a756c9c7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml @@ -192,7 +192,7 @@ Snippet: Фрагмент 'The last article of this list has been removed.': 'Последняя статья списка удалена.' Revert: Восстановить 'Could not automatically refresh the list': 'Автоматическое обновление списка не удалось' -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: 'Вы действительно хотите изменить название списка? Название может использоваться в шаблонах Newscoop для воспроизведения списка во внешнем интерфейсе. Если не уверены, проконсультируйтесь с администратором сайта.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml index 026e3382f3..9ff9a8e731 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml index 020353218a..d6018c862a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml index eb2497a4fd..49d4ef0026 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml index 0aad081ab6..c60090c00e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml index 7b9ce6660c..1870ae7784 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml index 1e52ed2ce3..d6f4329ace 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml @@ -192,7 +192,7 @@ Snippet: null 'The last article of this list has been removed.': null Revert: null 'Could not automatically refresh the list': null -'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' +'The article slideshows have been successfully updated, please close the window.': null articles: playlists: namechanged: null From eb03ac21043a86a2723576c892d6ed63125c6a3b Mon Sep 17 00:00:00 2001 From: localizer Date: Thu, 25 Jun 2015 09:26:03 +0000 Subject: [PATCH 10/90] updated translation resources --- .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index 4c18e0c6a4..a25d0c783d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -192,7 +192,7 @@ Snippet: Snippet 'The last article of this list has been removed.': 'The last article of this list has been removed.' Revert: Revert 'Could not automatically refresh the list': 'Could not automatically refresh the list' -'The article slideshows have been successfully updated, please close the window.': null +'The article slideshows have been successfully updated, please close the window.': 'The article slideshows have been successfully updated, please close the window.' articles: playlists: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' From 7eb197b03b19871a8142ca3a1bbd13417f3e3b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Miko=C5=82ajczuk?= Date: Thu, 25 Jun 2015 11:30:12 +0200 Subject: [PATCH 11/90] fix wrong collumn name in indexes --- newscoop/install/Resources/sql/campsite_core.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql index 801a3f8910..2b47af5865 100644 --- a/newscoop/install/Resources/sql/campsite_core.sql +++ b/newscoop/install/Resources/sql/campsite_core.sql @@ -3486,9 +3486,9 @@ DROP TABLE IF EXISTS `ArticleSnippets`; CREATE TABLE ArticleSnippets ( ArticleNr int(11) NOT NULL, SnippetId int(11) NOT NULL, - INDEX IDX_5080CDE7C53224D (ArticleId), + INDEX IDX_5080CDE7C53224D (ArticleNr), INDEX IDX_5080CDEB00DA91C (SnippetId), - PRIMARY KEY(ArticleId, SnippetId) + PRIMARY KEY(ArticleNr, SnippetId) ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB; DROP TABLE IF EXISTS `user_oauth_clients`; From 4c9ab143b8f3556923123a30694c33fe6b9e459a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 25 Jun 2015 11:59:57 +0200 Subject: [PATCH 12/90] TW-246 - topic-Management --- .../Repository/ArticleTopicRepository.php | 42 +++- .../Controller/TopicsController.php | 9 +- .../NewscoopBundle/Services/TopicService.php | 106 ++++++---- .../Controller/TopicsControllerSpec.php | 182 ++++++++++++++---- 4 files changed, 249 insertions(+), 90 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php index 3ce7712f1b..de2b34df71 100644 --- a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php @@ -1,11 +1,10 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt */ - namespace Newscoop\Entity\Repository; use Doctrine\ORM\EntityRepository; @@ -13,10 +12,10 @@ class ArticleTopicRepository extends EntityRepository { /** - * Get all topics for an Article - Topic and article objects + * Get all topics for an Article - Topic and article objects. * * @param int|string $articleNumber Article number - * @param boolean $topicsOnly If get only topics in the result + * @param bool $topicsOnly If get only topics in the result * * @return Doctrine\ORM\Query */ @@ -37,7 +36,7 @@ public function getArticleTopicsIds($articleNumber, $topicsOnly = false) } /** - * Get all topics for an Article + * Get all topics for an Article. * * @param int|string $articleNumber Article number * @param string $languageCode Article's language code @@ -58,7 +57,7 @@ public function getAllArticleTopics($articleNumber, $languageCode) ->andWhere('a.language = :languageId') ->setParameters(array( 'articleNumber' => $articleNumber, - 'languageId' => $languageId + 'languageId' => $languageId, )); $countQueryBuilder = clone $qb; @@ -73,7 +72,7 @@ public function getAllArticleTopics($articleNumber, $languageCode) } /** - * Gets the occurence of the topic + * Gets the occurence of the topic. * * @param string|int $topicId Topic id * @@ -89,4 +88,33 @@ public function getTheOccurrenceOfTheTopic($topicId) return $query; } + + /** + * Count article topics by given criteria. + * + * @param array $criteria + * + * @return int + */ + public function countBy(array $criteria = array()) + { + $queryBuilder = $this->getQueryBuilder() + ->select('COUNT(t)') + ->from($this->getEntityName(), 't'); + + foreach ($criteria as $property => $value) { + if (!is_array($value)) { + $queryBuilder->andWhere("t.$property = :$property"); + } + } + + $query = $queryBuilder->getQuery(); + foreach ($criteria as $property => $value) { + if (!is_array($value)) { + $query->setParameter($property, $value); + } + } + + return (int) $query->getSingleScalarResult(); + } } diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php index e068c93466..f62ced32e9 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php @@ -75,7 +75,8 @@ public function treeAction(Request $request) $topicService = $this->get('newscoop_newscoop.topic_service'); $cacheService = $this->get('newscoop.cache'); $topicsCount = $topicService->countBy(); - $cacheKey = $cacheService->getCacheKey(array('topics', $topicsCount), 'topic'); + $attachedCount = $topicService->countArticleTopicsBy(); + $cacheKey = $cacheService->getCacheKey(array('topics', $topicsCount, $attachedCount), 'topic'); $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); if ($cacheService->contains($cacheKey)) { $nodes = $cacheService->fetch($cacheKey); @@ -502,6 +503,7 @@ public function detachTopicAction(Request $request) $translator = $this->get('translator'); $em = $this->get('em'); $userService = $this->get('user'); + $cacheService = $this->get('newscoop.cache'); $user = $userService->getCurrentUser(); $topicService = $this->get('newscoop_newscoop.topic_service'); if (!$user->hasPermission('AttachTopicToArticle')) { @@ -536,6 +538,7 @@ public function detachTopicAction(Request $request) } $topicService->removeTopicFromArticle($topicObj, $articleObj); + $cacheService->clearNamespace('topic'); return new JsonResponse(array( 'status' => true, @@ -554,6 +557,7 @@ public function attachTopicAction(Request $request) $em = $this->get('em'); $userService = $this->get('user'); $user = $userService->getCurrentUser(); + $cacheService = $this->get('newscoop.cache'); $topicService = $this->get('newscoop_newscoop.topic_service'); if (!$user->hasPermission('AttachTopicToArticle')) { return new JsonResponse(array( @@ -585,7 +589,6 @@ public function attachTopicAction(Request $request) $ids = $request->get('ids'); $topicsIds = $this->getArticleTopicsIds($articleNumber); $idsDiff = array_merge(array_diff($ids, $topicsIds), array_diff($topicsIds, $ids)); - foreach ($idsDiff as $key => $topicId) { $topicObj = $em->getReference("Newscoop\NewscoopBundle\Entity\Topic", $topicId); if (in_array($topicId, $topicsIds)) { @@ -595,6 +598,8 @@ public function attachTopicAction(Request $request) } } + $cacheService->clearNamespace('topic'); + return new JsonResponse(array( 'status' => true, 'message' => $translator->trans('topics.alerts.saved', array(), 'topics'), diff --git a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php index 22ff533fac..18c0919483 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php @@ -1,7 +1,6 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -16,7 +15,7 @@ use Newscoop\EventDispatcher\Events\GenericEvent; /** - * Topcis service + * Topcis service. */ class TopicService { @@ -34,12 +33,13 @@ public function __construct(EntityManager $em, $dispatcher) } /** - * Adds topic to the article + * Adds topic to the article. * * @param Topic $topic Topic object * @param Article $article Article object * - * @return boolean + * @return bool + * * @throws ResourcesConflictException */ public function addTopicToArticle(Topic $topic, Article $article) @@ -47,19 +47,20 @@ public function addTopicToArticle(Topic $topic, Article $article) $result = $this->attachTopicToArticle($topic, $article); if (!$result) { - throw new ResourcesConflictException("Topic already attached to article", 409); + throw new ResourcesConflictException('Topic already attached to article', 409); } return true; } /** - * Removes topic from the article + * Removes topic from the article. * * @param Topic $topic Topic object * @param Article $article Article object * - * @return boolean + * @return bool + * * @throws ResourcesConflictException */ public function removeTopicFromArticle(Topic $topic, Article $article) @@ -67,19 +68,19 @@ public function removeTopicFromArticle(Topic $topic, Article $article) $result = $this->detachTopicFromArticle($topic, $article); if (!$result) { - throw new ResourcesConflictException("Topic already removed from the article", 409); + throw new ResourcesConflictException('Topic already removed from the article', 409); } return true; } /** - * Adds topic to the article + * Adds topic to the article. * * @param Topic $topic Topic object * @param Article $article Article object * - * @return boolean + * @return bool */ protected function attachTopicToArticle(Topic $topic, Article $article) { @@ -87,19 +88,19 @@ protected function attachTopicToArticle(Topic $topic, Article $article) if ($result) { $this->em->flush(); - $this->dispatcher->dispatch("article-topic.attach", new GenericEvent($this, $this->getLogArray($topic, $article))); + $this->dispatcher->dispatch('article-topic.attach', new GenericEvent($this, $this->getLogArray($topic, $article))); } return $result; } /** - * Removes topic from the article + * Removes topic from the article. * * @param Topic $topic Topic object * @param Article $article Article object * - * @return boolean + * @return bool */ protected function detachTopicFromArticle(Topic $topic, Article $article) { @@ -107,7 +108,7 @@ protected function detachTopicFromArticle(Topic $topic, Article $article) if ($result) { $this->em->flush(); - $this->dispatcher->dispatch("article-topic.detach", new GenericEvent($this, $this->getLogArray($topic, $article))); + $this->dispatcher->dispatch('article-topic.detach', new GenericEvent($this, $this->getLogArray($topic, $article))); } return $result; @@ -130,11 +131,11 @@ private function getLogArray(Topic $topic, Article $article) } /** - * Removes topic from all articles it is attached to + * Removes topic from all articles it is attached to. * * @param string|int $topicId Topic id * - * @return boolean + * @return bool */ public function removeTopicFromAllArticles($topicId) { @@ -160,12 +161,12 @@ public function removeTopicFromAllArticles($topicId) } /** - * Saves topic position when it was dragged and dropped + * Saves topic position when it was dragged and dropped. * * @param Topic $node Dragged topic object * @param array $params Parameters with positions * - * @return boolean + * @return bool */ public function saveTopicPosition(Topic $node, $params) { @@ -216,12 +217,12 @@ public function saveTopicPosition(Topic $node, $params) } /** - * Reorder root topics + * Reorder root topics. * * @param array $rootNodes Root topics * @param array $order Topics ids in order * - * @return boolean + * @return bool */ public function reorderRootNodes($rootNodes, $order = array()) { @@ -256,12 +257,13 @@ public function reorderRootNodes($rootNodes, $order = array()) } /** - * Saves new topic. Possibility to overwrite AUTO strategy (set custom ids) + * Saves new topic. Possibility to overwrite AUTO strategy (set custom ids). * * @param Topic $node Topic object * @param string|null $locale Language code * - * @return boolean + * @return bool + * * @throws ResourcesConflictException When Topic already exists */ public function saveNewTopic(Topic $node, $locale = null) @@ -280,7 +282,7 @@ public function saveNewTopic(Topic $node, $locale = null) ->getOneOrNullResult(); if ($topicTranslation) { - throw new ResourcesConflictException("Topic already exists", 409); + throw new ResourcesConflictException('Topic already exists', 409); } if (!$node->getParent()) { @@ -299,7 +301,7 @@ public function saveNewTopic(Topic $node, $locale = null) $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_NONE); $this->em->flush(); - $this->dispatcher->dispatch("topic.create", new GenericEvent($this, array( + $this->dispatcher->dispatch('topic.create', new GenericEvent($this, array( 'title' => $node->getTitle(), 'id' => array('id' => $node->getId()), 'diff' => (array) $node, @@ -309,15 +311,15 @@ public function saveNewTopic(Topic $node, $locale = null) } /** - * Checks if topic is attached to any article + * Checks if topic is attached to any article. * * If $attachedCount is set to yes, returns an array with the number of topics attached to articles, * else returns boolean. By default set to false. * * @param string|int $topicId Topic id - * @param boolean $attachedCount Switch to include/exclude number of topics + * @param bool $attachedCount Switch to include/exclude number of topics * - * @return boolean|array + * @return bool|array */ public function isAttached($topicId, $attachedCount = false) { @@ -343,7 +345,7 @@ public function isAttached($topicId, $attachedCount = false) /** * Returns a topic object identified by the full name in the - * format topic_name:language_code + * format topic_name:language_code. * * @param string $fullName Topic's full name * @@ -415,7 +417,7 @@ public function setTranslatableHint(Query $query, $locale = null) } /** - * Wrapper method for getting readable topic path + * Wrapper method for getting readable topic path. * * @param Topic $topic Topic object * @param string|null $locale Locale e.g. "en" @@ -428,11 +430,11 @@ public function getReadablePath(Topic $topic, $locale = null) } /** - * Count topics by given criteria + * Count topics by given criteria. * * @param array $criteria * - * @return integer + * @return int */ public function countBy(array $criteria = array()) { @@ -440,12 +442,24 @@ public function countBy(array $criteria = array()) } /** - * Check if topic name already exists by given locale + * Count article topics by given criteria. + * + * @param array $criteria + * + * @return int + */ + public function countArticleTopicsBy(array $criteria = array()) + { + return $this->getArticleTopicRepository()->countBy($criteria); + } + + /** + * Check if topic name already exists by given locale. * * @param string $locale Locale * @param string $title Topic name * - * @return boolean + * @return bool */ public function checkTopicName($locale, $title) { @@ -475,7 +489,7 @@ public function checkTopicName($locale, $title) * * @param Topic $topic Topic * - * @return boolean + * @return bool */ public function deleteTopic(Topic $topic) { @@ -491,11 +505,11 @@ public function deleteTopic(Topic $topic) } /** - * Removes topic from all users it is followed by + * Removes topic from all users it is followed by. * * @param string|int $topicId Topic id * - * @return boolean + * @return bool */ public function removeTopicFromAllUsers($topicId) { @@ -511,15 +525,15 @@ public function removeTopicFromAllUsers($topicId) } /** - * Checks if topic is attached to any article + * Checks if topic is attached to any article. * * If $attachedCount is set to yes, returns an array with the number of topics attached to articles, * else returns boolean. By default set to false. * * @param string|int $topicId Topic id - * @param boolean $attachedCount Switch to include/exclude number of topics + * @param bool $attachedCount Switch to include/exclude number of topics * - * @return boolean|array + * @return bool|array */ public function isFollowed($topicId) { @@ -536,7 +550,7 @@ public function isFollowed($topicId) } /** - * Get options for forms + * Get options for forms. * * @return array */ @@ -546,7 +560,7 @@ public function getMultiOptions() } /** - * Gets Topic Repository + * Gets Topic Repository. * * @return Newscoop\NewscoopBundle\Entity\Repository\TopicRepository */ @@ -554,4 +568,14 @@ protected function getTopicRepository() { return $this->em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); } + + /** + * Gets article topic Repository. + * + * @return Newscoop\Entity\Repository\ArticleTopicRepository + */ + protected function getArticleTopicRepository() + { + return $this->em->getRepository('Newscoop\Entity\ArticleTopic'); + } } diff --git a/spec/Newscoop/NewscoopBundle/Controller/TopicsControllerSpec.php b/spec/Newscoop/NewscoopBundle/Controller/TopicsControllerSpec.php index 8143142d18..2070e76682 100644 --- a/spec/Newscoop/NewscoopBundle/Controller/TopicsControllerSpec.php +++ b/spec/Newscoop/NewscoopBundle/Controller/TopicsControllerSpec.php @@ -71,8 +71,7 @@ public function let( QueryBuilder $queryBuilder, CacheService $cacheService, EventDispatcher $dispatcher - ) - { + ) { $container->get('em')->willReturn($entityManager); $container->get('session')->willReturn($session); $container->get('request')->willReturn($request); @@ -108,8 +107,15 @@ public function let( $request->request = $parameterBag; } - public function its_treeAction_should_render_the_tree_of_topics($topicRepository, $articleTopicrepository, $request, $query2, $entityManager, $query) - { + public function its_treeAction_should_render_the_tree_of_topics( + $topicRepository, + $articleTopicrepository, + $request, + $query2, + $entityManager, + $query, + $topicService + ) { $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); $topicRepository->getTranslatableTopics('en')->willReturn($query); $topics = array(array( @@ -118,7 +124,7 @@ public function its_treeAction_should_render_the_tree_of_topics($topicRepository 'lft' => 1, 'rgt' => 6, 'root' => null, - 'title' => "new root polish", + 'title' => 'new root polish', 'topicOrder' => 1, ), array( 'id' => 2, @@ -126,46 +132,70 @@ public function its_treeAction_should_render_the_tree_of_topics($topicRepository 'lft' => 2, 'rgt' => 8, 'root' => null, - 'title' => "new root2 polish", - 'topicOrder' => 2 + 'title' => 'new root2 polish', + 'topicOrder' => 2, )); + + $topicService->countBy()->shouldBeCalled()->willReturn(20); + $topicService->countArticleTopicsBy()->shouldBeCalled()->willReturn(10); $query->getArrayResult()->willReturn($topics); $articleTopicrepository->getArticleTopicsIds(64, true)->willReturn($query2); - $query2->getArrayResult()->willReturn(array(array("109"), array("111"))); + $query2->getArrayResult()->willReturn(array(array('109'), array('111'))); $topicRepository->buildTreeArray($topics)->willReturn($topics); $response = $this->treeAction($request); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_addAction_should_add_a_new_topic_when_form_is_valid($request, $formFactory, $form, $entityManager, $topicService, $repository, $topic, $csrfTokenManagerAdapter) - { + public function its_addAction_should_add_a_new_topic_when_form_is_valid( + $request, + $formFactory, + $form, + $entityManager, + $topicService, + $repository, + $topic, + $csrfTokenManagerAdapter, + $cacheService + ) { $csrfTokenManagerAdapter->isCsrfTokenValid('default', $this->token)->willReturn(true); $classTopic = Argument::exact('Newscoop\NewscoopBundle\Entity\Topic')->getValue(); - $topic = new $classTopic; + $topic = new $classTopic(); $classTopicType = Argument::exact('Newscoop\NewscoopBundle\Form\Type\TopicType')->getValue(); - $topicType = new $classTopicType; + $topicType = new $classTopicType(); $formFactory->create($topicType, $topic)->willReturn($form); $form->handleRequest($request)->willReturn($form); $form->isValid()->willReturn(true); $topicService->saveNewTopic($topic, 'en')->willReturn(true); + $cacheService->clearNamespace('topic')->shouldBeCalled(); + $response = $this->addAction($request); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_addAction_should_add_a_new_topic_when_form_is_invalid(FormErrorIterator $formIterator, FormError $formError, $request, $formFactory, $form, $entityManager, $topicRepository, $repository, $topic, $csrfTokenManagerAdapter) - { + public function its_addAction_should_not_add_a_new_topic_when_form_is_invalid( + FormErrorIterator $formIterator, + FormError $formError, + $request, + $formFactory, + $form, + $entityManager, + $topicRepository, + $repository, + $topic, + $csrfTokenManagerAdapter + ) { $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); $csrfTokenManagerAdapter->isCsrfTokenValid('default', $this->token)->willReturn(true); $classTopic = Argument::exact('Newscoop\NewscoopBundle\Entity\Topic')->getValue(); - $topic = new $classTopic; + $topic = new $classTopic(); $classTopicType = Argument::exact('Newscoop\NewscoopBundle\Form\Type\TopicType')->getValue(); - $topicType = new $classTopicType; + $topicType = new $classTopicType(); $formFactory->create($topicType, $topic)->willReturn($form); $form->handleRequest($request)->willReturn($form); @@ -188,11 +218,17 @@ public function its_addAction_should_return_403_when_invalid_csrf_token($request $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_deleteAction_should_delete_single_topic($request, $topic, $repository) - { + public function its_deleteAction_should_delete_single_topic( + $request, + $topic, + $repository, + $cacheService + ) { $repository->findOneBy(array( 'id' => 1, ))->willReturn($topic); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); $response = $this->deleteAction($request, 1); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); @@ -208,8 +244,14 @@ public function its_deleteAction_should_return_404_when_topic_not_found($request $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_editAction_should_edit_topic($request, $repository, $topic, $csrfTokenManagerAdapter, $form) - { + public function its_editAction_should_edit_topic( + $request, + $repository, + $topic, + $csrfTokenManagerAdapter, + $form, + $cacheService + ) { $repository->findOneBy(array( 'id' => 1, ))->willReturn($topic); @@ -219,6 +261,9 @@ public function its_editAction_should_edit_topic($request, $repository, $topic, $csrfTokenManagerAdapter->isCsrfTokenValid('default', $this->token)->willReturn(true); $topicTranslation = new TopicTranslation('en', 'title', $data['title']); $topic->getTranslations()->willReturn(new ArrayCollection(array($topicTranslation))); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); + $response = $this->editAction($request, 1); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); @@ -244,8 +289,16 @@ public function its_editAction_should_return_403_when_invalid_csrf_token($reques $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_moveAction_should_move_child_topic_to_first_position_in_current_subtree($request, $topicService, $entityManager, $topicRepository, $parameterBag, $repository, $topic) - { + public function its_moveAction_should_move_child_topic_to_first_position_in_current_subtree( + $request, + $topicService, + $entityManager, + $topicRepository, + $parameterBag, + $repository, + $topic, + $cacheService + ) { $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); $parameterBag->all()->willReturn(array( 'first' => true, @@ -258,17 +311,28 @@ public function its_moveAction_should_move_child_topic_to_first_position_in_curr $request->request = $parameterBag; $topicRepository->findOneBy(array( - 'id' => 1 + 'id' => 1, ))->willReturn($topic); $topicService->saveTopicPosition($topic, $request->request->all())->willReturn(true); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); + $response = $this->moveAction($request, 1); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_moveAction_should_move_child_topic_to_last_position_in_current_subtree($request, $topicService, $entityManager, $topicRepository, $parameterBag, $repository, $topic) - { + public function its_moveAction_should_move_child_topic_to_last_position_in_current_subtree( + $request, + $topicService, + $entityManager, + $topicRepository, + $parameterBag, + $repository, + $topic, + $cacheService + ) { $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); $parameterBag->all()->willReturn(array( 'last' => true, @@ -281,17 +345,28 @@ public function its_moveAction_should_move_child_topic_to_last_position_in_curre $request->request = $parameterBag; $topicRepository->findOneBy(array( - 'id' => 1 + 'id' => 1, ))->willReturn($topic); $topicService->saveTopicPosition($topic, $request->request->all())->willReturn(true); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); + $response = $this->moveAction($request, 1); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_moveAction_should_move_child_topic_to_middle_position_in_current_subtree($request, $topicService, $entityManager, $topicRepository, $parameterBag, $repository, $topic) - { + public function its_moveAction_should_move_child_topic_to_middle_position_in_current_subtree( + $request, + $topicService, + $entityManager, + $topicRepository, + $parameterBag, + $repository, + $topic, + $cacheService + ) { $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); $parameterBag->all()->willReturn(array( 'middle' => true, @@ -304,10 +379,13 @@ public function its_moveAction_should_move_child_topic_to_middle_position_in_cur $request->request = $parameterBag; $topicRepository->findOneBy(array( - 'id' => 1 + 'id' => 1, ))->willReturn($topic); $topicService->saveTopicPosition($topic, $request->request->all())->willReturn(true); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); + $response = $this->moveAction($request, 1); $response->getStatusCode()->shouldReturn(200); $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); @@ -337,7 +415,7 @@ public function its_detachTopicAction_should_return_404_status_code_when_no_arti $request->get('language')->willReturn('1'); $repository->findOneBy(array( 'number' => '64', - 'language' => '1' + 'language' => '1', ))->willReturn(null); $response = $this->detachTopicAction($request); $response->getStatusCode()->shouldReturn(404); @@ -353,7 +431,7 @@ public function its_detachTopicAction_should_return_404_status_code_when_no_topi $request->get('language')->willReturn('1'); $repository->findOneBy(array( 'number' => '64', - 'language' => '1' + 'language' => '1', ))->willReturn($article); $entityManager->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->willReturn($topicRepository); @@ -365,8 +443,18 @@ public function its_detachTopicAction_should_return_404_status_code_when_no_topi $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_detachTopicAction_should_detach_topic_from_the_article($request, $topicService, $topic, $query, $user, $topicRepository, $entityManager, $repository, $article) - { + public function its_detachTopicAction_should_detach_topic_from_the_article( + $request, + $topicService, + $topic, + $query, + $user, + $topicRepository, + $entityManager, + $repository, + $article, + $cacheService + ) { $user->hasPermission('AttachTopicToArticle')->willReturn(true); $entityManager->getRepository('Newscoop\Entity\Article')->willReturn($repository); $request->get('articleNumber')->willReturn('64'); @@ -374,7 +462,7 @@ public function its_detachTopicAction_should_detach_topic_from_the_article($requ $request->get('language')->willReturn('1'); $repository->findOneBy(array( 'number' => '64', - 'language' => '1' + 'language' => '1', ))->willReturn($article); $topic->getTitle()->willReturn('test topic'); @@ -384,6 +472,7 @@ public function its_detachTopicAction_should_detach_topic_from_the_article($requ $query->getOneOrNullResult()->willReturn($topic); $topicService->removeTopicFromArticle($topic, $article)->willReturn(true); + $cacheService->clearNamespace('topic')->shouldBeCalled(); $response = $this->detachTopicAction($request); $response->getStatusCode()->shouldReturn(200); @@ -410,7 +499,7 @@ public function its_attachTopicAction_should_return_404_status_code_when_no_arti $queryBuilder->join('a.language', 'l')->willReturn($queryBuilder); $queryBuilder->where('a.number = :number')->willReturn($queryBuilder); $queryBuilder->andWhere('l.code = :code')->willReturn($queryBuilder); - $queryBuilder->setParameters(array("number" => "64", "code" => "1"))->willReturn($queryBuilder); + $queryBuilder->setParameters(array('number' => '64', 'code' => '1'))->willReturn($queryBuilder); $queryBuilder->getQuery()->willReturn($query); $query->getOneOrNullResult()->willReturn(null); @@ -419,26 +508,39 @@ public function its_attachTopicAction_should_return_404_status_code_when_no_arti $response->shouldBeAnInstanceOf('Symfony\Component\HttpFoundation\JsonResponse'); } - public function its_attachTopicAction_should_attach_topics($request, $topic, $topicService, $queryBuilder, $user, $entityManager, $repository, $articleTopicrepository, $query, $article) - { + public function its_attachTopicAction_should_attach_topics( + $request, + $topic, + $topicService, + $queryBuilder, + $user, + $entityManager, + $repository, + $articleTopicrepository, + $query, + $article, + $cacheService + ) { $user->hasPermission('AttachTopicToArticle')->willReturn(true); $entityManager->getRepository('Newscoop\Entity\Article')->willReturn($repository); $request->get('_articleNumber')->willReturn('64'); $request->get('_languageCode')->willReturn('1'); - $request->get('ids')->willReturn(array("112", "113")); + $request->get('ids')->willReturn(array('112', '113')); $repository ->createQueryBuilder('a') ->willReturn($queryBuilder); $queryBuilder->join('a.language', 'l')->willReturn($queryBuilder); $queryBuilder->where('a.number = :number')->willReturn($queryBuilder); $queryBuilder->andWhere('l.code = :code')->willReturn($queryBuilder); - $queryBuilder->setParameters(array("number" => "64", "code" => "1"))->willReturn($queryBuilder); + $queryBuilder->setParameters(array('number' => '64', 'code' => '1'))->willReturn($queryBuilder); $queryBuilder->getQuery()->willReturn($query); $query->getOneOrNullResult()->willReturn($article); $entityManager->getReference("Newscoop\NewscoopBundle\Entity\Topic", Argument::type('string', 'integer'))->willReturn($topic); $articleTopicrepository->getArticleTopicsIds('64', true)->willReturn($query); - $query->getArrayResult()->willReturn(array(array("109"), array("111"))); + $query->getArrayResult()->willReturn(array(array('109'), array('111'))); + + $cacheService->clearNamespace('topic')->shouldBeCalled(); $response = $this->attachTopicAction($request); $response->getStatusCode()->shouldReturn(200); From b5eeaf5754b4938415f92156e802231b1623067a Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Thu, 25 Jun 2015 12:05:53 +0200 Subject: [PATCH 13/90] Changes url seperator to / instead of OS dependant directory seperator --- .../library/Newscoop/Controller/Plugin/Js.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/newscoop/library/Newscoop/Controller/Plugin/Js.php b/newscoop/library/Newscoop/Controller/Plugin/Js.php index 83b5203ee9..cfe4fd28e2 100644 --- a/newscoop/library/Newscoop/Controller/Plugin/Js.php +++ b/newscoop/library/Newscoop/Controller/Plugin/Js.php @@ -52,7 +52,7 @@ class Js extends Zend_Controller_Plugin_Abstract public function __construct( $p_opts ) { // base path from options - incomplete - $this->_baseUrn = trim( $p_opts["resources"]["layout"]["jsUrl"], DIR_SEP ) . DIR_SEP; + $this->_baseUrn = trim( $p_opts["resources"]["layout"]["jsUrl"], '/' ) . '/'; $this->_basePath = ( $p = $p_opts["resources"]["layout"]["jsPath"] ) ? $p . DIR_SEP : false; $this->view = \Zend_Registry::get( 'view' ); } @@ -61,12 +61,12 @@ public function postDispatch( Zend_Controller_Request_Abstract $p_request ) { // stick the baseUrl to the basePath because we have a dispatched request now // and format those god damn slashes!! - $baseUrl = trim( Zend_Controller_Front::getInstance()->getBaseUrl(), DIR_SEP ); + $baseUrl = trim( Zend_Controller_Front::getInstance()->getBaseUrl(), '/' ); - $currentUrn = ( $baseUrl != "" ? DIR_SEP . $baseUrl : "" ) - . DIR_SEP - . trim( $this->_baseUrn, DIR_SEP ) - . DIR_SEP; + $currentUrn = ( $baseUrl != "" ? '/' . $baseUrl : "" ) + . '/' + . trim( $this->_baseUrn, '/' ) + . '/'; $filesToAppend = array ( @@ -76,7 +76,7 @@ public function postDispatch( Zend_Controller_Request_Abstract $p_request ) "{$this->_basePath}{$p_request->getControllerName()}.{$this->_fileSuffix}" => // controller shared "{$currentUrn}{$p_request->getControllerName()}.{$this->_fileSuffix}", "{$this->_basePath}{$p_request->getControllerName()}".DIR_SEP."{$p_request->getActionName()}.{$this->_fileSuffix}" => // action specific - "{$currentUrn}{$p_request->getControllerName()}".DIR_SEP."{$p_request->getActionName()}.{$this->_fileSuffix}" + "{$currentUrn}{$p_request->getControllerName()}".'/'."{$p_request->getActionName()}.{$this->_fileSuffix}" ); foreach( $filesToAppend as $path => $urn ) @@ -89,4 +89,4 @@ public function postDispatch( Zend_Controller_Request_Abstract $p_request ) } } } -} \ No newline at end of file +} From a16341d9b2e7d491846bd3836083bd5505d962f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 25 Jun 2015 12:50:48 +0200 Subject: [PATCH 14/90] make cache key aware of the article number --- .../Newscoop/Entity/Repository/ArticleTopicRepository.php | 5 ++--- .../Newscoop/NewscoopBundle/Controller/TopicsController.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php index de2b34df71..cb89728e54 100644 --- a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php @@ -98,9 +98,8 @@ public function getTheOccurrenceOfTheTopic($topicId) */ public function countBy(array $criteria = array()) { - $queryBuilder = $this->getQueryBuilder() - ->select('COUNT(t)') - ->from($this->getEntityName(), 't'); + $queryBuilder = $this->createQueryBuilder('t') + ->select('COUNT(t)'); foreach ($criteria as $property => $value) { if (!is_array($value)) { diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php index f62ced32e9..363637deb5 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php @@ -76,7 +76,7 @@ public function treeAction(Request $request) $cacheService = $this->get('newscoop.cache'); $topicsCount = $topicService->countBy(); $attachedCount = $topicService->countArticleTopicsBy(); - $cacheKey = $cacheService->getCacheKey(array('topics', $topicsCount, $attachedCount), 'topic'); + $cacheKey = $cacheService->getCacheKey(array('topics', $topicsCount, $attachedCount, $articleNumber), 'topic'); $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); if ($cacheService->contains($cacheKey)) { $nodes = $cacheService->fetch($cacheKey); From e2fa6c1172a6c5c51dacb4335567bba18e6141e6 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 25 Jun 2015 13:26:26 +0200 Subject: [PATCH 15/90] [CS-5848] [Fix] Properly save article properties --- .../Newscoop/Services/ArticleService.php | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/newscoop/library/Newscoop/Services/ArticleService.php b/newscoop/library/Newscoop/Services/ArticleService.php index 5f99237878..b57db9a810 100755 --- a/newscoop/library/Newscoop/Services/ArticleService.php +++ b/newscoop/library/Newscoop/Services/ArticleService.php @@ -233,12 +233,29 @@ public function updateArticle($article, $attributes) */ private function updateArticleMeta($article, $attributes) { - $article->setName($attributes['name']); - $article->setCommentsEnabled($attributes['comments_enabled']); - $article->setCommentsLocked($attributes['comments_locked']); - $article->setOnFrontPage($attributes['onFrontPage']); - $article->setOnSection($attributes['onSection']); - $article->setKeywords($attributes['keywords']); + if (array_key_exists('name', $attributes)) { + $article->setName($attributes['name']); + } + + if (array_key_exists('comments_enabled', $attributes)) { + $article->setCommentsEnabled($attributes['comments_enabled']); + } + + if (array_key_exists('comments_locked', $attributes)) { + $article->setCommentsLocked($attributes['comments_locked']); + } + + if (array_key_exists('onFrontPage', $attributes)) { + $article->setOnFrontPage($attributes['onFrontPage']); + } + + if (array_key_exists('onSection', $attributes)) { + $article->setOnSection($attributes['onSection']); + } + + if (array_key_exists('keywords', $attributes)) { + $article->setKeywords($attributes['keywords']? $attributes['keywords'] : ''); + } return $article; } From 3ff1da0dd9e9325e16f123a3e2545707bf64a5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 25 Jun 2015 16:56:23 +0200 Subject: [PATCH 16/90] fixed adding root topic --- .../Newscoop/NewscoopBundle/Resources/public/js/tree.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/tree.js b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/tree.js index db586ae72e..318112d82a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/tree.js +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/tree.js @@ -550,13 +550,14 @@ app.controller('treeCtrl', function($scope, TopicsFactory, $filter) { topic = scope.$parent.$nodeScope.$modelValue; } - addFormData.topic["title"] = topic.newChild[topic.id]; if (topic !== undefined) { + addFormData.topic["title"] = topic.newChild[topic.id]; addFormData.topic["parent"] = topic.id; + topic.newChild = {}; + } else { + addFormData.topic["title"] = $scope.formData.title; } - topic.newChild = {}; - TopicsFactory.addTopic(addFormData, languageCode).success(function (response) { if (response.status) { flashMessage(response.message); From dda92ee161bfe104fd3a4627983b2c299acbbda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 26 Jun 2015 09:55:06 +0200 Subject: [PATCH 17/90] fixed count by menthods --- .../Repository/ArticleTopicRepository.php | 8 +-- .../Entity/Repository/TopicRepository.php | 70 +++++++++---------- 2 files changed, 35 insertions(+), 43 deletions(-) diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php index cb89728e54..b8ef20f72b 100644 --- a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php @@ -103,16 +103,12 @@ public function countBy(array $criteria = array()) foreach ($criteria as $property => $value) { if (!is_array($value)) { - $queryBuilder->andWhere("t.$property = :$property"); + $queryBuilder->andWhere("t.$property = :$property") + ->setParameter($property, $value); } } $query = $queryBuilder->getQuery(); - foreach ($criteria as $property => $value) { - if (!is_array($value)) { - $query->setParameter($property, $value); - } - } return (int) $query->getSingleScalarResult(); } diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php index 542e563695..990816ece2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php @@ -1,6 +1,6 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -20,7 +20,7 @@ class TopicRepository extends NestedTreeRepository public $onChildrenQuery; /** - * Get all topics + * Get all topics. * * @param $languageCode Language code * @@ -53,7 +53,7 @@ public function getTopics($languageCode = null) } /** - * Get all parent choices + * Get all parent choices. * * @param Topic|null $node Topic object * @@ -84,7 +84,7 @@ public function findAllParentChoices(Topic $node = null) } /** - * Will do reordering based on current translations + * Will do reordering based on current translations. */ public function childrenQuery($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $include = false) { @@ -111,7 +111,7 @@ public function getTopicsQuery($direction = 'ASC') } /** - * Gets the single topic's query by id + * Gets the single topic's query by id. * * @param int $id Topic id * @param string $locale Language code @@ -135,7 +135,7 @@ public function getSingleTopicQuery($id, $locale = null) } /** - * Get topics query and set translatable hints + * Get topics query and set translatable hints. * * @param Query $query Query object */ @@ -156,7 +156,7 @@ public function getTranslatableTopics($locale, $order = 'asc') } /** - * Add hints to the query + * Add hints to the query. * * @param Query $query Query * @param string|null $locale Lecale to which fallback @@ -186,11 +186,11 @@ public function setTranslatableHint(Query $query, $locale = null) } /** - * Get all articles for given topic by topic id and language code + * Get all articles for given topic by topic id and language code. * - * @param int $topicId Topic id - * @param string $languageCode Language code - * @param boolean $defaultFallback Sets the language of the topic to the default one + * @param int $topicId Topic id + * @param string $languageCode Language code + * @param bool $defaultFallback Sets the language of the topic to the default one * * @return Query */ @@ -216,7 +216,7 @@ public function getArticlesQueryByTopicIdAndLanguage($topicId, $languageCode, $d } /** - * Search topic by given query + * Search topic by given query. * * @param string $query * @param array $sort @@ -253,7 +253,7 @@ public function searchTopics($query, $sort = array(), $limit = null, $locale = n } /** - * Find topic options + * Find topic options. * * @return array */ @@ -273,7 +273,7 @@ public function findOptions() } /** - * Gets topic's path + * Gets topic's path. * * @param Topic $topic Topic * @@ -306,7 +306,7 @@ public function getTranslatableTopicLocale(Topic $topic) } /** - * Get Topics for Article + * Get Topics for Article. * * Returns all the associated Topics to an Article. * @@ -316,7 +316,7 @@ public function getTranslatableTopicLocale(Topic $topic) * * @return Doctrine\ORM\Query Query */ - public function getArticleTopics($articleNr, $languageCode, $order = "asc") + public function getArticleTopics($articleNr, $languageCode, $order = 'asc') { $em = $this->getEntityManager(); $articleTopicsIds = $em->getRepository('Newscoop\Entity\ArticleTopic')->getArticleTopicsIds($articleNr, true); @@ -345,11 +345,11 @@ public function getArticleTopics($articleNr, $languageCode, $order = "asc") } /** - * Count topics by given criteria + * Count topics by given criteria. * * @param array $criteria * - * @return integer + * @return int */ public function countBy(array $criteria = array()) { @@ -359,45 +359,41 @@ public function countBy(array $criteria = array()) foreach ($criteria as $property => $value) { if (!is_array($value)) { - $queryBuilder->andWhere("t.$property = :$property"); + $queryBuilder->andWhere("t.$property = :$property") + ->setParameter($property, $value); } } $query = $queryBuilder->getQuery(); - foreach ($criteria as $property => $value) { - if (!is_array($value)) { - $query->setParameter($property, $value); - } - } return (int) $query->getSingleScalarResult(); } /** - * Gets topic by given id or name + * Gets topic by given id or name. * - * @param string|integer $topicIdOrName Topicid or name - * @param string|integer $locale Current locale, language code or id + * @param string|int $topicIdOrName Topicid or name + * @param string|int $locale Current locale, language code or id * * @return Query */ - public function getTopicByIdOrName($topicIdOrName, $locale) + public function getTopicByIdOrName($topicIdOrName, $locale = null) { $qb = $this->getQueryBuilder() - ->select('t', 'tt', "p") + ->select('t', 'tt', 'p') ->from($this->getEntityName(), 't') - ->leftJoin("t.translations", "tt") - ->leftJoin("t.parent", "p") + ->leftJoin('t.translations', 'tt') + ->leftJoin('t.parent', 'p') ->where("tt.field = 'title'"); if (is_numeric($topicIdOrName)) { $qb - ->andWhere("t.id = :id") - ->setParameter("id", $topicIdOrName); + ->andWhere('t.id = :id') + ->setParameter('id', $topicIdOrName); } else { $qb - ->andWhere("t.title = :title") - ->setParameter("title", $topicIdOrName); + ->andWhere('t.title = :title') + ->setParameter('title', $topicIdOrName); } if (is_numeric($locale)) { @@ -435,7 +431,7 @@ public function childrenWithTranslations( if ($node instanceof $meta->name) { $wrapped = new EntityWrapper($node, $this->_em); if (!$wrapped->hasValidIdentifier()) { - throw new InvalidArgumentException("Node is not managed by UnitOfWork"); + throw new InvalidArgumentException('Node is not managed by UnitOfWork'); } if ($direct) { $id = $wrapped->getIdentifier(); @@ -466,7 +462,7 @@ public function childrenWithTranslations( $qb->setParameter('rootNode', $node); } } else { - throw new \InvalidArgumentException("Node is not related to this repository"); + throw new \InvalidArgumentException('Node is not related to this repository'); } } else { if ($direct) { From e378cf8300953405559a5c6e39196c2f1f534b7f Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Fri, 26 Jun 2015 09:59:02 +0200 Subject: [PATCH 18/90] TW-250: Adds allowfullscreen attribute as valid This adds the allowfullscreen attributes to the list of valid attributes for an iframe-tag in the TinyMCE configuration. --- newscoop/admin-files/articles/editor_load_tinymce.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/admin-files/articles/editor_load_tinymce.php b/newscoop/admin-files/articles/editor_load_tinymce.php index 24c792dea8..e3c50c9c23 100644 --- a/newscoop/admin-files/articles/editor_load_tinymce.php +++ b/newscoop/admin-files/articles/editor_load_tinymce.php @@ -271,7 +271,7 @@ function CampsiteSubhead(ed) { file_browser_callback : "campsitemedia", relative_urls : false, onchange_callback : function() { $('form#article-main').change(); }, - extended_valid_elements : "iframe[src|width|height|name|align|frameborder|scrolling|marginheight|marginwidth|style|id|class]", + extended_valid_elements : "iframe[src|width|height|name|align|frameborder|scrolling|marginheight|marginwidth|style|id|class|allowfullscreen]", // Theme options theme_advanced_buttons1 : "", From 8c553f2801f447f3d4cd27b818aabbeb67b55905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 26 Jun 2015 10:41:45 +0200 Subject: [PATCH 19/90] fixed articles search by topics fixed articles search by topics --- newscoop/classes/Article.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/newscoop/classes/Article.php b/newscoop/classes/Article.php index c8f12e624f..3505e654c2 100755 --- a/newscoop/classes/Article.php +++ b/newscoop/classes/Article.php @@ -1443,7 +1443,7 @@ public function setOnSectionPage($p_value) /** * Return the current workflow state of the article: * 'Y' = "Published" - * 'S' = "Submitted" + * 'S' = "Submitted" * 'N' = "New" * * @return string @@ -1488,7 +1488,7 @@ public function getWorkflowDisplayString($p_value = null) /** * Set the workflow state of the article. - * 'Y' = 'Published' + * 'Y' = 'Published' * 'S' = 'Submitted' * 'N' = 'New' * @@ -2579,7 +2579,6 @@ public static function GetList(array $p_parameters, $p_order = null, $languageId = null; $em = Zend_Registry::get('container')->getService('em'); - $request = Zend_Registry::get('container')->getService('request'); $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); // parses the given parameters in order to build the WHERE part of @@ -2621,7 +2620,7 @@ public static function GetList(array $p_parameters, $p_order = null, } elseif ($leftOperand == 'topic') { // add the topic to the list of match/do not match topics depending // on the operator - $topic = $repository->getTopicByIdOrName($comparisonOperation['right'], $request->getLocale())->getOneOrNullResult(); + $topic = $repository->getTopicByIdOrName($comparisonOperation['right'])->getOneOrNullResult(); if ($topic) { $topicIds = array(); foreach($topic->getChildren() as $child) { @@ -2636,7 +2635,7 @@ public static function GetList(array $p_parameters, $p_order = null, } } } elseif ($leftOperand == 'topic_strict') { - $topic = $repository->getTopicByIdOrName($comparisonOperation['right'], $request->getLocale())->getOneOrNullResult(); + $topic = $repository->getTopicByIdOrName($comparisonOperation['right'])->getOneOrNullResult(); if ($topic) { $topicIds[] = $comparisonOperation['right']; if ($comparisonOperation['symbol'] == '=') { @@ -3528,4 +3527,4 @@ public function getWebcode() return Zend_Registry::get('container')->getService('webcode')->getArticleWebcode($article); } -} +} \ No newline at end of file From 70853e23419106319f3458828a699074e9345518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 26 Jun 2015 15:31:33 +0200 Subject: [PATCH 20/90] added query to upgrade scripts - article_language column --- .../sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php | 1 + .../Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php | 1 + 2 files changed, 2 insertions(+) diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php index 653ac6d5c2..a29ef780c4 100644 --- a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.19/init_order_in_playlists.php @@ -70,6 +70,7 @@ try { $app['db']->query('ALTER TABLE playlist_article DROP INDEX id_playlist'); + $app['db']->query('ALTER TABLE `playlist_article` ADD `article_language` INT(11) NOT NULL'); $app['db']->query('ALTER TABLE `playlist_article` ADD KEY `IDX_BD05197C8759FDB8` (`id_playlist`), ADD KEY `IDX_BD05197CAA07C9D3813385DE` (`article_no`,`article_language`)'); $app['db']->query('UPDATE `playlist_article` AS pa LEFT JOIN Articles AS a ON pa.`article_no` = a.`Number` SET pa.`article_language` = a.`IdLanguage`'); } catch (\Exception $e) { diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php index 3280cd979f..53c7b29514 100644 --- a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.03/playlist_article.php @@ -21,6 +21,7 @@ try { $app['db']->query('ALTER TABLE playlist_article DROP INDEX id_playlist'); + $app['db']->query('ALTER TABLE `playlist_article` ADD `article_language` INT(11) NOT NULL'); $app['db']->query('ALTER TABLE `playlist_article` ADD KEY `IDX_BD05197C8759FDB8` (`id_playlist`), ADD KEY `IDX_BD05197CAA07C9D3813385DE` (`article_no`,`article_language`)'); $app['db']->query('UPDATE `playlist_article` AS pa LEFT JOIN Articles AS a ON pa.`article_no` = a.`Number` SET pa.`article_language` = a.`IdLanguage`'); } catch (\Exception $e) { From 5cb4bb9209552aae4ce82f48f8e806070d7a3328 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 29 Jun 2015 12:05:47 +0200 Subject: [PATCH 21/90] CS-5854: Adds checkbox to search in hidden article types --- newscoop/admin-files/libs/ContextList/do_data.php | 2 +- newscoop/admin-files/libs/ContextList/filters.php | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/newscoop/admin-files/libs/ContextList/do_data.php b/newscoop/admin-files/libs/ContextList/do_data.php index c20c69579f..1a53c01b62 100644 --- a/newscoop/admin-files/libs/ContextList/do_data.php +++ b/newscoop/admin-files/libs/ContextList/do_data.php @@ -78,7 +78,7 @@ } } -if (empty($_REQUEST['show_filtered']) || $_REQUEST['show_filtered'] == "false") { +if (empty($_REQUEST['showtype']) || $_REQUEST['showtype'] == "false") { foreach((array) \ArticleType::GetArticleTypes(true) as $one_art_type_name) { $one_art_type = new \ArticleType($one_art_type_name); diff --git a/newscoop/admin-files/libs/ContextList/filters.php b/newscoop/admin-files/libs/ContextList/filters.php index 522c926811..26e650421b 100644 --- a/newscoop/admin-files/libs/ContextList/filters.php +++ b/newscoop/admin-files/libs/ContextList/filters.php @@ -70,6 +70,12 @@ + +
+ + +
+ filters as $filterName => $filterValue) : ?> select', fieldset).val('0').change(); + $('input:checkbox, input:radio', fieldset).removeAttr('checked'); + // redraw table filters[smartlistId] = {}; tables[smartlistId].fnDraw(true); From 465df6ed37b1c23d708ae54857850841d04ef489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Mon, 29 Jun 2015 15:17:29 +0200 Subject: [PATCH 22/90] set fallback translations to english by default in bazinga bundle --- .../NewscoopBundle/Resources/views/admin_layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/admin_layout.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/admin_layout.html.twig index cffb88053d..f54c1b62dc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/admin_layout.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/admin_layout.html.twig @@ -30,7 +30,7 @@ - + {% block admin_scripts %}{% endblock %} {% if localeFromCookie != 'en' %} From 15614abf0d1f88c13f1c3f311400878b1bcd2347 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 29 Jun 2015 15:29:33 +0200 Subject: [PATCH 23/90] CS-5461: Implementes $gimme->article->rating_enabled --- newscoop/template_engine/metaclasses/MetaArticle.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/newscoop/template_engine/metaclasses/MetaArticle.php b/newscoop/template_engine/metaclasses/MetaArticle.php index a9ccc198f8..319c0cf228 100755 --- a/newscoop/template_engine/metaclasses/MetaArticle.php +++ b/newscoop/template_engine/metaclasses/MetaArticle.php @@ -45,6 +45,7 @@ final class MetaArticle extends MetaDbObject 'mon_name'=>'getCreationMonthName', 'wday_name'=>'getCreationWeekDayName', 'template'=>'getTemplate', + 'rating_enabled'=>'getRatingEnabled', 'comments_enabled'=>'getCommentsEnabled', 'on_front_page'=>'getOnFrontPage', 'on_section_page'=>'getOnSectionPage', @@ -516,6 +517,11 @@ protected function getMap() return new MetaMap($map); } + protected function getRatingEnabled() + { + return (bool) ($this->m_dbObject->ratingEnabled() == '1'); + } + protected function getCommentsEnabled() { $cacheService = \Zend_Registry::get('container')->getService('newscoop.cache'); @@ -523,7 +529,7 @@ protected function getCommentsEnabled() if ($cacheService->contains($cacheKey)) { return $cacheService->fetch($cacheKey); } - + $publicationObj = new Publication($this->m_dbObject->getProperty('IdPublication')); $articleTypeObj = new ArticleType($this->m_dbObject->getProperty('Type')); From f34c9dc799af182f51c521823bb12262475c46ad Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 29 Jun 2015 16:04:12 +0200 Subject: [PATCH 24/90] CS-5854: Adds css fix so select2 will keep the same width When selecting an author or creator, the select2 field would resize to the length of the name. When removing and then re-adding the filter the field still had the same width. Which is inconvenient if you've searched for a short name. --- newscoop/admin-files/articles/context_box/popup.php | 1 + newscoop/admin-style/admin_stylesheet_context.css | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/newscoop/admin-files/articles/context_box/popup.php b/newscoop/admin-files/articles/context_box/popup.php index dd97222c01..4b3d18d6af 100755 --- a/newscoop/admin-files/articles/context_box/popup.php +++ b/newscoop/admin-files/articles/context_box/popup.php @@ -29,6 +29,7 @@ function toggleDragZonePlaceHolder() $('#drag-here-to-add-to-list').css('display', 'block'); } } + function fnLoadContextList(data) { if (data.code == 200) { diff --git a/newscoop/admin-style/admin_stylesheet_context.css b/newscoop/admin-style/admin_stylesheet_context.css index 9a75563d33..13af172cd8 100644 --- a/newscoop/admin-style/admin_stylesheet_context.css +++ b/newscoop/admin-style/admin_stylesheet_context.css @@ -62,3 +62,9 @@ fieldset.closed { color: #CCCCCC; font-size: 20px; } + +/* Fix for author and creator filter in content search */ +.smartlist fieldset div.select2 { + margin-right: 13px; + width: 256px; +} From f7ae02bc2241d84894bebcfb9657cabd6b163b3f Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 09:35:31 +0200 Subject: [PATCH 25/90] [CS-5822] [Fix] publication management: switching url type does not work do not show .htm when there is no seo part in url --- newscoop/classes/Article.php | 4 +++- newscoop/library/Newscoop/Article/LinkService.php | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/newscoop/classes/Article.php b/newscoop/classes/Article.php index 3505e654c2..b8bcb66e7a 100755 --- a/newscoop/classes/Article.php +++ b/newscoop/classes/Article.php @@ -1782,7 +1782,9 @@ public function getSEOURLEnd(array $seoFields, $languageId) } } $urlEnd = preg_replace('/[\\\\,\/\.\?"\+&%:#]/', '', trim($urlEnd)); - $urlEnd = str_replace(' ', '-', $urlEnd) . '.htm'; + if (strlen($urlEnd) > 0) { + $urlEnd = str_replace(' ', '-', $urlEnd) . '.htm'; + } return $urlEnd; } diff --git a/newscoop/library/Newscoop/Article/LinkService.php b/newscoop/library/Newscoop/Article/LinkService.php index 432e5caa80..d0f58c7e97 100644 --- a/newscoop/library/Newscoop/Article/LinkService.php +++ b/newscoop/library/Newscoop/Article/LinkService.php @@ -246,7 +246,10 @@ public function getSeo($article, array $fields) $seo = trim(implode('-', array_filter($seo)), '-'); $seo = preg_replace('/[\\\\,\/\.\?"\+&%:#]/', '', $seo); - $seo = str_replace(' ', '-', $seo) . '.htm'; + if (strlen($seo) > 0) { + $seo = str_replace(' ', '-', $seo) . '.htm'; + } + return $this->encode($seo); } From 55bf96a413f3dfd78fb8ba72fd4ba91d3a3d90b8 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 09:58:33 +0200 Subject: [PATCH 26/90] [CS-5851] [Fix] Option to show photos in full size add link to original image from article image edit view --- .../NewscoopBundle/Resources/translations/articles.en.yml | 1 + .../Resources/views/BackendArticleImages/edit.html.twig | 1 + 2 files changed, 2 insertions(+) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml index 3ac4841151..5ef6f89974 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the frontend. Please check with your siteadmin if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 till 50 will be deleted from the list.' images: + see_original: See original image edit: edit_image_metadata: Edit image metadata save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendArticleImages/edit.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendArticleImages/edit.html.twig index 076942cf86..737a41bfb7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendArticleImages/edit.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendArticleImages/edit.html.twig @@ -32,6 +32,7 @@
{% set thumbnail = imageService.thumbnail(image, 400, 400, 'fit' ) %} + {{ 'articles.images.see_original'|trans }}
From e4075b3a8530a9e9298666a12b4d48f1f8f5340a Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 10:38:55 +0200 Subject: [PATCH 27/90] [CS-5853] [Fix] Date of articles in related articles search in the modal is always current day Use create_time there --- newscoop/admin-files/libs/ContextList/ContextList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/admin-files/libs/ContextList/ContextList.php b/newscoop/admin-files/libs/ContextList/ContextList.php index ed7d4bca6e..c84d690f3f 100755 --- a/newscoop/admin-files/libs/ContextList/ContextList.php +++ b/newscoop/admin-files/libs/ContextList/ContextList.php @@ -216,7 +216,7 @@ public function processItem(Article $article)
%s
- ', $article->getLanguageId(), $article->getLastModified(), $article->getWorkflowDisplayString(), $article->getType(), $translator->trans('View article', array(), 'library'), $article->getName()), + ', $article->getLanguageId(), $article->getCreationDate(), $article->getWorkflowDisplayString(), $article->getType(), $translator->trans('View article', array(), 'library'), $article->getName()), ); } From c1360a105a6e947ae869c335c516939acad68c3c Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 11:08:59 +0200 Subject: [PATCH 28/90] don't update change update_time on article update This changes update_time on every article update (like new article added to section and order of ther articles mush be changed). We manage update_time manualy in the app. --- newscoop/install/Resources/sql/campsite_core.sql | 2 +- .../install/Resources/sql/upgrade/4.4.x/2015.06.30/tables.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.30/tables.sql diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql index 2b47af5865..b3041fcf8f 100644 --- a/newscoop/install/Resources/sql/campsite_core.sql +++ b/newscoop/install/Resources/sql/campsite_core.sql @@ -283,7 +283,7 @@ CREATE TABLE `Articles` ( `ArticleOrder` int(10) unsigned NOT NULL DEFAULT '0', `comments_enabled` tinyint(1) NOT NULL DEFAULT '0', `comments_locked` tinyint(1) NOT NULL DEFAULT '0', - `time_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `time_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `object_id` int(11) DEFAULT NULL, `webcode` varchar(10) DEFAULT NULL, `indexed` timestamp NULL DEFAULT NULL, diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.30/tables.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.30/tables.sql new file mode 100644 index 0000000000..1cb8d8d5cf --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.06.30/tables.sql @@ -0,0 +1 @@ +ALTER TABLE `Articles` CHANGE `time_updated` `time_updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; From 39b8d2d6a489216512f5c3565a9c0be5b81036e7 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 12:51:02 +0200 Subject: [PATCH 29/90] change function name to uri from url --- .../function.generate_edit_uri.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 newscoop/include/smarty/campsite_plugins/function.generate_edit_uri.php diff --git a/newscoop/include/smarty/campsite_plugins/function.generate_edit_uri.php b/newscoop/include/smarty/campsite_plugins/function.generate_edit_uri.php new file mode 100644 index 0000000000..c92fa4cc6e --- /dev/null +++ b/newscoop/include/smarty/campsite_plugins/function.generate_edit_uri.php @@ -0,0 +1,40 @@ + + * @copyright 2015 Sourcefabric o.p.s. + * @license http://www.gnu.org/licenses/gpl-3.0.txt + */ + +/** + * Generate edit uri for article (to current assigned to user editor) + * + * Result of that that function should be cached in template (as it fetch article object for every call). + * + * examle: + * {{ generate_edit_uri articleNumber="1" language="en" }} + * + * Type: function + * Name: generate_edit_uri + * Purpose: Get article edit uri (for backend editor) + * + * @param array + * $params Parameters + * @param object + * $smarty The Smarty object + */ +function smarty_function_generate_edit_uri($params, &$smarty) +{ + $editorService = \Zend_Registry::get('container')->get('newscoop.editor'); + $em = \Zend_Registry::get('container')->get('em'); + + $article = $em->getRepository('Newscoop\Entity\Article') + ->getArticle($params['articleNumber'], $params['language']) + ->getOneOrNullResult(); + + if (!$article) { + return null; + } + + return $editorService->getLink($article); +} From 99e6532960cc593adbadd8c76507a5f8136d54cf Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 30 Jun 2015 12:52:19 +0200 Subject: [PATCH 30/90] remove old file --- .../function.generate_edit_url.php | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 newscoop/include/smarty/campsite_plugins/function.generate_edit_url.php diff --git a/newscoop/include/smarty/campsite_plugins/function.generate_edit_url.php b/newscoop/include/smarty/campsite_plugins/function.generate_edit_url.php deleted file mode 100644 index 0a9a7876cc..0000000000 --- a/newscoop/include/smarty/campsite_plugins/function.generate_edit_url.php +++ /dev/null @@ -1,40 +0,0 @@ - - * @copyright 2015 Sourcefabric o.p.s. - * @license http://www.gnu.org/licenses/gpl-3.0.txt - */ - -/** - * Generate edit url for article (to current assigned to user editor) - * - * Result of that that function should be cached in template (as it fetch article object for every call). - * - * examle: - * {{ generate_edit_url articleNumber="1" language="en" }} - * - * Type: function - * Name: generate_edit_url - * Purpose: Get article edit url (for backend editor) - * - * @param array - * $params Parameters - * @param object - * $smarty The Smarty object - */ -function smarty_function_generate_edit_url($params, &$smarty) -{ - $editorService = \Zend_Registry::get('container')->get('newscoop.editor'); - $em = \Zend_Registry::get('container')->get('em'); - - $article = $em->getRepository('Newscoop\Entity\Article') - ->getArticle($params['articleNumber'], $params['language']) - ->getOneOrNullResult(); - - if (!$article) { - return null; - } - - return $editorService->getLink($article); -} From 1e1d3b1fb3d39d3be31ded1850c5caf74cc5384b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 30 Jun 2015 14:45:35 +0200 Subject: [PATCH 31/90] slideshows improvements --- .../admin/views/scripts/slideshow-list.phtml | 2 +- .../views/scripts/slideshow/attach.phtml | 2 +- .../views/scripts/slideshow/create.phtml | 15 +++- .../admin/views/scripts/slideshow/edit.phtml | 11 ++- newscoop/library/Newscoop/Package/Item.php | 77 ++++++++++--------- .../config/serializer/newscoop/Item.yml | 10 ++- .../GimmeBundle/Resources/config/services.yml | 7 ++ .../translations/article_images.en.yml | 2 + 8 files changed, 85 insertions(+), 41 deletions(-) diff --git a/newscoop/application/modules/admin/views/scripts/slideshow-list.phtml b/newscoop/application/modules/admin/views/scripts/slideshow-list.phtml index 250c9bc56e..395afeb928 100644 --- a/newscoop/application/modules/admin/views/scripts/slideshow-list.phtml +++ b/newscoop/application/modules/admin/views/scripts/slideshow-list.phtml @@ -18,7 +18,7 @@ <% if (!itemsCount) { %> <% } else if (item) { %> - + <% } else { %> <% } %> diff --git a/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml b/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml index eabf196087..663d319183 100644 --- a/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml +++ b/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml @@ -44,7 +44,7 @@ $this->headScript()->appendFile($this->baseUrl('js/views/PaginatorView.js')); <% if (!itemsCount) { %> <% } else if (item) { %> - + <% } else { %> <% } %> diff --git a/newscoop/application/modules/admin/views/scripts/slideshow/create.phtml b/newscoop/application/modules/admin/views/scripts/slideshow/create.phtml index 886767de4d..64b2651dd7 100644 --- a/newscoop/application/modules/admin/views/scripts/slideshow/create.phtml +++ b/newscoop/application/modules/admin/views/scripts/slideshow/create.phtml @@ -100,10 +100,19 @@ $(function() { $('#add-sellected-to-gallery').click(function(){ $('#edit_slideshow_form').submit(); - }) + }); - $('#select-all-images').click(function(e){ + $('#select-all-images').live('click', function(e){ $('.thumbnails li figure input:checkbox[name=checked-images[]]').attr('checked', true); + $(this).attr('id', 'unselect-all-images'); + $(this).text('trans('Unselect all images', array(), 'article_images'); ?>') + e.preventDefault(); + }); + + $('#unselect-all-images').live('click', function(e){ + $('.thumbnails li figure input:checkbox[name=checked-images[]]').attr('checked', false); + $(this).attr('id', 'select-all-images'); + $(this).text('trans('Select all images', array(), 'article_images'); ?>'); e.preventDefault(); }); @@ -130,7 +139,9 @@ $(function() { images as $image) { ?>
  • +
    thumbnail($image->getPath(), 150, 150, 'fit')->getImg($this); ?>
    +
    diff --git a/newscoop/application/modules/admin/views/scripts/slideshow/edit.phtml b/newscoop/application/modules/admin/views/scripts/slideshow/edit.phtml index 0ad0b9de02..aa1f1e3e7f 100644 --- a/newscoop/application/modules/admin/views/scripts/slideshow/edit.phtml +++ b/newscoop/application/modules/admin/views/scripts/slideshow/edit.phtml @@ -121,8 +121,17 @@ $(function() { }); // /ping }) - $('#select-all-images').click(function(e){ + $('#select-all-images').live('click', function(e){ $('.thumbnails li figure input:checkbox[name=checked-images[]]').attr('checked', true); + $(this).attr('id', 'unselect-all-images'); + $(this).text('trans('Unselect all images', array(), 'article_images'); ?>') + e.preventDefault(); + }); + + $('#unselect-all-images').live('click', function(e){ + $('.thumbnails li figure input:checkbox[name=checked-images[]]').attr('checked', false); + $(this).attr('id', 'select-all-images'); + $(this).text('trans('Select all images', array(), 'article_images'); ?>'); e.preventDefault(); }); diff --git a/newscoop/library/Newscoop/Package/Item.php b/newscoop/library/Newscoop/Package/Item.php index 2308e3d23d..a31166136d 100644 --- a/newscoop/library/Newscoop/Package/Item.php +++ b/newscoop/library/Newscoop/Package/Item.php @@ -1,12 +1,12 @@ (yyyy-mm-dd): Date
    (yyyy-mm-dd) 'Add items to slideshow': 'Add items to slideshow' 'Attached Slideshows': 'Attached Slideshows' "Value is required and can't be empty": "Value is required and can't be empty" +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' \ No newline at end of file From 83dbc076426378523bba96d4a9389c34c2778ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 30 Jun 2015 14:45:50 +0200 Subject: [PATCH 32/90] added thumbnail handler --- .../Serializer/Image/ThumbnailUriHandler.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 newscoop/src/Newscoop/GimmeBundle/Serializer/Image/ThumbnailUriHandler.php diff --git a/newscoop/src/Newscoop/GimmeBundle/Serializer/Image/ThumbnailUriHandler.php b/newscoop/src/Newscoop/GimmeBundle/Serializer/Image/ThumbnailUriHandler.php new file mode 100644 index 0000000000..ffd6bcbbc3 --- /dev/null +++ b/newscoop/src/Newscoop/GimmeBundle/Serializer/Image/ThumbnailUriHandler.php @@ -0,0 +1,28 @@ + + * @copyright 2015 Sourcefabric z.ú. + * @license http://www.gnu.org/licenses/gpl-3.0.txt + */ + +namespace Newscoop\GimmeBundle\Serializer\Image; + +use JMS\Serializer\JsonSerializationVisitor; + +class ThumbnailUriHandler +{ + protected $linkService; + + public function __construct($linkService) + { + $this->linkService = $linkService; + } + + public function serializeToJson(JsonSerializationVisitor $visitor, $item, $type) + { + if ($item->getThumbnailPath()) { + return $this->linkService->getBaseUrl('/'.$item->getThumbnailPath()); + } + } +} From 52d4c67e6acad66d8006a4e2e7815ea8d6e0cf7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 30 Jun 2015 16:25:36 +0200 Subject: [PATCH 33/90] improved slideshows --- .../modules/admin/views/scripts/rendition/preview.phtml | 2 +- .../modules/admin/views/scripts/slideshow/attach.phtml | 2 +- newscoop/library/Newscoop/Image/Thumbnail.php | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/newscoop/application/modules/admin/views/scripts/rendition/preview.phtml b/newscoop/application/modules/admin/views/scripts/rendition/preview.phtml index c9158486ba..a5ebd46b69 100644 --- a/newscoop/application/modules/admin/views/scripts/rendition/preview.phtml +++ b/newscoop/application/modules/admin/views/scripts/rendition/preview.phtml @@ -1,4 +1,4 @@ -
    +
    thumbnail !== null) { echo $this->thumbnail->getImg($this); } ?> diff --git a/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml b/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml index 663d319183..833ffc479a 100644 --- a/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml +++ b/newscoop/application/modules/admin/views/scripts/slideshow/attach.phtml @@ -44,7 +44,7 @@ $this->headScript()->appendFile($this->baseUrl('js/views/PaginatorView.js')); <% if (!itemsCount) { %> <% } else if (item) { %> - + <% } else { %> <% } %> diff --git a/newscoop/library/Newscoop/Image/Thumbnail.php b/newscoop/library/Newscoop/Image/Thumbnail.php index fa30bd037f..30533a0618 100644 --- a/newscoop/library/Newscoop/Image/Thumbnail.php +++ b/newscoop/library/Newscoop/Image/Thumbnail.php @@ -48,10 +48,8 @@ public function __construct($src, $width, $height) public function getImg(\Zend_View $view) { return sprintf( - '', - $view->url(array('src' => $this->src), 'image', true, false), - $this->width, - $this->height + '
    ', + $view->url(array('src' => $this->src), 'image', true, false) ); } } From fcc26aeec0cf4fad89177e600fdd878b2143b656 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 30 Jun 2015 18:37:18 +0100 Subject: [PATCH 34/90] CS-5861 Update link to user manual --- newscoop/install/Resources/views/post-process.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/install/Resources/views/post-process.twig b/newscoop/install/Resources/views/post-process.twig index c06e16b6b9..fa49b33c96 100644 --- a/newscoop/install/Resources/views/post-process.twig +++ b/newscoop/install/Resources/views/post-process.twig @@ -8,7 +8,7 @@ Find out more
    Please read the Newscoop for Journalists and Editors manual, which covers everything required to begin publishing news.

    - Read manual + Read manual

    The administration interface
    @@ -39,4 +39,4 @@ Sends emails to subscribers alerting them when their subscription ends.

    -{% endblock %} \ No newline at end of file +{% endblock %} From fb42c171c6ffd2c3f4ccbb91deb563683c8822b7 Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 1 Jul 2015 09:14:43 +0000 Subject: [PATCH 35/90] updated translation resources --- .../NewscoopBundle/Resources/translations/articles.ar.yml | 1 + .../NewscoopBundle/Resources/translations/articles.az.yml | 1 + .../NewscoopBundle/Resources/translations/articles.be.yml | 1 + .../NewscoopBundle/Resources/translations/articles.bn.yml | 1 + .../NewscoopBundle/Resources/translations/articles.cs.yml | 1 + .../NewscoopBundle/Resources/translations/articles.da.yml | 1 + .../NewscoopBundle/Resources/translations/articles.de.yml | 1 + .../NewscoopBundle/Resources/translations/articles.de_AT.yml | 1 + .../NewscoopBundle/Resources/translations/articles.el.yml | 1 + .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 1 + .../NewscoopBundle/Resources/translations/articles.es.yml | 1 + .../NewscoopBundle/Resources/translations/articles.es_AR.yml | 1 + .../NewscoopBundle/Resources/translations/articles.fa.yml | 1 + .../NewscoopBundle/Resources/translations/articles.fr.yml | 1 + .../NewscoopBundle/Resources/translations/articles.he.yml | 1 + .../NewscoopBundle/Resources/translations/articles.hr.yml | 1 + .../NewscoopBundle/Resources/translations/articles.hu.yml | 1 + .../NewscoopBundle/Resources/translations/articles.hy.yml | 1 + .../NewscoopBundle/Resources/translations/articles.hy_AM.yml | 1 + .../NewscoopBundle/Resources/translations/articles.id.yml | 1 + .../NewscoopBundle/Resources/translations/articles.it.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ka.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ko.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ku.yml | 1 + .../NewscoopBundle/Resources/translations/articles.nb_NO.yml | 1 + .../NewscoopBundle/Resources/translations/articles.nl.yml | 1 + .../NewscoopBundle/Resources/translations/articles.pa.yml | 1 + .../NewscoopBundle/Resources/translations/articles.pl.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ps.yml | 1 + .../NewscoopBundle/Resources/translations/articles.pt.yml | 1 + .../NewscoopBundle/Resources/translations/articles.pt_BR.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ro.yml | 1 + .../NewscoopBundle/Resources/translations/articles.ru.yml | 1 + .../NewscoopBundle/Resources/translations/articles.sh.yml | 1 + .../NewscoopBundle/Resources/translations/articles.sq.yml | 1 + .../NewscoopBundle/Resources/translations/articles.sr.yml | 1 + .../NewscoopBundle/Resources/translations/articles.sv.yml | 1 + .../NewscoopBundle/Resources/translations/articles.tr.yml | 1 + .../NewscoopBundle/Resources/translations/articles.uk.yml | 1 + .../NewscoopBundle/Resources/translations/articles.zh.yml | 1 + .../NewscoopBundle/Resources/translations/articles.zh_TW.yml | 1 + 41 files changed, 41 insertions(+) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml index 13f202efb2..c171d2d7bc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ar.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml index 80ba94091e..a9bea3d4a9 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.az.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: 'Şəkilin metaməlumatıdı dəyiş' save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml index a2f03c4f5e..8948ab34bb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.be.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml index 0435880d70..468d54b496 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.bn.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml index e68e9eaa78..797555a732 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.cs.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml index 448344afe0..dc589dd76f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Er du sikker på du vil ændre lsitens navn? Navnet bruges muligvis i Newscoop skabeloner for at vise listen på hjemmesiden. Spørg hjemmesidens administrator hvis du er i tvivl.' alert: null images: + see_original: null edit: edit_image_metadata: 'Rediger billedets metadata' save: Gem diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml index 56e8ff34b3..e77b81ecfc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml index 56e8ff34b3..e77b81ecfc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.de_AT.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml index ef2e32ba90..48be6c162a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.el.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index a25d0c783d..3c2175e815 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 to 50 will be deleted from the list.' images: + see_original: null edit: edit_image_metadata: 'Edit image metadata' save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml index 28e3603ec4..498bffffca 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml index 502c0972d2..3aecf5c59a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.es_AR.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fa.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml index ee7f0df974..f763a5cd44 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.fr.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml index da3a5a9fa3..6125cac777 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.he.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml index ee61041289..292d9f77f7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hr.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml index d571542b0d..94ef2291e1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hu.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: 'Kép metaadatainak szerkesztése' save: Mentés diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml index b103cb5e45..3549f03ec8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the frontend. Please check with your siteadmin if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 till 50 will be deleted from the list.' images: + see_original: 'See original image' edit: edit_image_metadata: 'Edit image metadata' save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml index 7e99e2c821..5d552e1772 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy_AM.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.id.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml index f493e2933e..606bc3bd76 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.it.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml index 6072fff647..7aa5b212a4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ka.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml index ef37ea5dff..721bb575c5 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ko.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ku.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nb_NO.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml index b904fcc3e2..6acbf5f2a3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.nl.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml index 1e52ed2ce3..8a50fd2f90 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: 'See original image' edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml index 854476cc3d..6006ea7399 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pl.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Jesteś pewien że chcesz zmienić nazwę tej listy? Nazwa może być używana w szablonach twojego motywu do wyświetlania zawartości tej listy. Jeśli masz wątpliwości zapytaj osobę odpowiedzialną za używany motyw.' alert: null images: + see_original: null edit: edit_image_metadata: 'Edytuj metadane zdjęcia' save: Zapisz diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ps.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml index bf9a17309f..b8500ccb11 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml index 7fd67add34..d67403b90c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pt_BR.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml index 6eb802fd52..31999f31eb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ro.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml index 68a756c9c7..784e9776f3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.ru.yml @@ -198,6 +198,7 @@ articles: namechanged: 'Вы действительно хотите изменить название списка? Название может использоваться в шаблонах Newscoop для воспроизведения списка во внешнем интерфейсе. Если не уверены, проконсультируйтесь с администратором сайта.' alert: null images: + see_original: null edit: edit_image_metadata: 'Редактировать метаданные изображения' save: Сохранить diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml index 9ff9a8e731..801e8308a2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sh.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: Snimi diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sq.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml index d6018c862a..6312fe3722 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sr.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml index 49d4ef0026..2ca969b3db 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.sv.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.tr.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml index c60090c00e..cb0936a009 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.uk.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml index 1870ae7784..53e1a25ba0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: 保存 diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml index d6f4329ace..2f9f02b172 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.zh_TW.yml @@ -198,6 +198,7 @@ articles: namechanged: null alert: null images: + see_original: null edit: edit_image_metadata: null save: null From ae0b88a73a779f403c6e9b05c06e68bf23f8c18e Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 1 Jul 2015 10:40:10 +0000 Subject: [PATCH 36/90] updated translation resources --- .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index 3c2175e815..8178a4633d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -198,7 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 to 50 will be deleted from the list.' images: - see_original: null + see_original: 'See original image' edit: edit_image_metadata: 'Edit image metadata' save: Save From 7d4d8a9daa896a946b6c0c277e1dc151dc16156d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Wed, 1 Jul 2015 13:51:02 +0200 Subject: [PATCH 37/90] CS-5672 - Due to missed several fields in System Preferencies form the Save function doesn't work --- .../Form/Type/PreferencesType.php | 669 ++++++++++++------ .../views/SystemPref/index.html.twig | 155 ++-- .../Resources/views/forms.html.twig | 23 + 3 files changed, 550 insertions(+), 297 deletions(-) create mode 100644 newscoop/src/Newscoop/NewscoopBundle/Resources/views/forms.html.twig diff --git a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php index 382cb50e25..0fcf146942 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php @@ -1,6 +1,6 @@ * @copyright 2013 Sourcefabric o.p.s. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -11,15 +11,16 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Validator\Constraints as Assert; class PreferencesType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { $timeZones = array(); - array_walk(timezone_identifiers_list(), function($timeZone) use (&$timeZones) { + array_walk(timezone_identifiers_list(), function ($timeZone) use (&$timeZones) { $timeZoneGroup = (strpos($timeZone, '/') !== false) ? substr($timeZone, 0, strpos($timeZone, '/')) : $timeZone; - $value = (strpos($timeZone, '/') !== false) ? substr($timeZone, strpos($timeZone, '/')+1) : $timeZone; + $value = (strpos($timeZone, '/') !== false) ? substr($timeZone, strpos($timeZone, '/') + 1) : $timeZone; $value = str_replace('_', ' ', $value); $value = str_replace('/', ' - ', $value); $timeZones[$timeZoneGroup][$timeZone] = $value; @@ -39,27 +40,27 @@ public function buildForm(FormBuilderInterface $builder, array $options) $cacheLifetime = array(); foreach (array(0 => 'newscoop.preferences.label.disabled', - 30 => '30 Seconds', - 60 => '1 Minute', - 300 => '5 Minutes', - 900 => '15 Minutes', + 30 => '30 Seconds', + 60 => '1 Minute', + 300 => '5 Minutes', + 900 => '15 Minutes', 1800 => '30 Minutes', 3600 => '1 Hour', - 3600*24 => '1 Day', - 3600*24*2 => '2 Days', - 3600*24*3 => '3 Days', - 3600*24*4 => '4 Days', - 3600*24*5 => '5 Days', - 3600*24*6 => '6 Days', - 3600*24*7 => '1 Week', - 3600*24*14 => '2 Weeks', - 3600*24*21 => '3 Weeks', - 3600*24*31 => '1 Month', - 3600*24*61 => '2 Months', - 3600*24*91 => '3 Months', - 3600*24*183 => '6 Months', - 3600*24*365 => '1 Year', - -1 => 'Infinite') as $k => $v) { + 3600 * 24 => '1 Day', + 3600 * 24 * 2 => '2 Days', + 3600 * 24 * 3 => '3 Days', + 3600 * 24 * 4 => '4 Days', + 3600 * 24 * 5 => '5 Days', + 3600 * 24 * 6 => '6 Days', + 3600 * 24 * 7 => '1 Week', + 3600 * 24 * 14 => '2 Weeks', + 3600 * 24 * 21 => '3 Weeks', + 3600 * 24 * 31 => '1 Month', + 3600 * 24 * 61 => '2 Months', + 3600 * 24 * 91 => '3 Months', + 3600 * 24 * 183 => '6 Months', + 3600 * 24 * 365 => '1 Year', + -1 => 'Infinite', ) as $k => $v) { $cacheLifetime[$k] = $v; } @@ -74,397 +75,615 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('siteonline', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('title', null, array( - 'attr' => array('maxlength'=>'100', 'size' => '64'), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => '64'), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 100, + )), + ), )) ->add('meta_keywords', null, array( - 'attr' => array('maxlength'=>'100', 'size' => '64'), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => '64'), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 100, + )), + ), )) ->add('meta_description', null, array( - 'attr' => array('maxlength' => '100', 'size' => '64'), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => '64'), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 100, + )), + ), )) ->add('timezone', 'choice', array( - 'choices' => $timeZones, + 'choices' => $timeZones, 'empty_value' => 'newscoop.preferences.label.disabled', - 'required' => false + 'required' => false, )) ->add('cache_engine', 'choice', array( - 'choices' => $cacheEngines, + 'choices' => $cacheEngines, 'empty_value' => 'Array', - 'required' => false - )) - ->add('cache_engine_host', 'text', array( - 'error_bubbling' => true, - 'required' => false - )) - ->add('cache_engine_port', 'text', array( - 'error_bubbling' => true, - 'required' => false + 'required' => false, )) + ->add('cache_engine_host', 'text') + ->add('cache_engine_port', 'text') ->add('cache_template', 'choice', array( - 'choices' => $cacheTemplate, + 'choices' => $cacheTemplate, 'empty_value' => 'newscoop.preferences.label.disabled', - 'required' => false + 'required' => false, )) ->add('cache_image', 'choice', array( - 'choices' => $cacheLifetime, - 'required' => true + 'choices' => $cacheLifetime, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('allow_recovery', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('secret_key', null, array( - 'attr' => array('maxlength' => '32', 'size' => '64'), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => '64'), + 'constraints' => array( + new Assert\Length(array( + 'max' => 32, + )), + ), )) ->add('session_lifetime', 'integer', array( - 'attr' => array('maxlength' => '5', 'max' => '86400', 'min' => 0), - 'error_bubbling' => true, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 86400, + )), + ), )) ->add('separator', null, array( - 'attr' => array('maxlength' => '2', 'size' => '5'), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => '5'), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 2, + )), + ), )) ->add('captcha', 'integer', array( - 'attr' => array('max' => 99, 'min' => 0), - 'error_bubbling' => true, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 99, + )), + ), )) ->add('max_upload_size', null, array( - 'attr' => array('maxlength' => '12', 'size' => '5'), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => '5'), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 12, + )), + ), )) ->add('automatic_collection', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('smtp_host', null, array( - 'attr' => array('maxlength' => 100, 'size' => 64), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => 64), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 100, + )), + ), )) ->add('smtp_port', 'integer', array( - 'attr' => array('max' => 999999, 'min' => 1), - 'error_bubbling' => true, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 1, + 'max' => 999999, + )), + ), )) ->add('email_from', 'email', array( - 'attr' => array('maxlength' => 100, 'size' => 64), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => 64), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Email(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 100, + )), + ), )) ->add('image_ratio', 'integer', array( 'attr' => array('max' => 100, 'min' => 1), - 'error_bubbling' => true, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 1, + 'max' => 100, + )), + ), )) ->add('image_width', 'integer', array( - 'attr' => array('max' => 999999, 'min' => 0), - 'error_bubbling' => true, - 'required' => false + 'constraints' => array( + new Assert\Range(array( + 'min' => 0, + 'max' => 999999, + )), + ), )) ->add('image_height', 'integer', array( - 'attr' => array('max' => 999999, 'min' => 0), - 'error_bubbling' => true, - 'required' => false + 'constraints' => array( + new Assert\Range(array( + 'min' => 0, + 'max' => 999999, + )), + ), )) ->add('zoom', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('mediaRichTextCaptions', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('mediaCaptionLength', 'integer', array( - 'attr' => array('max' <= 999999, 'min' => 0), - 'error_bubbling' => true, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999999, + )), + ), )) ->add('use_replication', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('use_replication_host', null, array( - 'attr' => array('maxlength' => 60, 'size' => 30), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 30), + 'constraints' => array( + new Assert\Length(array( + 'max' => 60, + )), + ), )) ->add('use_replication_user', null, array( - 'attr' => array('maxlength' => 20, 'size' => 30), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 30), + 'constraints' => array( + new Assert\Length(array( + 'max' => 20, + )), + ), )) ->add('use_replication_password', null, array( - 'attr' => array('maxlength' => 20, 'size' => 30), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 30), + 'constraints' => array( + new Assert\Length(array( + 'max' => 20, + )), + ), )) ->add('use_replication_port', 'integer', array( - 'attr' => array('max' => 999999, 'min' => 0), - 'required' => false + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999999, + )), + ), )) ->add('template_filter', 'text', array( - 'attr' => array('maxlength' => 50, 'size' => 30), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => 30), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 50, + )), + ), )) ->add('mysql_client_command_path', 'text', array( - 'attr' => array('maxlength' => 200, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('center_latitude_default', 'number', array( 'attr' => array('size' => 10), - 'error_bubbling' => true, - 'invalid_message' => 'newscoop.preferences.error.latitude', 'precision' => 6, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'float')), + ), )) ->add('center_longitude_default', 'number', array( 'attr' => array('size' => 10), - 'error_bubbling' => true, - 'invalid_message' => 'newscoop.preferences.error.longitude', 'precision' => 6, - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'float')), + ), )) ->add('map_display_resolution_default', 'integer', array( - 'attr' => array('max' => 99, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 99, + )), + ), )) ->add('map_view_width_default', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_view_height_default', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_auto_cSS_file', null, array( - 'attr' => array('maxlength' => 80, 'size' => 50), - 'error_bubbling' => true, - 'required' => true - )) - ->add('map_auto_focus_default', 'checkbox', array( - 'required' => false + 'attr' => array('size' => 50), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 80, + )), + ), )) + ->add('map_auto_focus_default', 'checkbox') ->add('map_auto_focus_max_zoom', 'integer', array( - 'attr' => array('max' => 18, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 18, + )), + ), )) ->add('map_auto_focus_border', 'integer', array( - 'attr' => array('max' => 999, 'min' => -99), - 'required' => true - )) - ->add('map_provider_available_google_v3', 'checkbox', array( - 'required' => false - )) - ->add('map_provider_available_map_quest', 'checkbox', array( - 'required' => false - )) - ->add('map_provider_available_oSM', 'checkbox', array( - 'required' => false + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => -99, + 'max' => 999, + )), + ), )) + ->add('map_provider_available_google_v3', 'checkbox') + ->add('map_provider_available_map_quest', 'checkbox') + ->add('map_provider_available_oSM', 'checkbox') ->add('map_provider_default', 'choice', array( - 'choices' => array( + 'choices' => array( 'GoogleV3' => 'Google Maps', 'MapQuest' => 'MapQuest Open', 'OSM' => 'OpenStreetMap', ), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('geo_search_local_geonames', 'checkbox', array( - 'required' => false + 'required' => false, )) ->add('geo_search_mapquest_nominatim', 'checkbox', array( - 'required' => false + 'required' => false, )) ->add('geo_search_preferred_language', 'choice', array( - 'choices' => $languages, - 'required' => true + 'choices' => $languages, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('map_marker_directory', null, array( - 'attr' => array('maxlength' => 80, 'size' => 50), - 'error_bubbling' => true, - 'required' => true - )) - ->add('map_marker_source_default', null, array( - 'required' => false + 'attr' => array('size' => 50), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'string')), + new Assert\Length(array( + 'max' => 80, + )), + ), )) + ->add('map_marker_source_default', null, array()) ->add('map_popup_width_min', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_popup_height_min', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_width_you_tube', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_height_you_tube', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_width_vimeo', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_height_vimeo', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_width_flash', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('map_video_height_flash', 'integer', array( - 'attr' => array('max' => 999, 'min' => 0), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 0, + 'max' => 999, + )), + ), )) ->add('geo_flash_server', null, array( - 'attr' => array('maxlength' => 80, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 80, + )), + ), )) ->add('geo_flash_directory', null, array( - 'attr' => array('maxlength' => 80, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('facebook_appid', null, array( - 'attr' => array('maxlength' => 200, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('facebook_appsecret', null, array( - 'attr' => array('maxlength' => 200, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('recaptchaPublicKey', null, array( - 'attr' => array('maxlength' => 200, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('recaptchaPrivateKey', null, array( - 'attr' => array('maxlength' => 200, 'size' => 40), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 40), + 'constraints' => array( + new Assert\Length(array( + 'max' => 200, + )), + ), )) ->add('recaptchaSecure', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), 'data' => 'N', - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('userGarbageActive', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('userGarbageDays', 'integer', array( - 'attr' => array('max' => 999, 'min' => 1), - 'required' => true + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Type(array('type' => 'integer')), + new Assert\Range(array( + 'min' => 1, + 'max' => 999, + )), + ), )) ->add('smartyUseProtocol', 'choice', array( - 'choices' => array( + 'choices' => array( 'Y' => 'newscoop.preferences.label.yesoption', - 'N' => 'newscoop.preferences.label.nooption' + 'N' => 'newscoop.preferences.label.nooption', ), - 'error_bubbling' => true, 'multiple' => false, 'expanded' => true, - 'required' => true, + 'constraints' => array( + new Assert\NotBlank(), + ), )) ->add('cronJobNotificationEmail', 'email', array( - 'attr' => array('maxlength' => 255, 'size' => 64), - 'error_bubbling' => true, - 'required' => true + 'attr' => array('size' => 64), + 'constraints' => array( + new Assert\NotBlank(), + new Assert\Email(), + new Assert\Length(array( + 'max' => 255, + )), + ), )) ->add('cronJobSmtpSender', 'email', array( - 'attr' => array('maxlength' => 100, 'size' => 64), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => 64), + 'constraints' => array( + new Assert\Email(), + new Assert\Length(array( + 'max' => 255, + )), + ), )) ->add('cronJobSmtpSenderName', null, array( - 'attr' => array('maxlength'=>'100', 'size' => '64'), - 'error_bubbling' => true, - 'required' => false + 'attr' => array('size' => '64'), + 'constraints' => array( + new Assert\Length(array( + 'max' => 100, + )), + ), )); } public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults(array( - 'translation_domain' => 'system_pref' + 'translation_domain' => 'system_pref', )); $resolver->setRequired(array( 'cacheService', )); - } public function getName() diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/SystemPref/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/SystemPref/index.html.twig index eabab6deb2..7e396a0953 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/SystemPref/index.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/SystemPref/index.html.twig @@ -2,6 +2,7 @@ {% trans_default_domain "system_pref" %} {% block admin_title %}{{ 'newscoop.preferences.label.title'|trans }} - {{ parent() }}{% endblock %} {% block admin_page_title_content %}{{ 'newscoop.preferences.label.header'|trans }}{% endblock %} +{% form_theme form 'NewscoopNewscoopBundle::forms.html.twig' %} {% block admin_stylesheets %} @@ -40,7 +41,7 @@ table.cron-jobs td:nth-child(2) { {{ flashMessage }}
    {% endfor %} -
    +
      @@ -67,55 +68,55 @@ table.cron-jobs td:nth-child(2) {
      - {{ form_widget(form.siteonline) }} + {{ form_row(form.siteonline) }}
      - {{ form_widget(form.title, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.title, {'attr' : {'class' : 'input_text'}}) }}
      - {{ form_widget(form.meta_keywords, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.meta_keywords, {'attr' : {'class' : 'input_text'}}) }}
      - {{ form_widget(form.meta_description, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.meta_description, {'attr' : {'class' : 'input_text'}}) }}
      - {{ form_widget(form.timezone, {'attr' : {'class' : 'input_select wide'}}) }} + {{ form_row(form.timezone, {'attr' : {'class' : 'input_select wide'}}) }}
      - {{ form_widget(form.allow_recovery) }} + {{ form_row(form.allow_recovery) }}
      - {{ form_widget(form.email_from, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.email_from, {'attr' : {'class' : 'input_text'}}) }}
      - {{ form_widget(form.secret_key, {'attr' : {'class' : 'input_text', 'disabled': 'disabled'}}) }} + {{ form_row(form.secret_key, {'attr' : {'class' : 'input_text', 'disabled': 'disabled'}}) }}
      - {{ form_widget(form.session_lifetime, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.session_lifetime, {'attr' : {'class' : 'input_text'}}) }} {% if php_ini_max_seconds %} <= {{ php_ini_max_seconds }}, {{ 'newscoop.preferences.label.sessionlifetimemsg'|trans }} @@ -125,19 +126,19 @@ table.cron-jobs td:nth-child(2) {
      - {{ form_widget(form.separator, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }} + {{ form_row(form.separator, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }}
      - {{ form_widget(form.captcha, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }} + {{ form_row(form.captcha, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }}
      - {{ form_widget(form.max_upload_size, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }} + {{ form_row(form.max_upload_size, {'attr' : {'class' : 'input_text', 'style' : 'width: 50px'}}) }}

      {{ 'newscoop.preferences.label.maxuploadmsg'|trans({'%max%': upload_min_filesize}) }}

      {% if hasManagePermission %} @@ -145,7 +146,7 @@ table.cron-jobs td:nth-child(2) {
      - {{ form_widget(form.automatic_collection) }} + {{ form_row(form.automatic_collection) }}
      {% endif %}
      @@ -158,19 +159,19 @@ table.cron-jobs td:nth-child(2) {
      - {{ form_widget(form.cache_engine, {'attr' : {'class' : 'input_select wide'}}) }} + {{ form_row(form.cache_engine, {'attr' : {'class' : 'input_select wide'}}) }}
      - {{ form_widget(form.cache_engine_host, {'attr' : {'class' : 'input_text wide'}}) }} + {{ form_row(form.cache_engine_host, {'attr' : {'class' : 'input_text wide'}}) }}
      - {{ form_widget(form.cache_engine_port, {'attr' : {'class' : 'input_text','style' : 'width: 81px;'}}) }} + {{ form_row(form.cache_engine_port, {'attr' : {'class' : 'input_text','style' : 'width: 81px;'}}) }}
      @@ -181,14 +182,14 @@ table.cron-jobs td:nth-child(2) {
      - {{ form_widget(form.cache_template, {'attr' : {'class' : 'input_select wide'}}) }} + {{ form_row(form.cache_template, {'attr' : {'class' : 'input_select wide'}}) }}
      {% endif %}
      - {{ form_widget(form.cache_image, {'attr' : {'class' : 'input_select wide'}}) }} + {{ form_row(form.cache_image, {'attr' : {'class' : 'input_select wide'}}) }}
    @@ -240,19 +241,19 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.cronJobNotificationEmail, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.cronJobNotificationEmail, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.cronJobSmtpSender, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.cronJobSmtpSender, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.cronJobSmtpSenderName, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.cronJobSmtpSenderName, {'attr' : {'class' : 'input_text'}}) }}
    @@ -265,13 +266,13 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.smtp_host, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.smtp_host, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.smtp_port, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.smtp_port, {'attr' : {'class' : 'input_text'}}) }}
    @@ -282,38 +283,38 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.image_ratio, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} % + {{ form_row(form.image_ratio, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} %
    - {{ form_widget(form.image_width, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} pixels + {{ form_row(form.image_width, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} pixels
    - {{ form_widget(form.image_height, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} pixels + {{ form_row(form.image_height, {'attr' : {'class' : 'input_text', 'style' : 'width: 67px'}}) }} pixels
    - {{ form_widget(form.zoom) }} + {{ form_row(form.zoom) }}
    - {{ form_widget(form.mediaRichTextCaptions) }} + {{ form_row(form.mediaRichTextCaptions) }}
    - {{ form_widget(form.mediaCaptionLength) }} {{ 'newscoop.preferences.label.mediaCaptionLength_after'|trans }} + {{ form_row(form.mediaCaptionLength) }} {{ 'newscoop.preferences.label.mediaCaptionLength_after'|trans }}
    @@ -329,113 +330,113 @@ table.cron-jobs td:nth-child(2) { {{ 'newscoop.preferences.label.mysqlpath'|trans }}
    - {{ form_widget(form.mysql_client_command_path, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.mysql_client_command_path, {'attr' : {'class' : 'input_text'}}) }}
    {% endif %}
    - {{ form_widget(form.center_latitude_default, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.center_latitude_default, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.center_longitude_default, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.center_longitude_default, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.map_display_resolution_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_display_resolution_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    {% if hasManagePermission %}
    - {{ form_widget(form.map_view_width_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_view_width_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_view_height_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_view_height_default, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    {% endif %}
    - {{ form_widget(form.map_auto_cSS_file, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.map_auto_cSS_file, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.map_auto_focus_default, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.map_auto_focus_default, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.map_auto_focus_max_zoom, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_auto_focus_max_zoom, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_auto_focus_border, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_auto_focus_border, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_provider_available_google_v3) }} + {{ form_row(form.map_provider_available_google_v3) }}
    - {{ form_widget(form.map_provider_available_map_quest) }} + {{ form_row(form.map_provider_available_map_quest) }}
    - {{ form_widget(form.map_provider_available_oSM) }} + {{ form_row(form.map_provider_available_oSM) }}
    - {{ form_widget(form.map_provider_default, {'attr' : {'class' : 'input_select'}}) }} + {{ form_row(form.map_provider_default, {'attr' : {'class' : 'input_select'}}) }}
    - {{ form_widget(form.geo_search_local_geonames) }} + {{ form_row(form.geo_search_local_geonames) }}
    - {{ form_widget(form.geo_search_mapquest_nominatim) }} + {{ form_row(form.geo_search_mapquest_nominatim) }}
    - {{ form_widget(form.geo_search_preferred_language, {'attr' : {'class' : 'input_select'}}) }} + {{ form_row(form.geo_search_preferred_language, {'attr' : {'class' : 'input_select'}}) }}
    {% if hasManagePermission %}
    - {{ form_widget(form.map_marker_directory, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.map_marker_directory, {'attr' : {'class' : 'input_text'}}) }}
    @@ -455,13 +456,13 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.map_popup_width_min, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_popup_width_min, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_popup_height_min, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_popup_height_min, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    {% endif %} @@ -474,49 +475,49 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.map_video_width_you_tube, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_width_you_tube, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_video_height_you_tube, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_height_you_tube, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_video_width_vimeo, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_width_vimeo, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_video_height_vimeo, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_height_vimeo, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_video_width_flash, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_width_flash, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.map_video_height_flash, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }} + {{ form_row(form.map_video_height_flash, {'attr' : {'class' : 'input_text', 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.geo_flash_server, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.geo_flash_server, {'attr' : {'class' : 'input_text' }}) }}
    - {{ form_widget(form.geo_flash_directory, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.geo_flash_directory, {'attr' : {'class' : 'input_text' }}) }}
    @@ -528,13 +529,13 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.facebook_appid, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.facebook_appid, {'attr' : {'class' : 'input_text' }}) }}
    - {{ form_widget(form.facebook_appsecret, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.facebook_appsecret, {'attr' : {'class' : 'input_text' }}) }}
    @@ -544,49 +545,49 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.use_replication) }} + {{ form_row(form.use_replication) }}

    {{ 'newscoop.preferences.label.serverdb'|trans }}

    - {{ form_widget(form.use_replication_host, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.use_replication_host, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.use_replication_user, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.use_replication_user, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.use_replication_password, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.use_replication_password, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.use_replication_port, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.use_replication_port, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.template_filter, {'attr' : {'class' : 'input_text'}}) }} + {{ form_row(form.template_filter, {'attr' : {'class' : 'input_text'}}) }}
    - {{ form_widget(form.userGarbageActive) }} + {{ form_row(form.userGarbageActive) }}

    {{ 'newscoop.preferences.label.usergarbagedaysinfo'|trans }}

    - {{ form_widget(form.userGarbageDays, {'attr' : {'class' : 'input_text' , 'style' : 'width: 81px;'}}) }} + {{ form_row(form.userGarbageDays, {'attr' : {'class' : 'input_text' , 'style' : 'width: 81px;'}}) }}
    - {{ form_widget(form.smartyUseProtocol) }} + {{ form_row(form.smartyUseProtocol) }}
    @@ -598,19 +599,19 @@ table.cron-jobs td:nth-child(2) {
    - {{ form_widget(form.recaptchaPublicKey, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.recaptchaPublicKey, {'attr' : {'class' : 'input_text' }}) }}
    - {{ form_widget(form.recaptchaPrivateKey, {'attr' : {'class' : 'input_text' }}) }} + {{ form_row(form.recaptchaPrivateKey, {'attr' : {'class' : 'input_text' }}) }}
    - {{ form_widget(form.recaptchaSecure) }} + {{ form_row(form.recaptchaSecure) }}
    @@ -823,5 +824,15 @@ $( document ).ready(function() { popover($('#smartyuseprotocol-popover'), '{{ 'newscoop.preferences.popover.smartyuseprotocol'|trans }}'); popover($('#cronjobemails'), '{{ 'newscoop.preferences.popover.cronJobEmail'|trans }}'); popover($('#cronjobsender'), '{{ 'newscoop.preferences.popover.cronJobSenderEmail'|trans }}'); + $(document).ready(function(){ + if ($('.has-error').offset()) { + var tabPane = $(".has-error :input").parents('.tab-pane'); + $.each(tabPane, function(index, value) { + $('.nav-tabs a[href="#' + $(value).attr('id') + '"]').tab('show'); + }); + + $(window).scrollTop($('.has-error').offset().top - 50); + } + }); //--> {% endblock %} diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/forms.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/forms.html.twig new file mode 100644 index 0000000000..b44eb595c8 --- /dev/null +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/forms.html.twig @@ -0,0 +1,23 @@ +{% extends 'form_div_layout.html.twig' %} +{% block form_row %} +{% spaceless %} +
    +
    + {% if errors|length > 0 %} + {{ form_widget(form, {'attr' : {'style' : 'border: 1px solid #b94a48; background-color: #FFF7F7;' }}) }} + {% else %} + {{ form_widget(form) }} + {% endif %} + {% for error in errors %} + + {{ + error.messagePluralization is null + ? error.messageTemplate|trans(error.messageParameters, 'validators') + : error.messageTemplate|transchoice(error.messagePluralization, error.messageParameters, 'validators') + }} + + {% endfor %} +
    +
    +{% endspaceless %} +{% endblock form_row %} \ No newline at end of file From 572aaff2c93e93cada4c81b57e867cfc5a32fb4a Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Wed, 1 Jul 2015 13:57:13 +0200 Subject: [PATCH 38/90] [CS-5863] [Fix] User without user type can edit and delete comments use correct permissions --- .../NewscoopBundle/Controller/CommentsController.php | 2 +- newscoop/src/Newscoop/NewscoopBundle/Menu/Builder.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php index 91cd5400ce..1cd8be20f2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php @@ -36,7 +36,7 @@ public function indexAction(Request $request) $blogService = $this->get('blog'); $user = $userService->getCurrentUser(); - if ($blogService->isBlogger($user)) { + if (!$user->hasPermission('ModerateComment')) { throw new AccessDeniedException(); } diff --git a/newscoop/src/Newscoop/NewscoopBundle/Menu/Builder.php b/newscoop/src/Newscoop/NewscoopBundle/Menu/Builder.php index 7fe9cdae82..1cf690d28d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Menu/Builder.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Menu/Builder.php @@ -224,7 +224,11 @@ private function prepareContentMenu($menu, $modern) $this->addChild( $menu, $translator->trans('comments.label.menu', array(), 'new_comments'), - array('uri' => $this->container->get('router')->generate('newscoop_newscoop_comments_index')) + array( + 'uri' => $this->container->get('router')->generate('newscoop_newscoop_comments_index'), + 'resource' => 'comment', + 'privilege' => 'moderate', + ) ); $this->addChild($menu, $translator->trans('Feedback', array(), 'home'), array('zend_route' => array( From e733e519d77822069129c113c3cbdf581556bc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 2 Jul 2015 16:20:11 +0200 Subject: [PATCH 39/90] CS-5804 - Subtopics list broken remove dump --- newscoop/classes/ArticleTopic.php | 36 ++++++- .../NewscoopBundle/Services/TopicService.php | 12 +-- .../template_engine/metaclasses/MetaTopic.php | 99 +++++++++---------- 3 files changed, 87 insertions(+), 60 deletions(-) diff --git a/newscoop/classes/ArticleTopic.php b/newscoop/classes/ArticleTopic.php index af8b77c5f6..34dfbdac72 100644 --- a/newscoop/classes/ArticleTopic.php +++ b/newscoop/classes/ArticleTopic.php @@ -276,10 +276,12 @@ public static function GetList(array $p_parameters, $p_order = null, } if (count($rootTopicIds) > 0) { - $subtopicsQuery = Topic::BuildSubtopicsQueryWithoutDepth($rootTopicIds); - $whereCondition = 'TopicId IN ('.$subtopicsQuery->buildQuery().')'; - $selectClauseObj->addWhere($whereCondition); - $countClauseObj->addWhere($whereCondition); + $subtopicsQuery = self::buildSubtopicsQueryWithoutDepth($rootTopicIds); + if (!empty($subtopicsQuery)) { + $whereCondition = 'TopicId IN ('.implode(',', $subtopicsQuery).')'; + $selectClauseObj->addWhere($whereCondition); + $countClauseObj->addWhere($whereCondition); + } } // sets the main table and columns to be fetched @@ -304,6 +306,7 @@ public static function GetList(array $p_parameters, $p_order = null, // builds the query and executes it $selectQuery = $selectClauseObj->buildQuery(); + $topics = $g_ado_db->GetAll($selectQuery); if (is_array($topics)) { $countQuery = $countClauseObj->buildQuery(); @@ -325,6 +328,31 @@ public static function GetList(array $p_parameters, $p_order = null, return $articleTopicsList; } // fn GetList + /** + * Retrieves the subtopics of the given parent. + * + * @param integer $p_parentId - parent topic identifier + * + * @return array + */ + private static function buildSubtopicsQueryWithoutDepth($p_parentIds = 0) + { + $p_parentIds = is_array($p_parentIds)? $p_parentIds: array($p_parentIds); + $em = \Zend_Registry::get('container')->getService('em'); + $childrenIds = array(); + foreach ($p_parentIds as $p_parentId) { + $topic = $em->getReference('Newscoop\NewscoopBundle\Entity\Topic', $p_parentId); + if ($topic) { + $children = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->childrenWithTranslations($topic); + foreach ((array) $children->getArrayResult() as $key => $value) { + $childrenIds[] = $value['id']; + } + } + } + + return $childrenIds; + } + /** * Processes a paremeter (condition) coming from template tags. * diff --git a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php index 18c0919483..152dfc126e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php @@ -5,6 +5,7 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt */ + namespace Newscoop\NewscoopBundle\Services; use Newscoop\NewscoopBundle\Entity\Topic; @@ -239,7 +240,7 @@ public function reorderRootNodes($rootNodes, $order = array()) foreach ($rootNodes as $rootNode) { if ($rootNode->getId() == $item) { $rootNode->setOrder($counter + 1); - $counter++; + ++$counter; } } } @@ -247,7 +248,7 @@ public function reorderRootNodes($rootNodes, $order = array()) $counter = 1; foreach ($rootNodes as $rootNode) { $rootNode->setOrder($counter); - $counter++; + ++$counter; } } @@ -361,7 +362,6 @@ public function getTopicByFullName($fullName) $name = substr($fullName, 0, $lastColon); $languageCode = substr($fullName, $lastColon + 1); - $topicTranslation = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation')->findOneBy(array( 'content' => $name, 'locale' => $languageCode, @@ -380,12 +380,12 @@ public function getTopicByFullName($fullName) * combined with the language and language code. * $string parameter value can be: "test", 20, "test:en". * - * @param string $string Topic search phrase - * @param string $locale Locale + * @param string $string Topic search phrase + * @param string|null $locale Locale * * @return Topic|null */ - public function getTopicBy($string, $locale) + public function getTopicBy($string, $locale = null) { $topic = $this->getTopicRepository() ->getTopicByIdOrName($string, $locale) diff --git a/newscoop/template_engine/metaclasses/MetaTopic.php b/newscoop/template_engine/metaclasses/MetaTopic.php index 85220987a2..eaa8e9101f 100755 --- a/newscoop/template_engine/metaclasses/MetaTopic.php +++ b/newscoop/template_engine/metaclasses/MetaTopic.php @@ -1,7 +1,6 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -9,60 +8,68 @@ require_once __DIR__.'/MetaDbObject.php'; /** - * Meta topic class + * Meta topic class. */ class MetaTopic extends MetaDbObject { /** - * Topic + * Topic. + * * @var Topic object */ private $topic; /** - * Topic id - * @var integer + * Topic id. + * + * @var int */ public $identifier; /** - * Topic name + * Topic name. + * * @var string */ public $name; /** - * Topic full name e.g. topic:en + * Topic full name e.g. topic:en. + * * @var string */ public $value; /** - * Is topic root - * @var boolean + * Is topic root. + * + * @var bool */ public $is_root; /** - * Parent topic + * Parent topic. + * * @var MetaTopic */ public $parent; /** - * Checks if topic is defined - * @var boolean + * Checks if topic is defined. + * + * @var bool */ public $defined; /** - * Alias to identifier - * @var integer + * Alias to identifier. + * + * @var int */ public $id; /** - * Construct + * Construct. * * @param string $topicIdOrName */ @@ -77,30 +84,28 @@ public function __construct($topicIdOrName = null, $languageCode = null) if ($cacheService->contains($cacheKey)) { $this->topic = $cacheService->fetch($cacheKey); } else { - $em = \Zend_Registry::get('container')->getService('em'); - $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); if ($languageCode) { $locale = $languageCode; } else { $locale = $this->getLocale(); } - $topic = $repository->getTopicByIdOrName($topicIdOrName, $locale)->getArrayResult(); + $topicService = \Zend_Registry::get('container')->getService('newscoop_newscoop.topic_service'); + $topic = $topicService->getTopicBy($topicIdOrName, $locale); + if ($topic) { + $topic->setTranslatableLocale($locale); + $this->topic = $topic; + } - if (!empty($topic)) { - $this->topic = $topic[0]; - $this->topic['locale'] = $locale; + if (!$this->topic) { + return; } $cacheService->save($cacheKey, $this->topic); } - if (empty($this->topic)) { - return; - } - - $this->id = $this->topic['id']; - $this->identifier = $this->topic['id']; + $this->id = $this->topic->getId(); + $this->identifier = $this->topic->getId(); $this->name = $this->getName(); $this->value = $this->getValue(); $this->is_root = $this->isRoot(); @@ -108,22 +113,21 @@ public function __construct($topicIdOrName = null, $languageCode = null) $this->defined = isset($this->topic); } - protected function getName($languageId = null) + protected function getName() { - if ($languageId) { - $em = \Zend_Registry::get('container')->getService('em'); - $locale = $em->getReference('Newscoop\Entity\Language', $languageId)->getCode(); - $titleByLanguage = null; - foreach ($this->topic['translations'] as $translation) { - if ($translation['locale'] === $locale) { - $titleByLanguage = $translation['content']; - } - } + if ($this->topic->getTitle() !== '') { + return $this->topic->getTitle(); + } - return $titleByLanguage; + $titleByLanguage = null; + $currentLocale = \CampTemplate::singleton()->context()->language->code; + foreach ($this->topic->getTranslations() as $translation) { + if ($translation->getLocale() === $currentLocale) { + $titleByLanguage = $translation->getContent(); + } } - return $this->topic['title']; + return $titleByLanguage; } protected function getLocale() @@ -133,22 +137,17 @@ protected function getLocale() protected function getValue() { - if (!isset($this->topic) || empty($this->topic)) { - return; - } - - $name = $this->topic['title']; - if (empty($name)) { + if (!$this->topic && !$this->name) { return; } - return $name.':'.$this->topic['locale']; + return $this->name.':'.$this->topic->getTranslatableLocale(); } protected function isRoot() { - if (isset($this->topic['id']) && isset($this->topic['root'])) { - if ($this->topic['root'] == $this->topic['id']) { + if ($this->topic && $this->topic->getRoot()) { + if ($this->topic->getRoot() == $this->id) { return true; } @@ -158,8 +157,8 @@ protected function isRoot() protected function getParent() { - if (isset($this->topic['id']) && isset($this->topic['parent'])) { - return new MetaTopic($this->topic['parent']['id'], $this->topic['locale']); + if ($this->topic && $this->parent) { + return new self($this->parent->getId(), $this->topic->getTranslatableLocale()); } return; From 525c86fb86771d0f7447da4f81058ee822095c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 2 Jul 2015 16:31:54 +0200 Subject: [PATCH 40/90] rename method --- newscoop/classes/ArticleTopic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/classes/ArticleTopic.php b/newscoop/classes/ArticleTopic.php index 34dfbdac72..13a56dfa7a 100644 --- a/newscoop/classes/ArticleTopic.php +++ b/newscoop/classes/ArticleTopic.php @@ -276,7 +276,7 @@ public static function GetList(array $p_parameters, $p_order = null, } if (count($rootTopicIds) > 0) { - $subtopicsQuery = self::buildSubtopicsQueryWithoutDepth($rootTopicIds); + $subtopicsQuery = self::buildSubtopicsArray($rootTopicIds); if (!empty($subtopicsQuery)) { $whereCondition = 'TopicId IN ('.implode(',', $subtopicsQuery).')'; $selectClauseObj->addWhere($whereCondition); @@ -335,7 +335,7 @@ public static function GetList(array $p_parameters, $p_order = null, * * @return array */ - private static function buildSubtopicsQueryWithoutDepth($p_parentIds = 0) + private static function buildSubtopicsArray($p_parentIds = 0) { $p_parentIds = is_array($p_parentIds)? $p_parentIds: array($p_parentIds); $em = \Zend_Registry::get('container')->getService('em'); From 90e61eb7725193b65be495ed3726ee0dff3679f5 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Fri, 3 Jul 2015 10:10:59 +0200 Subject: [PATCH 41/90] [Improvement] Add links to REST API documentation in admin ui links are in: * help page * configure public resources --- .../modules/admin/views/scripts/application/help.phtml | 2 +- .../Resources/views/ConfigureApi/configure.html.twig | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.en.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.en.yml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/newscoop/application/modules/admin/views/scripts/application/help.phtml b/newscoop/application/modules/admin/views/scripts/application/help.phtml index 6adaa2c322..e02324d687 100644 --- a/newscoop/application/modules/admin/views/scripts/application/help.phtml +++ b/newscoop/application/modules/admin/views/scripts/application/help.phtml @@ -6,7 +6,7 @@ $this->headTitle($translator->trans('Help', array(), 'help').' - Newscoop Admin'
    trans('Version', array(), 'help'); ?>:
    version; ?>
    -
    trans('REST API Version', array(), 'help'); ?>:
    api_version; ?>
    +
    trans('REST API Version', array(), 'help'); ?>:
    api_version; ?> (trans('Documentation', array(), 'help'); ?>)
    trans('Release date', array(), 'help'); ?>:
    date; ?>
    diff --git a/newscoop/src/Newscoop/GimmeBundle/Resources/views/ConfigureApi/configure.html.twig b/newscoop/src/Newscoop/GimmeBundle/Resources/views/ConfigureApi/configure.html.twig index 92a924d9dc..d3776406ec 100644 --- a/newscoop/src/Newscoop/GimmeBundle/Resources/views/ConfigureApi/configure.html.twig +++ b/newscoop/src/Newscoop/GimmeBundle/Resources/views/ConfigureApi/configure.html.twig @@ -86,6 +86,7 @@

    {{ 'api.configure.resources.info'|trans }}

    +

    {{ 'api.configure.resources.api_docs'|trans }}: /documentation/rest-api/

    {{ form_start(publicResourcesForm) }} {{ form_errors(publicResourcesForm) }} diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml index 25cbf9541c..a299ad082a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml @@ -76,6 +76,7 @@ api: clients: 'Clients' resources: info: 'By default all resources are protected by firewall, but you can choose resources to make them public for everyone.' + api_docs: "Full documentation for API can be found on your instance (and it's public)" add_button: 'Add Client' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en.yml index 1419b9d3d1..5d5f64783e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en.yml @@ -9,3 +9,4 @@ Version: Version 'Release date': 'Release date' Help: Help 'Alternatively, you can ask a question in our forums at': 'Alternatively, you can ask a question in our forums at' +'Documentation': 'Documentation' From a51855d8bc0c178cacb2b4efc2ffa6fa1c80f8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 3 Jul 2015 11:25:42 +0200 Subject: [PATCH 42/90] CS-5868- adapt the topic design to show more topics in a window --- .../NewscoopBundle/Resources/public/css/new-design.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css index d5797e30d9..0cb7e40e1b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css @@ -87,7 +87,7 @@ } .system_pref.topics .angular-ui-tree .angular-ui-tree-node .tree-node .btn-group { - margin-top: 4px; + margin-top: -6px; display: none; } @@ -102,6 +102,11 @@ line-height: 140%; } +.system_pref.topics .angular-ui-tree .angular-ui-tree-node .tree-node .default-wrap span { + float: left; + padding-right: 10px; +} + .system_pref.topics .angular-ui-tree .angular-ui-tree-node .tree-node .node-edit-div { display: inline-block; margin: 5px 0 0; @@ -278,7 +283,7 @@ } .system_pref.topics .angular-ui-tree .list-group { - margin: 6px 0 2px 0; + margin: 0; overflow: hidden; } From de6a516fae511f6ad832d19a2dc8b5059856f8d0 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Fri, 3 Jul 2015 11:45:46 +0200 Subject: [PATCH 43/90] improve text --- .../Newscoop/NewscoopBundle/Resources/translations/api.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml index a299ad082a..227ed38617 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en.yml @@ -76,7 +76,7 @@ api: clients: 'Clients' resources: info: 'By default all resources are protected by firewall, but you can choose resources to make them public for everyone.' - api_docs: "Full documentation for API can be found on your instance (and it's public)" + api_docs: "A full documentation of the API can be found on your instance (and it's public)" add_button: 'Add Client' clients: table: From 77ff032038482c5a797b13f9d02c97a5c867600a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 3 Jul 2015 11:54:36 +0200 Subject: [PATCH 44/90] fixed showing topics checkboxes in Firefox --- .../NewscoopBundle/Resources/public/css/new-design.css | 7 +++++++ .../NewscoopBundle/Resources/views/Topics/index.html.twig | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css index 0cb7e40e1b..1ac98adec4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/css/new-design.css @@ -107,6 +107,13 @@ padding-right: 10px; } +.system_pref.topics .angular-ui-tree .angular-ui-tree-node .tree-node .default-wrap .topic-marker { + margin-right: 4px; + position: absolute; + top: 8px; + left: 29px; +} + .system_pref.topics .angular-ui-tree .angular-ui-tree-node .tree-node .node-edit-div { display: inline-block; margin: 5px 0 0; diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig index 4f162a2c1a..2e114b8a28 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig @@ -103,7 +103,7 @@
    - {% if compactView %}{% endif %} + {% if compactView %}{% endif %}
    • From f93923f1fe658094ec61e2f8b2c6399635255de6 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 3 Jul 2015 10:56:29 +0100 Subject: [PATCH 45/90] CS-5871 Improve image caption in admin interface --- .../NewscoopBundle/Resources/translations/articles.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml index 5ef6f89974..d37cec3c34 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml @@ -198,7 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the frontend. Please check with your siteadmin if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 till 50 will be deleted from the list.' images: - see_original: See original image + see_original: See full-size image in a new tab edit: edit_image_metadata: Edit image metadata save: Save @@ -216,4 +216,4 @@ articles: date: Date article_specific: Article specific global: Global - other_captions: Other Captions \ No newline at end of file + other_captions: Other Captions From 4945dbf1c93458535b4acd9dad1af91e048ef319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Fri, 3 Jul 2015 12:17:03 +0200 Subject: [PATCH 46/90] CS-5867 Increase the height of the modals in Newscoop to take almost full height of the browser window --- newscoop/admin-files/articles/edit_javascript.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/newscoop/admin-files/articles/edit_javascript.php b/newscoop/admin-files/articles/edit_javascript.php index 8a3442a3fe..02df199731 100644 --- a/newscoop/admin-files/articles/edit_javascript.php +++ b/newscoop/admin-files/articles/edit_javascript.php @@ -369,8 +369,12 @@ function unlockArticle(doAction) { } }); -$('#topic_box_frame a.iframe').each(function() { - $(this).data('fancybox').width = 1200; +$('#topic_box_frame a.iframe').fancybox({ + 'showCloseButton' : false, + 'width': '100%', + 'height': '100%', + 'scrolling': 'auto', + 'centerOnScroll': true, }); $("#context_box a.iframe").fancybox({ From 06e1b8c461a868d79ad0f723a15e068fb02d9192 Mon Sep 17 00:00:00 2001 From: localizer Date: Fri, 3 Jul 2015 10:51:06 +0000 Subject: [PATCH 47/90] updated translation resources --- .../Newscoop/NewscoopBundle/Resources/translations/api.ar.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.az.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.be.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.bn.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.cs.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.da.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.de.yml | 1 + .../NewscoopBundle/Resources/translations/api.de_AT.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.el.yml | 1 + .../NewscoopBundle/Resources/translations/api.en_GB.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.es.yml | 1 + .../NewscoopBundle/Resources/translations/api.es_AR.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.fa.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.fr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.he.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.hr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.hu.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.hy.yml | 1 + .../NewscoopBundle/Resources/translations/api.hy_AM.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.id.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.it.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ka.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ko.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ku.yml | 1 + .../NewscoopBundle/Resources/translations/api.nb_NO.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.nl.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.pa.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.pl.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ps.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.pt.yml | 1 + .../NewscoopBundle/Resources/translations/api.pt_BR.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ro.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.ru.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.sh.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.sq.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.sr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.sv.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.tr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.uk.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/api.zh.yml | 1 + .../NewscoopBundle/Resources/translations/api.zh_TW.yml | 1 + .../NewscoopBundle/Resources/translations/article_images.ar.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.az.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.be.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.bn.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.cs.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.da.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.de.yml | 2 ++ .../Resources/translations/article_images.de_AT.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.el.yml | 2 ++ .../Resources/translations/article_images.en_GB.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.es.yml | 2 ++ .../Resources/translations/article_images.es_AR.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.fa.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.fr.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.he.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.hr.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.hu.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.hy.yml | 2 ++ .../Resources/translations/article_images.hy_AM.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.id.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.it.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ka.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ko.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ku.yml | 2 ++ .../Resources/translations/article_images.nb_NO.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.nl.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.pa.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.pl.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ps.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.pt.yml | 2 ++ .../Resources/translations/article_images.pt_BR.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ro.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.ru.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.sh.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.sq.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.sr.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.sv.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.tr.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.uk.yml | 2 ++ .../NewscoopBundle/Resources/translations/article_images.zh.yml | 2 ++ .../Resources/translations/article_images.zh_TW.yml | 2 ++ .../NewscoopBundle/Resources/translations/articles.hy.yml | 2 +- .../NewscoopBundle/Resources/translations/articles.pa.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/help.ar.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.az.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.be.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.bn.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.cs.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.da.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.de.yml | 1 + .../NewscoopBundle/Resources/translations/help.de_AT.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.el.yml | 1 + .../NewscoopBundle/Resources/translations/help.en_GB.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.es.yml | 1 + .../NewscoopBundle/Resources/translations/help.es_AR.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.fa.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.fr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.he.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.hr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.hu.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.hy.yml | 1 + .../NewscoopBundle/Resources/translations/help.hy_AM.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.id.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.it.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ka.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ko.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ku.yml | 1 + .../NewscoopBundle/Resources/translations/help.nb_NO.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.nl.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.pa.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.pl.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ps.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.pt.yml | 1 + .../NewscoopBundle/Resources/translations/help.pt_BR.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ro.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.ru.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.sh.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.sq.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.sr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.sv.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.tr.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.uk.yml | 1 + .../Newscoop/NewscoopBundle/Resources/translations/help.zh.yml | 1 + .../NewscoopBundle/Resources/translations/help.zh_TW.yml | 1 + 125 files changed, 166 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml index 6bb9bd8c0b..e6a32a58be 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: 'وفقاً للإعدادات الإفتراضية فإن جميع الموارد محية بواسطة جدار حماية، ولكن يمكنك إختيار موارد لجعلها متاحة للجميع.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml index 2db8bfd4b7..82cb7b99a7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml @@ -76,6 +76,7 @@ api: clients: Sifarişçilər resources: info: 'Mövcud halda bütün vəsaitlər qoruyucu divar tərəfindən qorunur, amma sən istədiyin vəsaitləri ictimailəşdirmək üçün seçə bilərsən.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Sifarişçi Əlavə Et' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml index ef9afcb181..d8721dc6c3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml index 9600ebc641..f370c89d6a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml index f0a3e02fa2..65b76e801a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml @@ -76,6 +76,7 @@ api: clients: Klienti resources: info: 'Defoltně jsou všechny zdroje chráněné Firewall, ale můžete si vybrat zdroje, které zveřejníte.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Přidat klienta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml index 13c7a233a0..ede4044ffb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml @@ -76,6 +76,7 @@ api: clients: Klienter resources: info: 'Som standard er alle resourcer beskyttet af firewall, men du kan vælge resourcer der skal være offentligt tilgængelige.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Tilføj klient' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml index 55330c6baf..f30fd3d3f7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml index 748cba59e4..4d69dd77a1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml index 8c47b97f69..affcd6f18d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml index d441e5c47b..3304a80339 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml @@ -76,6 +76,7 @@ api: clients: Clients resources: info: 'By default all resources are protected by a firewall, but you can choose resources to make them public for everyone.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Add Client' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml index 4dd496b22e..6be44e69ef 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml @@ -76,6 +76,7 @@ api: clients: Clientes resources: info: 'Por defecto todos los recursos están protegidos por un cortafuegos, pero puede elegir los recursos que desee hacer públicos para todo el mundo.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Añadir cliente' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml index eb172bbcb8..824402bdc6 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml @@ -76,6 +76,7 @@ api: clients: Clientes resources: info: 'Por defecto todos los recursos están protegidos por un cortafuegos, pero podés elegir los recursos que deseás hacer públicos para todo el mundo.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Añadir Cliente' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml index c4c548bb93..4829b70dc7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml index 6198b71d63..72afa695b9 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml index 1433defa8e..0469b55a4c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml index 703d1c4313..1eb349de2c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml @@ -76,6 +76,7 @@ api: clients: Ügyfelek resources: info: 'Alapértelmezésként az összes erőforrást tűzfal védi, viszont kiválaszthatod azokat az erőforrásokat, melyeket mindenki számára nyilvánossá akarsz tenni.' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Ügyfél hozzáadása' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy.yml index 2d722db17d..370064586c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml index 88732d0f8d..811875607a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml @@ -76,6 +76,7 @@ api: clients: Բաժանորդներ resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Ավելացնել բաժանորդ' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml index 093ee03bdf..f9bad082d2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml index a4e49b75f5..a16dd16e03 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml index 601c9f7a64..6f5f3d864c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml index 3cd0cb72e0..2cf007b77e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pa.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pa.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml index ff3a7e1fe8..87c906cc0f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml @@ -76,6 +76,7 @@ api: clients: Klienci resources: info: 'Domyślnie wszystkie zasoby są strzeżone przez firewall, możesz jednak zdecydować które z nich będą publiczne (dostępne bez uwierzytelniania) dla wszystkich. ' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Dodaj klienta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml index 9acaf2d045..880811164f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml index 37e9b13fc5..42c66780e0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml index f65c58d6fc..ae9d581bb2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml index cbb1fcff4f..f8a537002f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml @@ -76,6 +76,7 @@ api: clients: Клиенты resources: info: 'По умолчанию все элементы защищены файрволом, но вы можете выбрать те из них, доступ к которым хотите открыть' + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Добавить клиента' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml index d1ee71b651..a946b47f00 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml @@ -76,6 +76,7 @@ api: clients: Klijenti resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: 'Dodaj klijenta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml index 5eddb66d3d..4e4876d58e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml index 62a3b6daf3..2e543c5a8b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml index 65aaf7798d..7884e5ea2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml index d317ea0e2e..30f28bc946 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml index 2fb6c630ec..3fd279eef3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml @@ -76,6 +76,7 @@ api: clients: 客户 resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml index a902ab7ec2..a5fd6376fe 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml @@ -76,6 +76,7 @@ api: clients: null resources: info: null + api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml index 94c5e80a27..3081cde8c9 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'التاريخ
      (اليوم، 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml index 6ba849556f..7f7317d4b5 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Tarix
      (iiii-aa-gg) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml index 34cfee4ebe..2210be98f8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): ' Дата
      (гггг-мм-дд)(yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml index accccb367f..7c805d94fe 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (rrrr-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml index 635f4e683c..9c8f25fea8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Dato
      (åååå-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml index f48315dd58..974aa9ef84 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (yyyy-mm-dd) ' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml index f016dbc4d2..f5a5885253 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (yyyy-mm-dd) ' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml index 47c6ef5df5..95e7ae1caf 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Ημερομηνία
      (εεεε-μ 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml index 326de41636..340519fdb5 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Date
      (yyyy-mm-dd) 'Add items to slideshow': 'Add items to slideshow' 'Attached Slideshows': 'Attached Slideshows' 'Value is required and can''t be empty': 'Value is required and can not be empty' +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml index 2e553783d1..8f13069900 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): aaaa-mm-dd 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml index b074580227..c1dc226242 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml index f633117e9c..1e09f045b4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Date
      (aaaa-mm-jj) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml index 2ef0e3a081..ae41ba87b7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (gggg-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml index 1775074648..e880fd1c28 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Dátum
      (éééé-hh-nn) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy.yml index 1c6aadbcfe..45944df29b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': 'Add items to slideshow' 'Attached Slideshows': 'Attached Slideshows' 'Value is required and can''t be empty': 'Value is required and can''t be empty' +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml index 164b02210f..b73fdda350 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml index 2a72583fe8..3fa867fe1e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Data
      (aaaa-mm-gg) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml index b2196d8545..c5e25e70df 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): თარიღი
      (წელი- 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml index 94662f867a..13b9274192 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 일자
      (년-월-일)       'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml index e4d4fc2e44..40eb48e0ec 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Datum
      (yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pa.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pa.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml index 3ab965f981..f16be8752f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Data
      (rrrr-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml index ed17d994af..eced601b12 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Data (aaaa-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml index a40b2007ed..12ee13d705 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Data
      (aaaa-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml index 0a9eac6e31..7035963e17 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 'Data
      (aaaa-ll-zz)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml index 97813fe538..6065630a95 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Дата
      (гггг-мм-дд)(yyyy-mm-dd): Datum
      (gggg-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml index e21b66f496..56df7b18ec 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Датум
      (гггг-мм-дд)(yyyy-mm-dd): Datum
      (åååå-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml index 5e47d7de70..f3bd4c8087 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml index a1075b8ed5..80e6a5dc50 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): Дата
      (рррр-мм-дд)(yyyy-mm-dd): 日期(yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml index 2bde2db362..46fd9b9ea7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml @@ -74,3 +74,5 @@ Date
      (yyyy-mm-dd): 日期(yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null +'Select all images': 'Select all images' +'Unselect all images': 'Unselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml index 3549f03ec8..2898acc933 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.hy.yml @@ -198,7 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the frontend. Please check with your siteadmin if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 till 50 will be deleted from the list.' images: - see_original: 'See original image' + see_original: 'See full-size image in a new tab' edit: edit_image_metadata: 'Edit image metadata' save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml index 8a50fd2f90..b3116481bd 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.pa.yml @@ -198,7 +198,7 @@ articles: namechanged: null alert: null images: - see_original: 'See original image' + see_original: 'See full-size image in a new tab' edit: edit_image_metadata: null save: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml index c679a9462b..1ce26835ac 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml @@ -9,3 +9,4 @@ Version: إصدار 'Release date': null Help: المساعدة 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml index d25f29d931..8a4105f65b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml @@ -9,3 +9,4 @@ Version: Versiya 'Release date': 'Buraxılış tarixi' Help: Yardım 'Alternatively, you can ask a question in our forums at': 'Alternatıv olaraq sən forumlarımıza sualını daxil edə bilərsən' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml index effa7ae429..e8e309fc93 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml @@ -9,3 +9,4 @@ Version: Версія 'Release date': null Help: Дапамога 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml index 824880420c..2c4bcd93ea 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml @@ -9,3 +9,4 @@ Version: Verze 'Release date': 'Datum zveřejnění' Help: Nápověda 'Alternatively, you can ask a question in our forums at': 'Eventuálně můžete položit dotaz na našich fórech' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml index e763afd420..2f0bad8440 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml @@ -9,3 +9,4 @@ Version: Version 'Release date': Udgivelsesdato Help: Hjælp 'Alternatively, you can ask a question in our forums at': 'Alternativt kan du spørge på vores forum' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml index 39ac65d8f0..5930df2838 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml @@ -9,3 +9,4 @@ Version: Version 'Release date': Erscheinungsdatum Help: Hilfe 'Alternatively, you can ask a question in our forums at': 'Alternativ können Sie auch Fragen in unserem Forum stellen unter' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml index 3328d959a1..681d452e1f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml @@ -9,3 +9,4 @@ Version: Version 'Release date': null Help: Hilfe 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml index f9ef4aad02..ed998bdda3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml @@ -9,3 +9,4 @@ Version: Εκδοχή 'Release date': null Help: Βοήθεια 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml index 1419b9d3d1..53e96b310b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml @@ -9,3 +9,4 @@ Version: Version 'Release date': 'Release date' Help: Help 'Alternatively, you can ask a question in our forums at': 'Alternatively, you can ask a question in our forums at' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml index 4b9cac9f9f..2bff538f16 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml @@ -9,3 +9,4 @@ Version: Versión 'Release date': 'Fecha de liberación' Help: Ayuda 'Alternatively, you can ask a question in our forums at': 'Alternativamente, puede hacer una pregunta en nuestros foros, en ' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml index 9c6a5877c5..7a00f557f1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml @@ -9,3 +9,4 @@ Version: Versión 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml index 2d827fd404..75813cd7ca 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: Aide 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml index 43ff187d4d..4f21353fef 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: עזרה 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml index 191ac83036..9b1c75a3c3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: Pomoć 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml index c46a651c54..01f2003a3f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml @@ -9,3 +9,4 @@ Version: Verzió 'Release date': 'Kiadás dátuma' Help: Súgó 'Alternatively, you can ask a question in our forums at': 'Másik lehetőségként kérdésedet felteheted a fórumunkban:' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml index 0ee7c7c4fd..98e689bbf0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml @@ -9,3 +9,4 @@ Version: Versione 'Release date': null Help: Aiuto 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml index 0f0d916616..0169ba4774 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml @@ -9,3 +9,4 @@ Version: ვერსია 'Release date': 'გამოშვების თარიღი' Help: დახმარება 'Alternatively, you can ask a question in our forums at': 'ალტერნატიულად, თქვენი შეგიძლიათ დასვათ შეკითხვა ჩვენს ფორუმებში' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml index a7944e4665..0c8827f83e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: 도움말 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml index 03aee3ee27..d887ea625d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: Help 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pa.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pa.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml index 8adeb028ba..58d94b5939 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml @@ -9,3 +9,4 @@ Version: Wersja 'Release date': 'Data wydania' Help: Pomoc 'Alternatively, you can ask a question in our forums at': 'Zawsze możesz też zadać pytanie na naszym forum dostępnym tutaj: ' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml index 337067fd0f..ed99f2bdf4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: Ajuda 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml index 32dde04df9..e798f21acf 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml @@ -9,3 +9,4 @@ Version: Versão 'Release date': null Help: Ajuda 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml index 222ac36553..f2aebd62fb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml @@ -9,3 +9,4 @@ Version: Versiune 'Release date': null Help: Ajutor 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml index 544baa233d..0de9ae628f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml @@ -9,3 +9,4 @@ Version: Версия 'Release date': 'Дата выпуска' Help: Помощь 'Alternatively, you can ask a question in our forums at': 'Как вариант, вы можете задать во прос на наших форумах ' +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml index c0d9ac2e9a..33730e61f8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml @@ -9,3 +9,4 @@ Version: Verzija 'Release date': null Help: Pomoć 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml index 3982a5ee72..2e2f49cd3b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml @@ -9,3 +9,4 @@ Version: Верзија 'Release date': null Help: Помоћ 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml index 52ffab2dca..581cc74c55 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: Hjälp 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml index ef67c23987..39fa2d97bc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml @@ -9,3 +9,4 @@ Version: Версія 'Release date': null Help: Допомога 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml index 65ded33670..e8b4d57ed6 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml @@ -9,3 +9,4 @@ Version: 版本 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml index 9610b97b1b..b2286e1e70 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml @@ -9,3 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null +Documentation: Documentation From a753dfc2f6af5d15ea994b7d84602471b77a5f6a Mon Sep 17 00:00:00 2001 From: localizer Date: Sat, 4 Jul 2015 09:12:39 +0000 Subject: [PATCH 48/90] updated translation resources --- .../Newscoop/NewscoopBundle/Resources/translations/api.ar.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.az.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.be.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.bn.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.cs.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.da.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.de.yml | 2 +- .../NewscoopBundle/Resources/translations/api.de_AT.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.el.yml | 2 +- .../NewscoopBundle/Resources/translations/api.en_GB.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.es.yml | 2 +- .../NewscoopBundle/Resources/translations/api.es_AR.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.fa.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.fr.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.he.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.hr.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.hu.yml | 2 +- .../NewscoopBundle/Resources/translations/api.hy_AM.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.id.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.it.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ka.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ko.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ku.yml | 2 +- .../NewscoopBundle/Resources/translations/api.nb_NO.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.nl.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.pl.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ps.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.pt.yml | 2 +- .../NewscoopBundle/Resources/translations/api.pt_BR.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ro.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.ru.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.sh.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.sq.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.sr.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.sv.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.tr.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.uk.yml | 2 +- .../Newscoop/NewscoopBundle/Resources/translations/api.zh.yml | 2 +- .../NewscoopBundle/Resources/translations/api.zh_TW.yml | 2 +- .../Resources/translations/article_images.ar.yml | 4 ++-- .../Resources/translations/article_images.az.yml | 4 ++-- .../Resources/translations/article_images.be.yml | 4 ++-- .../Resources/translations/article_images.bn.yml | 4 ++-- .../Resources/translations/article_images.cs.yml | 4 ++-- .../Resources/translations/article_images.da.yml | 4 ++-- .../Resources/translations/article_images.de.yml | 4 ++-- .../Resources/translations/article_images.de_AT.yml | 4 ++-- .../Resources/translations/article_images.el.yml | 4 ++-- .../Resources/translations/article_images.en_GB.yml | 4 ++-- .../Resources/translations/article_images.es.yml | 4 ++-- .../Resources/translations/article_images.es_AR.yml | 4 ++-- .../Resources/translations/article_images.fa.yml | 4 ++-- .../Resources/translations/article_images.fr.yml | 4 ++-- .../Resources/translations/article_images.he.yml | 4 ++-- .../Resources/translations/article_images.hr.yml | 4 ++-- .../Resources/translations/article_images.hu.yml | 4 ++-- .../Resources/translations/article_images.hy_AM.yml | 4 ++-- .../Resources/translations/article_images.id.yml | 4 ++-- .../Resources/translations/article_images.it.yml | 4 ++-- .../Resources/translations/article_images.ka.yml | 4 ++-- .../Resources/translations/article_images.ko.yml | 4 ++-- .../Resources/translations/article_images.ku.yml | 4 ++-- .../Resources/translations/article_images.nb_NO.yml | 4 ++-- .../Resources/translations/article_images.nl.yml | 4 ++-- .../Resources/translations/article_images.pl.yml | 4 ++-- .../Resources/translations/article_images.ps.yml | 4 ++-- .../Resources/translations/article_images.pt.yml | 4 ++-- .../Resources/translations/article_images.pt_BR.yml | 4 ++-- .../Resources/translations/article_images.ro.yml | 4 ++-- .../Resources/translations/article_images.ru.yml | 4 ++-- .../Resources/translations/article_images.sh.yml | 4 ++-- .../Resources/translations/article_images.sq.yml | 4 ++-- .../Resources/translations/article_images.sr.yml | 4 ++-- .../Resources/translations/article_images.sv.yml | 4 ++-- .../Resources/translations/article_images.tr.yml | 4 ++-- .../Resources/translations/article_images.uk.yml | 4 ++-- .../Resources/translations/article_images.zh.yml | 4 ++-- .../Resources/translations/article_images.zh_TW.yml | 4 ++-- .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ar.yml | 2 +- .../NewscoopBundle/Resources/translations/help.az.yml | 2 +- .../NewscoopBundle/Resources/translations/help.be.yml | 2 +- .../NewscoopBundle/Resources/translations/help.bn.yml | 2 +- .../NewscoopBundle/Resources/translations/help.cs.yml | 2 +- .../NewscoopBundle/Resources/translations/help.da.yml | 2 +- .../NewscoopBundle/Resources/translations/help.de.yml | 2 +- .../NewscoopBundle/Resources/translations/help.de_AT.yml | 2 +- .../NewscoopBundle/Resources/translations/help.el.yml | 2 +- .../NewscoopBundle/Resources/translations/help.en_GB.yml | 2 +- .../NewscoopBundle/Resources/translations/help.es.yml | 2 +- .../NewscoopBundle/Resources/translations/help.es_AR.yml | 2 +- .../NewscoopBundle/Resources/translations/help.fa.yml | 2 +- .../NewscoopBundle/Resources/translations/help.fr.yml | 2 +- .../NewscoopBundle/Resources/translations/help.he.yml | 2 +- .../NewscoopBundle/Resources/translations/help.hr.yml | 2 +- .../NewscoopBundle/Resources/translations/help.hu.yml | 2 +- .../NewscoopBundle/Resources/translations/help.hy_AM.yml | 2 +- .../NewscoopBundle/Resources/translations/help.id.yml | 2 +- .../NewscoopBundle/Resources/translations/help.it.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ka.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ko.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ku.yml | 2 +- .../NewscoopBundle/Resources/translations/help.nb_NO.yml | 2 +- .../NewscoopBundle/Resources/translations/help.nl.yml | 2 +- .../NewscoopBundle/Resources/translations/help.pl.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ps.yml | 2 +- .../NewscoopBundle/Resources/translations/help.pt.yml | 2 +- .../NewscoopBundle/Resources/translations/help.pt_BR.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ro.yml | 2 +- .../NewscoopBundle/Resources/translations/help.ru.yml | 2 +- .../NewscoopBundle/Resources/translations/help.sh.yml | 2 +- .../NewscoopBundle/Resources/translations/help.sq.yml | 2 +- .../NewscoopBundle/Resources/translations/help.sr.yml | 2 +- .../NewscoopBundle/Resources/translations/help.sv.yml | 2 +- .../NewscoopBundle/Resources/translations/help.tr.yml | 2 +- .../NewscoopBundle/Resources/translations/help.uk.yml | 2 +- .../NewscoopBundle/Resources/translations/help.zh.yml | 2 +- .../NewscoopBundle/Resources/translations/help.zh_TW.yml | 2 +- 118 files changed, 157 insertions(+), 157 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml index e6a32a58be..8d3a337fec 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ar.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: 'وفقاً للإعدادات الإفتراضية فإن جميع الموارد محية بواسطة جدار حماية، ولكن يمكنك إختيار موارد لجعلها متاحة للجميع.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml index 82cb7b99a7..719724fccd 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.az.yml @@ -76,7 +76,7 @@ api: clients: Sifarişçilər resources: info: 'Mövcud halda bütün vəsaitlər qoruyucu divar tərəfindən qorunur, amma sən istədiyin vəsaitləri ictimailəşdirmək üçün seçə bilərsən.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Sifarişçi Əlavə Et' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml index d8721dc6c3..a42fcee71a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.be.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml index f370c89d6a..a04ee2305a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.bn.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml index 65b76e801a..9d18b401e3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.cs.yml @@ -76,7 +76,7 @@ api: clients: Klienti resources: info: 'Defoltně jsou všechny zdroje chráněné Firewall, ale můžete si vybrat zdroje, které zveřejníte.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Přidat klienta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml index ede4044ffb..b30037f31f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml @@ -76,7 +76,7 @@ api: clients: Klienter resources: info: 'Som standard er alle resourcer beskyttet af firewall, men du kan vælge resourcer der skal være offentligt tilgængelige.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Tilføj klient' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml index f30fd3d3f7..1f8d77a358 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml index 4d69dd77a1..f820fe18e8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.de_AT.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml index affcd6f18d..2cf93c5ae6 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.el.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml index 3304a80339..bb71a99484 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml @@ -76,7 +76,7 @@ api: clients: Clients resources: info: 'By default all resources are protected by a firewall, but you can choose resources to make them public for everyone.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Add Client' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml index 6be44e69ef..565db2ec46 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es.yml @@ -76,7 +76,7 @@ api: clients: Clientes resources: info: 'Por defecto todos los recursos están protegidos por un cortafuegos, pero puede elegir los recursos que desee hacer públicos para todo el mundo.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Añadir cliente' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml index 824402bdc6..715b88609c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.es_AR.yml @@ -76,7 +76,7 @@ api: clients: Clientes resources: info: 'Por defecto todos los recursos están protegidos por un cortafuegos, pero podés elegir los recursos que deseás hacer públicos para todo el mundo.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Añadir Cliente' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fa.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml index 4829b70dc7..2147041641 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.fr.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml index 72afa695b9..24fea67621 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.he.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml index 0469b55a4c..7e15928e66 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hr.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml index 1eb349de2c..c0f377a3f8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hu.yml @@ -76,7 +76,7 @@ api: clients: Ügyfelek resources: info: 'Alapértelmezésként az összes erőforrást tűzfal védi, viszont kiválaszthatod azokat az erőforrásokat, melyeket mindenki számára nyilvánossá akarsz tenni.' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Ügyfél hozzáadása' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml index 811875607a..5210363c9e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.hy_AM.yml @@ -76,7 +76,7 @@ api: clients: Բաժանորդներ resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Ավելացնել բաժանորդ' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.id.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml index f9bad082d2..e6c765e676 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.it.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml index a16dd16e03..0bd142516a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ka.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml index 6f5f3d864c..80f0edf963 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ko.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ku.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nb_NO.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml index 2cf007b77e..81486c5665 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.nl.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml index 87c906cc0f..d45df2c3f0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pl.yml @@ -76,7 +76,7 @@ api: clients: Klienci resources: info: 'Domyślnie wszystkie zasoby są strzeżone przez firewall, możesz jednak zdecydować które z nich będą publiczne (dostępne bez uwierzytelniania) dla wszystkich. ' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Dodaj klienta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ps.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml index 880811164f..f11aecafef 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml index 42c66780e0..d36a60a3d3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.pt_BR.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml index ae9d581bb2..a0e91f19b2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ro.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml index f8a537002f..26154a2eb2 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.ru.yml @@ -76,7 +76,7 @@ api: clients: Клиенты resources: info: 'По умолчанию все элементы защищены файрволом, но вы можете выбрать те из них, доступ к которым хотите открыть' - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Добавить клиента' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml index a946b47f00..25e5de35c8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sh.yml @@ -76,7 +76,7 @@ api: clients: Klijenti resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: 'Dodaj klijenta' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sq.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml index 4e4876d58e..60a4a50000 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sr.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml index 2e543c5a8b..60f2e35005 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.sv.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml index 7884e5ea2f..5ebcb90e07 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.tr.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml index 30f28bc946..6ea8d4c37a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.uk.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml index 3fd279eef3..e1891e4798 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh.yml @@ -76,7 +76,7 @@ api: clients: 客户 resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml index a5fd6376fe..80b30096ce 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.zh_TW.yml @@ -76,7 +76,7 @@ api: clients: null resources: info: null - api_docs: 'A full documentation of the API can be found on your instance (and it''s public)' + api_docs: null add_button: null clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml index 3081cde8c9..4d182812bc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ar.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'التاريخ
      (اليوم، 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml index 7f7317d4b5..318a6675e7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.az.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Tarix
      (iiii-aa-gg) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml index 2210be98f8..01fb9569dd 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.be.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): ' Дата
      (гггг-мм-дд)(yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml index 7c805d94fe..34beea70e6 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.cs.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (rrrr-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml index 9c8f25fea8..6a5ef50cea 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Dato
      (åååå-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml index 974aa9ef84..3c5ca3b1e7 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (yyyy-mm-dd) ' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml index f5a5885253..7f1331105b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.de_AT.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (yyyy-mm-dd) ' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml index 95e7ae1caf..da53d8621c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.el.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Ημερομηνία
      (εεεε-μ 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml index 340519fdb5..b4db4d5e5c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Date
      (yyyy-mm-dd) 'Add items to slideshow': 'Add items to slideshow' 'Attached Slideshows': 'Attached Slideshows' 'Value is required and can''t be empty': 'Value is required and can not be empty' -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml index 8f13069900..ed9b1b77ec 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): aaaa-mm-dd 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml index c1dc226242..2067edc0bf 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.es_AR.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fa.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml index 1e09f045b4..a88398381a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.fr.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Date
      (aaaa-mm-jj) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.he.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml index ae41ba87b7..c5e1ff1fad 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hr.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Datum
      (gggg-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml index e880fd1c28..7a16a43baf 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hu.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Dátum
      (éééé-hh-nn) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml index b73fdda350..f93a5b1bfa 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.hy_AM.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.id.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml index 3fa867fe1e..5c095f5536 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.it.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Data
      (aaaa-mm-gg) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml index c5e25e70df..02804c1fd8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ka.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): თარიღი
      (წელი- 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml index 13b9274192..7cb3e937aa 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ko.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 일자
      (년-월-일)       'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ku.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nb_NO.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml index 40eb48e0ec..4e61aef777 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.nl.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Datum
      (yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml index f16be8752f..7d5f2a924e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pl.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Data
      (rrrr-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ps.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml index eced601b12..5e673e052f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Data (aaaa-mm-dd)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml index 12ee13d705..1db8d9fe20 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.pt_BR.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Data
      (aaaa-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml index 7035963e17..763e519642 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ro.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 'Data
      (aaaa-ll-zz)' 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml index 6065630a95..588cf4b46c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.ru.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Дата
      (гггг-мм-дд)(yyyy-mm-dd): Datum
      (gggg-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sq.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml index 56df7b18ec..840ee40bb0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.sr.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Датум
      (гггг-мм-дд)(yyyy-mm-dd): Datum
      (åååå-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml index f3bd4c8087..b00db9c909 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.tr.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): null 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml index 80e6a5dc50..c773d64cda 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.uk.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Дата
      (рррр-мм-дд)(yyyy-mm-dd): 日期(yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml index 46fd9b9ea7..6acef431d8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.zh_TW.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): 日期(yyyy-mm-dd) 'Add items to slideshow': null 'Attached Slideshows': null 'Value is required and can''t be empty': null -'Select all images': 'Select all images' -'Unselect all images': 'Unselect all images' +'Select all images': null +'Unselect all images': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index 8178a4633d..3c2175e815 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -198,7 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 to 50 will be deleted from the list.' images: - see_original: 'See original image' + see_original: null edit: edit_image_metadata: 'Edit image metadata' save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml index 1ce26835ac..85b8ebfb2f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ar.yml @@ -9,4 +9,4 @@ Version: إصدار 'Release date': null Help: المساعدة 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml index 8a4105f65b..075664e02e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.az.yml @@ -9,4 +9,4 @@ Version: Versiya 'Release date': 'Buraxılış tarixi' Help: Yardım 'Alternatively, you can ask a question in our forums at': 'Alternatıv olaraq sən forumlarımıza sualını daxil edə bilərsən' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml index e8e309fc93..407f05343e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.be.yml @@ -9,4 +9,4 @@ Version: Версія 'Release date': null Help: Дапамога 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.bn.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml index 2c4bcd93ea..3800fc1272 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.cs.yml @@ -9,4 +9,4 @@ Version: Verze 'Release date': 'Datum zveřejnění' Help: Nápověda 'Alternatively, you can ask a question in our forums at': 'Eventuálně můžete položit dotaz na našich fórech' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml index 2f0bad8440..e97db1cf89 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': Udgivelsesdato Help: Hjælp 'Alternatively, you can ask a question in our forums at': 'Alternativt kan du spørge på vores forum' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml index 5930df2838..8e0de3c20f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': Erscheinungsdatum Help: Hilfe 'Alternatively, you can ask a question in our forums at': 'Alternativ können Sie auch Fragen in unserem Forum stellen unter' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml index 681d452e1f..2d57c32f64 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.de_AT.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': null Help: Hilfe 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml index ed998bdda3..c4a64d00df 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.el.yml @@ -9,4 +9,4 @@ Version: Εκδοχή 'Release date': null Help: Βοήθεια 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml index 53e96b310b..6665153e29 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': 'Release date' Help: Help 'Alternatively, you can ask a question in our forums at': 'Alternatively, you can ask a question in our forums at' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml index 2bff538f16..0a7d636c63 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es.yml @@ -9,4 +9,4 @@ Version: Versión 'Release date': 'Fecha de liberación' Help: Ayuda 'Alternatively, you can ask a question in our forums at': 'Alternativamente, puede hacer una pregunta en nuestros foros, en ' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml index 7a00f557f1..0e525a3ad4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.es_AR.yml @@ -9,4 +9,4 @@ Version: Versión 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fa.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml index 75813cd7ca..3acb132425 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.fr.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: Aide 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml index 4f21353fef..e2252ddcc4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.he.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: עזרה 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml index 9b1c75a3c3..98e92f4036 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hr.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: Pomoć 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml index 01f2003a3f..3e0ae1a5af 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hu.yml @@ -9,4 +9,4 @@ Version: Verzió 'Release date': 'Kiadás dátuma' Help: Súgó 'Alternatively, you can ask a question in our forums at': 'Másik lehetőségként kérdésedet felteheted a fórumunkban:' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.hy_AM.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.id.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml index 98e689bbf0..91335ce0f0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.it.yml @@ -9,4 +9,4 @@ Version: Versione 'Release date': null Help: Aiuto 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml index 0169ba4774..daf7350e42 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ka.yml @@ -9,4 +9,4 @@ Version: ვერსია 'Release date': 'გამოშვების თარიღი' Help: დახმარება 'Alternatively, you can ask a question in our forums at': 'ალტერნატიულად, თქვენი შეგიძლიათ დასვათ შეკითხვა ჩვენს ფორუმებში' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml index 0c8827f83e..bc63cbc4f5 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ko.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: 도움말 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ku.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nb_NO.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml index d887ea625d..e115a14256 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.nl.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: Help 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml index 58d94b5939..e1e7fdd093 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pl.yml @@ -9,4 +9,4 @@ Version: Wersja 'Release date': 'Data wydania' Help: Pomoc 'Alternatively, you can ask a question in our forums at': 'Zawsze możesz też zadać pytanie na naszym forum dostępnym tutaj: ' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ps.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml index ed99f2bdf4..5dcaccd25d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: Ajuda 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml index e798f21acf..ac1f219ea4 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.pt_BR.yml @@ -9,4 +9,4 @@ Version: Versão 'Release date': null Help: Ajuda 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml index f2aebd62fb..ab37f30b04 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ro.yml @@ -9,4 +9,4 @@ Version: Versiune 'Release date': null Help: Ajutor 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml index 0de9ae628f..0ade73066a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.ru.yml @@ -9,4 +9,4 @@ Version: Версия 'Release date': 'Дата выпуска' Help: Помощь 'Alternatively, you can ask a question in our forums at': 'Как вариант, вы можете задать во прос на наших форумах ' -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml index 33730e61f8..e44789dd8c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sh.yml @@ -9,4 +9,4 @@ Version: Verzija 'Release date': null Help: Pomoć 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sq.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml index 2e2f49cd3b..294ed8a639 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sr.yml @@ -9,4 +9,4 @@ Version: Верзија 'Release date': null Help: Помоћ 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml index 581cc74c55..371c37a8dc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.sv.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: Hjälp 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.tr.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml index 39fa2d97bc..9cf32ce85d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.uk.yml @@ -9,4 +9,4 @@ Version: Версія 'Release date': null Help: Допомога 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml index e8b4d57ed6..3a271aa9e8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh.yml @@ -9,4 +9,4 @@ Version: 版本 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml index b2286e1e70..6dba267386 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.zh_TW.yml @@ -9,4 +9,4 @@ Version: null 'Release date': null Help: null 'Alternatively, you can ask a question in our forums at': null -Documentation: Documentation +Documentation: null From 0c64d4de9bb9051a2cea2a0cd8cba43fecf19435 Mon Sep 17 00:00:00 2001 From: localizer Date: Mon, 6 Jul 2015 10:44:19 +0000 Subject: [PATCH 49/90] updated translation resources --- .../NewscoopBundle/Resources/translations/api.en_GB.yml | 2 +- .../Resources/translations/article_images.en_GB.yml | 4 ++-- .../NewscoopBundle/Resources/translations/articles.en_GB.yml | 2 +- .../NewscoopBundle/Resources/translations/help.en_GB.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml index bb71a99484..029e14e6eb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.en_GB.yml @@ -76,7 +76,7 @@ api: clients: Clients resources: info: 'By default all resources are protected by a firewall, but you can choose resources to make them public for everyone.' - api_docs: null + api_docs: 'Full documentation of the API can be found on your instance (and it''s public)' add_button: 'Add Client' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml index b4db4d5e5c..c4d31547ab 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.en_GB.yml @@ -74,5 +74,5 @@ Date
      (yyyy-mm-dd): Date
      (yyyy-mm-dd) 'Add items to slideshow': 'Add items to slideshow' 'Attached Slideshows': 'Attached Slideshows' 'Value is required and can''t be empty': 'Value is required and can not be empty' -'Select all images': null -'Unselect all images': null +'Select all images': 'Select all images' +'Unselect all images': 'Deselect all images' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml index 3c2175e815..5e132ae69f 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en_GB.yml @@ -198,7 +198,7 @@ articles: namechanged: 'Are you sure you want to change the list name? The name might be used in the Newscoop templates to render the list in the front end. Please check with your site administrator if you have doubts.' alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you change the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 to 50 will be deleted from the list.' images: - see_original: null + see_original: 'See full-size image in a new tab' edit: edit_image_metadata: 'Edit image metadata' save: Save diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml index 6665153e29..53e96b310b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.en_GB.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': 'Release date' Help: Help 'Alternatively, you can ask a question in our forums at': 'Alternatively, you can ask a question in our forums at' -Documentation: null +Documentation: Documentation From 4d5077e92144fbc30942092075ee317ceba418cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 7 Jul 2015 11:15:10 +0200 Subject: [PATCH 50/90] CS-5878 - Newscoop 4.4.4 allows only 100M even if php.ini allows higher upload max size value --- .../Controller/SystemPrefController.php | 74 +++++++++---------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php index 96d2349159..bac35fca63 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php @@ -1,6 +1,6 @@ * @copyright 2013 Sourcefabric o.p.s. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -57,7 +57,7 @@ public function indexAction(Request $request) } $max_upload_filesize = $preferencesService->MaxUploadFileSize; - if (empty($max_upload_filesize) || $max_upload_filesize == 0 || $max_upload_filesize != ini_get('upload_max_filesize')) { + if (empty($max_upload_filesize) || $this->convertToBytes($max_upload_filesize) == 0) { $preferencesService->MaxUploadFileSize = ini_get('upload_max_filesize'); } @@ -174,9 +174,8 @@ public function indexAction(Request $request) 'cronJobNotificationEmail' => $preferencesService->CronJobsNotificationEmail, 'cronJobSmtpSender' => $preferencesService->CronJobsSenderEmail, 'cronJobSmtpSenderName' => $preferencesService->CronJobsSenderName, - ) - , array( - 'cacheService' => $this->container->get('newscoop.cache') + ), array( + 'cacheService' => $this->container->get('newscoop.cache'), )); if ($request->isMethod('POST')) { @@ -295,7 +294,7 @@ public function indexAction(Request $request) 'mysql_client_command_path' => $mysql_client_command_path, 'map_marker_source_default' => $default_marker_source, 'map_marker_source_selected' => $preferencesService->MapMarkerSourceDefault, - 'jobs' => $jobs + 'jobs' => $jobs, ); } @@ -388,7 +387,7 @@ public function jobNotifyAction(Request $request, $id) } /** - * Sets database caching + * Sets database caching. * * @param string $cache_engine * @param string $cache_engine_host @@ -405,7 +404,7 @@ private function databaseCache($cache_engine, $cache_engine_host, $cache_engine_ } /** - * Sets templates caching + * Sets templates caching. * * @param string $cache_template Values 1 or 0 * @param Symfony\Component\Translation\Translator $translator Translator @@ -435,7 +434,7 @@ private function templateCache($cache_template, $translator) } /** - * Sets replication settings + * Sets replication settings. * * @param string $user Replication server user * @param string $host Replication server hostname @@ -474,7 +473,7 @@ private function useReplication($user, $host, $password, $use_replication, $port } /** - * Defines and sets max upload file size + * Defines and sets max upload file size. * * @param string $max_size Max upload file size * @param Symfony\Component\Translation\Translator $translator Translator @@ -483,11 +482,10 @@ private function useReplication($user, $host, $password, $use_replication, $port */ private function maxUpload($max_size, $translator) { - $max_upload_filesize_bytes = trim($max_size); + $max_upload_filesize_bytes = $this->convertToBytes($max_size); $preferencesService = $this->container->get('system_preferences_service'); - if ($max_upload_filesize_bytes > 0 && - $max_upload_filesize_bytes <= min(trim(ini_get('post_max_size')), trim(ini_get('upload_max_filesize')))) { + $max_upload_filesize_bytes <= min($this->convertToBytes(ini_get('post_max_size')), $this->convertToBytes(ini_get('upload_max_filesize')))) { $preferencesService->MaxUploadFileSize = strip_tags($max_size); } else { $this->get('session')->getFlashBag()->add('error', $translator->trans('newscoop.preferences.error.maxupload', array(), 'system_pref')); @@ -496,8 +494,23 @@ private function maxUpload($max_size, $translator) } } + private function convertToBytes($from) + { + $number = substr(trim($from), 0, -1); + switch (strtoupper(substr($from, -1))) { + case 'K': + return $number * 1024; + case 'M': + return $number * pow(1024, 2); + case 'G': + return $number * pow(1024, 3); + default: + return $from; + } + } + /** - * Sets geolocation options + * Sets geolocation options. * * @param point $latitude Latitude * @param point $longitude Longitude @@ -512,7 +525,6 @@ private function geolocation($latitude, $longitude, $geoLocation, $translator) if ($latitude > 90 || $latitude < -90 || $longitude > 180 || $longitude < -180) { - $this->get('session')->getFlashBag()->add('error', $translator->trans('newscoop.preferences.error.geolocation', array(), 'system_pref')); return $this->redirect($this->generateUrl('newscoop_newscoop_systempref_index')); @@ -531,12 +543,10 @@ private function geolocation($latitude, $longitude, $geoLocation, $translator) } /** - * Sets facebook options + * Sets facebook options. * * @param string $appId Facebook application ID * @param string $secret Facebook Secret key - * - * @return void */ private function facebook($appId, $secret) { @@ -546,13 +556,11 @@ private function facebook($appId, $secret) } /** - * Sets recaptcha options + * Sets recaptcha options. * * @param string $publicKey ReCaptcha public key * @param string $privateKey ReCaptcha private key * @param string $secure Secure ReCaptcha - * - * @return void */ private function recaptcha($publicKey, $privateKey, $secure) { @@ -563,11 +571,9 @@ private function recaptcha($publicKey, $privateKey, $secure) } /** - * Sets automatic statistics collection options + * Sets automatic statistics collection options. * * @param string $automatic_collection Values Y or N - * - * @return void */ private function collectStats($automatic_collection) { @@ -576,12 +582,10 @@ private function collectStats($automatic_collection) } /** - * Sets SMTP options + * Sets SMTP options. * * @param string $host SMTP host * @param int $port SMTP port - * - * @return void */ private function smtpConfiguration($host, $port) { @@ -591,14 +595,12 @@ private function smtpConfiguration($host, $port) } /** - * Sets images resizing options + * Sets images resizing options. * * @param string $ratio Image ratio * @param int $image_width Image width * @param int $image_height Image height * @param int $zoom Image zoom - * - * @return void */ private function imageResizing($ratio, $image_width, $image_height, $zoom) { @@ -610,11 +612,9 @@ private function imageResizing($ratio, $image_width, $image_height, $zoom) } /** - * Sets template filter + * Sets template filter. * * @param string $template_filter Template filter - * - * @return void */ private function templateFilter($template_filter) { @@ -623,7 +623,7 @@ private function templateFilter($template_filter) } /** - * Sets general options + * Sets general options. * * @param string $siteOnline Website status * @param string $title Website title @@ -637,12 +637,10 @@ private function templateFilter($template_filter) * @param string $separator Keyword separator * @param int $captcha Number of failed login attempts before showing CAPTCHA * @param string $mysql_client_command_path MySQL client command path - * - * @return void */ private function generalSettings($siteOnline, $title, $meta_keywords, $meta_description, $timezone, $cache_image, $allow_recovery, - $emailFrom, $session_lifetime, $separator, $captcha, $mysql_client_command_path) { - + $emailFrom, $session_lifetime, $separator, $captcha, $mysql_client_command_path) + { $preferencesService = $this->container->get('system_preferences_service'); $preferencesService->SiteOnline = strip_tags($siteOnline); $preferencesService->SiteTitle = strip_tags($title); From 7c156584f77d10510401db52dad8b183f41bdf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 7 Jul 2015 12:20:59 +0200 Subject: [PATCH 51/90] comment out php values in htacces and display a proper value --- newscoop/htaccess.dist | 4 ++-- .../Controller/SystemPrefController.php | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/newscoop/htaccess.dist b/newscoop/htaccess.dist index 0824db5b3f..ec555fda9b 100644 --- a/newscoop/htaccess.dist +++ b/newscoop/htaccess.dist @@ -64,5 +64,5 @@ AddType application/font-woff .woff # Uncomment for large file uploads with docker # containers (to install private plugins) for example -php_value upload_max_filesize 100M -php_value post_max_size 100M +#php_value upload_max_filesize 100M +#php_value post_max_size 100M diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php index bac35fca63..fe7c4f0ac0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/SystemPrefController.php @@ -77,7 +77,14 @@ public function indexAction(Request $request) } } - $upload_min_filesize = min(ini_get('post_max_size'), ini_get('upload_max_filesize')); + $upload_min_filesize = $this->formatBytes( + min( + $this->convertToBytes(ini_get('post_max_size')), + $this->convertToBytes(ini_get('upload_max_filesize')) + ), + 0 + ); + $mysql_client_command_path = $preferencesService->MysqlClientCommandPath; if (!$locations || !$cities) { @@ -509,6 +516,14 @@ private function convertToBytes($from) } } + private function formatBytes($size, $precision = 2) + { + $base = log($size, 1024); + $suffixes = array('', 'k', 'M', 'G'); + + return round(pow(1024, $base - floor($base)), $precision).$suffixes[floor($base)]; + } + /** * Sets geolocation options. * From 271cc5d97644d5de406503e53b10cf1d0699fe01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 7 Jul 2015 14:47:07 +0200 Subject: [PATCH 52/90] CS-5880 - Save of order is not working for root topics in topics management reverse the order array improvements --- .../Newscoop/NewscoopBundle/Controller/TopicsController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php index 363637deb5..f6d3c5cd09 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php @@ -5,6 +5,7 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt */ + namespace Newscoop\NewscoopBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; @@ -91,6 +92,7 @@ public function treeAction(Request $request) } $tree = $repository->buildTreeArray($nodes); + usort($tree, function ($node1, $node2) { return $node2['topicOrder'] - $node1['topicOrder']; }); @@ -187,8 +189,8 @@ public function moveAction(Request $request, $id) } if (($request->get('last') || $request->get('first') || $request->get('middle')) && !$parent) { - $rootNodes = $repository->getRootNodes(); - $order = explode(',', $request->get('order')); + $rootNodes = $repository->getRootNodesQuery()->getResult(); + $order = array_reverse(explode(',', $request->get('order'))); $topicService->reorderRootNodes($rootNodes, $order); } From 92f452efaa5b61c39562b23e2808c835c700ff2e Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 9 Jul 2015 08:58:48 +0200 Subject: [PATCH 53/90] Release of new version 4.4.4 --- newscoop/DETAILED-CHANGELOG.txt | 148 ++++++++++++++++++ newscoop/composer.json | 2 +- newscoop/library/Newscoop/Version.php | 2 +- .../template_engine/classes/CampVersion.php | 4 +- 4 files changed, 152 insertions(+), 4 deletions(-) diff --git a/newscoop/DETAILED-CHANGELOG.txt b/newscoop/DETAILED-CHANGELOG.txt index 6090996041..e3c5bf3096 100644 --- a/newscoop/DETAILED-CHANGELOG.txt +++ b/newscoop/DETAILED-CHANGELOG.txt @@ -3,6 +3,154 @@ VERSION 4 NEWSCOOP 4.3 ========================================================================================================= Version 4.4 - Newscoop 4.4 minor release + 09/07/2015 08:58 4.4.4 Newscoop 4.4.4 minor release + 271cc5d CS-5880 - Save of order is not working for root topics in topics management + 7c15658 comment out php values in htacces and display a proper value + 4d5077e CS-5878 - Newscoop 4.4.4 allows only 100M even if php.ini allows higher upload max size value + 0c64d4d updated translation resources + a753dfc updated translation resources + 06e1b8c updated translation resources + 4945dbf CS-5867 Increase the height of the modals in Newscoop to take almost full height of the browser window + f93923f CS-5871 Improve image caption in admin interface + 77ff032 fixed showing topics checkboxes in Firefox + de6a516 improve text + a51855d CS-5868- adapt the topic design to show more topics in a window + 90e61eb [Improvement] Add links to REST API documentation in admin ui + 525c86f rename method + e733e51 CS-5804 - Subtopics list broken + 572aaff [CS-5863] [Fix] User without user type can edit and delete comments + 7d4d8a9 CS-5672 - Due to missed several fields in System Preferencies form the Save function doesn't work + ae0b88a updated translation resources + fb42c17 updated translation resources + fcc26ae CS-5861 Update link to user manual + 52d4c67 improved slideshows + 83dbc07 added thumbnail handler + 1e1d3b1 slideshows improvements + 99e6532 remove old file + 39b8d2d change function name to uri from url + c1360a1 don't update change update_time on article update + e4075b3 [CS-5853] [Fix] Date of articles in related articles search in the modal is always current day + 55bf96a [CS-5851] [Fix] Option to show photos in full size + f7ae02b [CS-5822] [Fix] publication management: switching url type does not work + f34c9dc CS-5854: Adds css fix so select2 will keep the same width + 15614ab CS-5461: Implementes $gimme->article->rating_enabled + 465df6e set fallback translations to english by default in bazinga bundle + 5cb4bb9 CS-5854: Adds checkbox to search in hidden article types + 70853e2 added query to upgrade scripts - article_language column + 8c553f2 fixed articles search by topics + e378cf8 TW-250: Adds allowfullscreen attribute as valid + dda92ee fixed count by menthods + 3ff1da0 fixed adding root topic + e2fa6c1 [CS-5848] [Fix] Properly save article properties + a16341d make cache key aware of the article number + b5eeaf5 Changes url seperator to / instead of OS dependant directory seperator + 4c9ab14 TW-246 - topic-Management + 7eb197b fix wrong collumn name in indexes + eb03ac2 updated translation resources + 83190f7 updated translation resources + 3a7b02f remove not needed code (wrong merging) + b7f99ae [CS-5846] [Fix] Default order of available articles in featured article lists manager should be by recency + 3669df6 fix spacing + 4a35ecd AENV-504: make inputfields for width and height for vimeo/youtube snippets mandatory updated metadata in campsite_core and upgrades sql + 26e5a3f replaced sql script with silex script + 639dd39 fixed articles ordering + 7b8f51c Adds check if article to be deleted actually exists + 8a3be16 CS-5779 - Scrolling in playlist is not working for the second playlist if playlists are so long + ad20e7c updated translation resources + 7f5c09a updated translation resources + 83a7d16 AENV-503 - adapt save button behaviour in the attach slideshow modal + d17ee14 improve messages + a607af7 CS-5825 Better labels and tooltips for Article Type field management + 318ef74 BN-200 - Search article by author is not working in Playlist management + 3ca5712 CS-5802 - instantly remove items over limit + cbd29fc Adds Docker instructions to README + 26d0d7e Adds default cron + 6e56952 [CS-5825] [Fix] Article Type field controls Show in Editor and Show/Hide have no function + ebd266b Fixes cron command + 4560f5a CS-5802 - Featured Article List limits do not work as expected + 2236933 use public function in cache key, clear chache key on comments status update from article save action + fb0e347 CS-5806 - New Topics language filter does not work when session cookie expires + 099db89 CS-5809 - Translating a subtopic auto-fills the parent topic translation field + 34a71ea CS-5810 - Clicking a topic delete button twice throws a 'Failed to find topic by ID' error + e9a4a7e [TW-243] [Fix] Comment-function doesn't work + 89bbe1b [CS-5811] [Improvement] Interface for uploading private plugins results in white screen + ddd3d7c Adds prod/dev env switch and runs cron server + f4f479a [CS-5837] [New Feature] add support for other editors in smarty link function + bad60b8 Change indentation for yml, shell to bash and tells tail to keep retrying + def602e [CS-5832] [Fix] Comments article preview shows title and date multiple times + b9ae549 [CS-5814] [Fix] Article Edit sidebar still has the switch 'Visible to non-subscribers' + 77f0b8f uncomment volumns + ff7641c clean install sql and snipptets queries + 841c93b [CS-5832] [Fix] deactivate comments ordering by article name, allow showing comments for pending articles. + b238644 remove unused entrypoint.sh + c5c9a95 latest docker build + f87011c CS-5799 - Can't select previously created Featured Article Lists via drop-down menu + b2f0612 CS-5803 - Tags shown to user while the Featured Article List page is loading + e1088dd fixed exception parameters + 65079f8 CS-5821 - loading spinner for editorial comments never stops + 91efe32 make use of only oembed and extract endpoints + 02bee0e use zend request params only when available + 0defa79 set a proper jms serializer version + 92b1d73 remove not needed header + 3463878 keep breadcrumbs for editing user + 085fd36 remove jms serializer commit restriction from composer.json + 194278c get error message from the response + fb32afb use black color for active select's + 5d1c81b use value from head title in page titles again + 166e735 CS-5606: Changes temp dir to project cache dir + fd08e64 change parameter format to string + 39da243 added api key handling to the embedly controller + edfa7cd fix snippets sql for both upgrades and new installs + c2e8911 Initialize loader even when translations files are cached + 40d469a Revert "Aenv 495" + 99d6650 updated translation resources + 055e82c add embedly enpoint field to snippets for upgrade + 6d233b4 updated translation resources + 3c074da updated translation resources + 7949c10 add endpoint field back to demo data for embedly snippet + 9a6f9e7 TW-75: Adds parameter to sort articles by publication date + ad29970 fix wrong translations labels + 4ed0b78 uodate also install sql's + b8d1a82 use default NULL instead 0 + c560163 CS-5819 This capitalization does not appear in Newscoop source code + d8474af make IdPublication nullable with default 0 + 76bb862 CS-5819 Update YML files for string modifications + a308251 CS-5761 - "The last article of this list has been removed" is not translated. + 22a6497 Buttons "Add this article" and "Close" is not translated in Playlist management + d6931dc improved slideshows handling using API + 106ac5f When using tpid parameter page can get into an infinite loop + 13653f9 CS-5819 Clarify labels for Article Types + 0e21216 reintroduce clearPlaylistTemplates calls + 6175e3f improve playlists articles fetching with getArticle + fde43db use arrayResult for fetching playlist articles ids, fetch real articles with getArticlesByCriteria + 5400629 manual join needed article relations for api - it takes less time than left joining + 49f6e8e replace our custom playlists articles ordering with gedmo/sortable + 7b2b719 set proper limit + 6381adf fixed articles listing on the playlist with the limit + 9649dd4 improve removing left nodes, fix clearing Playlist templates, update order initializing script + 83c2eb3 added script to remove not existing index + 098f1b8 Adds correct way to update section_id in Articles table + d2fc1e7 Fixes issues with missing or wrong positioned beginTransaction calls + 67fadc9 fixed jms serializer version to work also with php 5.3 + f67447d serialize objects in cache keys, use md5 instead base64_encode + e23105a fix cache key for getArticle in CampURIShortNames + 806a978 allow resseting article with this same number + f50f389 fetch language + 7185623 fix typo + 67c92a3 Moves script to folder with date of merging PR to prevent errors + f53efed Fixes issue with locale getting lost + c25c2a4 TW-203: Fixes error with comment search service + 8ce3899 added utcdatetime type to the upgrade script + e090c8c added articles filtering by language in playlists + 50d22e7 updated translation resources + 700033f updated translation resources + 04fb338 updated translation resources + bfb57a0 updated translation resources + eaf8808 IM-2792 - some article types are blank pages when opening them from backend after upgrade to 4.4.3 + d57b96e improved auth-interceptor + 2761544 improve sql script + d1a6fbc remove webcode on article delete + fc1c5f1 CS5784 - Playlists don't support many languages 26/05/2015 16:49 4.4.3 Newscoop 4.4.3 minor release 8c71179 add missing update sql, fix useForAll js function with tinymce 49c5d01 CS-5790: Fixes issue when images/files/videos/pdf folder is symlink diff --git a/newscoop/composer.json b/newscoop/composer.json index 078abae0fd..30eaf54321 100755 --- a/newscoop/composer.json +++ b/newscoop/composer.json @@ -7,7 +7,7 @@ "publication" ], "homepage":"http:\/\/www.sourcefabric.org\/en\/newscoop\/", - "version": "4.4.3", + "version": "4.4.4", "license":"GPL-3.0", "authors":[ diff --git a/newscoop/library/Newscoop/Version.php b/newscoop/library/Newscoop/Version.php index 345e53d06b..e778816664 100644 --- a/newscoop/library/Newscoop/Version.php +++ b/newscoop/library/Newscoop/Version.php @@ -12,7 +12,7 @@ */ class Version { - const VERSION = '4.4.3'; + const VERSION = '4.4.4'; const API_VERSION = '1.2'; diff --git a/newscoop/template_engine/classes/CampVersion.php b/newscoop/template_engine/classes/CampVersion.php index 7e0eb1d7cb..c21caae332 100755 --- a/newscoop/template_engine/classes/CampVersion.php +++ b/newscoop/template_engine/classes/CampVersion.php @@ -27,7 +27,7 @@ final class CampVersion /** * @var string */ - private $m_release = '4.4.3'; + private $m_release = '4.4.4'; /** * @var string @@ -42,7 +42,7 @@ final class CampVersion /** * @var string */ - private $m_releaseDate = '2015-05-26'; + private $m_releaseDate = '2015-07-09'; /** * @var string From c2de384f398d881dce65aae553cc0f62c6b8ed93 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 9 Jul 2015 11:34:21 +0200 Subject: [PATCH 54/90] improve detecting and updating plylist templates --- .../admin/controllers/ThemesController.php | 18 ++---------------- .../themes/wizard-theme-playlists.phtml | 12 ++++++------ .../Newscoop/Services/PlaylistsService.php | 10 +++++----- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/newscoop/application/modules/admin/controllers/ThemesController.php b/newscoop/application/modules/admin/controllers/ThemesController.php index 7bd68218e8..d0d240b66a 100644 --- a/newscoop/application/modules/admin/controllers/ThemesController.php +++ b/newscoop/application/modules/admin/controllers/ThemesController.php @@ -310,23 +310,9 @@ public function wizardThemePlaylistsAction() $path = __DIR__.'/../../../../themes/'.$theme->getPath().'theme.xml'; $themePlaylists = $playlistsService->loadThemePlaylists($path); - if (!empty($themePlaylists)) { - if (array_key_exists('template', $themePlaylists['list'])) { - $bakThemePlaylists = $themePlaylists; - $themePlaylists = array(); - $themePlaylists['list'][0] = $bakThemePlaylists['list']; - } - - foreach ($themePlaylists['list'] as $key => $themePlaylist) { - if (array_key_exists('@attributes', $themePlaylist['template'])) { - $bakThemePlaylist = $themePlaylist; - $themePlaylists['list'][0]['template'] = array(); - $themePlaylists['list'][0]['template'][0] = $bakThemePlaylist['template']; - } - } - } + $newThemePlaylists = $playlistsService->buildNewThemePlaylists($themePlaylists); - $this->view->themePlaylists = $themePlaylists; + $this->view->themePlaylists = $newThemePlaylists; $this->view->playlistsAreUpToDate = $playlistsService->checkIfThemePlaylistsAreUpToDate($theme, $this->view->themePlaylists); $this->view->theme = $theme; } diff --git a/newscoop/application/modules/admin/views/scripts/themes/wizard-theme-playlists.phtml b/newscoop/application/modules/admin/views/scripts/themes/wizard-theme-playlists.phtml index 53e6465ce3..bf930bf78a 100644 --- a/newscoop/application/modules/admin/views/scripts/themes/wizard-theme-playlists.phtml +++ b/newscoop/application/modules/admin/views/scripts/themes/wizard-theme-playlists.phtml @@ -5,7 +5,7 @@ $translator = \Zend_Registry::get('container')->getService('translator');
      trans('Theme playlists', array(), 'themes') ?> - themePlaylists['list'])) { ?> + themePlaylists) > 0) { ?> playlistsAreUpToDate == false) { ?>
      trans('Cached informations about theme playlists are not up to date!', array(), 'themes') ?>
      @@ -13,18 +13,18 @@ $translator = \Zend_Registry::get('container')->getService('translator');
      - themePlaylists['list'] as $themePlaylist) { ?> + themePlaylists as $key => $themePlaylist) { ?>
      -

      trans('Playlist name', array(), 'themes') ?>:

      +

      trans('Playlist name', array(), 'themes') ?>:

      - 0){ ?> + 0){ ?> - - , + + , diff --git a/newscoop/library/Newscoop/Services/PlaylistsService.php b/newscoop/library/Newscoop/Services/PlaylistsService.php index e1f6142f2a..64aeabfa7e 100644 --- a/newscoop/library/Newscoop/Services/PlaylistsService.php +++ b/newscoop/library/Newscoop/Services/PlaylistsService.php @@ -171,8 +171,7 @@ public function checkIfThemePlaylistsAreUpToDate($theme, $themePlaylists) return false; } - $newThemePlaylists = $this->buildNewThemePlaylists($themePlaylists); - foreach ($newThemePlaylists as $playlistName => $themePlaylist) { + foreach ($themePlaylists as $playlistName => $themePlaylist) { $playlist = $this->em->getRepository('Newscoop\Entity\Playlist')->getPlaylistByTitle($playlistName)->getOneOrNullResult(); if (!$playlist) { return false; @@ -276,7 +275,7 @@ public function clearPlaylistTemplates($playlist) } } - private function buildNewThemePlaylists($themePlaylists) + public function buildNewThemePlaylists($themePlaylists) { $newThemePlaylists = array(); if (array_key_exists('template', $themePlaylists['list'])) { @@ -286,7 +285,8 @@ private function buildNewThemePlaylists($themePlaylists) } foreach ($themePlaylists['list'] as $themePlaylist) { - $newThemePlaylists[$themePlaylist['@attributes']['name']] = array(); + $playlistName = $themePlaylist['@attributes']['name']; + $newThemePlaylists[$playlistName] = array(); if (array_key_exists('@attributes', $themePlaylist['template'])) { $bakThemePlaylist = $themePlaylist; $themePlaylist = array(); @@ -294,7 +294,7 @@ private function buildNewThemePlaylists($themePlaylists) } foreach ($themePlaylist['template'] as $template) { - $newThemePlaylists[$themePlaylist['@attributes']['name']]['templates'][] = $template['@attributes']['file']; + $newThemePlaylists[$playlistName]['templates'][] = $template['@attributes']['file']; } } From 4a8de2071c52991ed630bf331c5b9e04428a0746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 9 Jul 2015 16:50:10 +0200 Subject: [PATCH 55/90] fixed displaying subtopics - missing parameter fixed displaying subtopics - missing parameter --- newscoop/template_engine/classes/SubtopicsList.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/newscoop/template_engine/classes/SubtopicsList.php b/newscoop/template_engine/classes/SubtopicsList.php index da3068f510..ddc0122a4c 100644 --- a/newscoop/template_engine/classes/SubtopicsList.php +++ b/newscoop/template_engine/classes/SubtopicsList.php @@ -29,17 +29,7 @@ class SubtopicsList extends ListObject protected function CreateList($p_start = 0, $p_limit = 0, array $p_parameters, &$p_count) { $rootTopicId = $p_parameters['topic_identifier']; - $start = null; - $limit = null; $order = array(); - if ($p_start > 0) { - $start = $p_start; - } - - if ($p_limit > 0) { - $limit = $p_limit; - } - if (!isset($p_parameters['direct'])) { $p_parameters['direct'] = true; } @@ -69,6 +59,7 @@ protected function CreateList($p_start = 0, $p_limit = 0, array $p_parameters, & $p_parameters['direct'], isset($order['field']) ? $order['field'] : null, isset($order['dir']) ? $order['dir'] : null, + false, $start, $limit )->getArrayResult(); From cc5aa8c9ca9da97da1eb2d84dfdbfb5e1bb03573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 9 Jul 2015 17:53:03 +0200 Subject: [PATCH 56/90] fixing metatopic class - get results as an array each time --- .../Entity/Repository/TopicRepository.php | 17 ++++ .../NewscoopBundle/Services/TopicService.php | 57 ++++++++++- .../template_engine/metaclasses/MetaTopic.php | 97 ++++++++++--------- 3 files changed, 119 insertions(+), 52 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php index 990816ece2..c8ab784580 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php @@ -525,4 +525,21 @@ public function getRootNodes($locale = null, $childrenLevel = false, $sortByFiel return $this->setTranslatableHint($qb->getQuery(), $locale); } + + public function getOneByExtractedFullName($name, $languageCode) + { + return $this->_em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation') + ->createQueryBuilder('tt') + ->select('tt', 'o') + ->leftJoin('tt.object', 'o') + ->where('tt.content = :content') + ->andWhere('tt.locale = :locale') + ->andWhere('tt.field = :field') + ->setParameters(array( + 'content' => $name, + 'locale' => $languageCode, + 'field' => 'title' + )) + ->getQuery(); + } } diff --git a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php index 152dfc126e..4e96a03960 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php @@ -354,14 +354,14 @@ public function isAttached($topicId, $attachedCount = false) */ public function getTopicByFullName($fullName) { - $fullName = trim($fullName); - $lastColon = strrpos($fullName, ':'); - if (!$lastColon) { + $extractedData = $this->extractNameAndLanguage($fullName); + if (empty($extractedData)) { return; } - $name = substr($fullName, 0, $lastColon); - $languageCode = substr($fullName, $lastColon + 1); + $name = $extractedData['name']; + $languageCode = $extractedData['locale']; + $topicTranslation = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation')->findOneBy(array( 'content' => $name, 'locale' => $languageCode, @@ -375,6 +375,52 @@ public function getTopicByFullName($fullName) return $topicTranslation->getObject(); } + /** + * Returns a topic as an array identified by the full name in the + * format topic_name:language_code. + * + * @param string $fullName Topic's full name + * + * @return array + */ + public function getTopicByFullNameAsArray($fullName) + { + $extractedData = $this->extractNameAndLanguage($fullName); + if (empty($extractedData)) { + return; + } + + $name = $extractedData['name']; + $languageCode = $extractedData['locale']; + + $topicTranslation = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation') + ->getOneByExtractedFullName($name, $languageCode) + ->getArrayResult(); + + if (empty($topicTranslation)) { + return; + } + + return $topicTranslation[0]['object']; + } + + private function extractNameAndLanguage($fullName) + { + $fullName = trim($fullName); + $lastColon = strrpos($fullName, ':'); + if (!$lastColon) { + return; + } + + $name = substr($fullName, 0, $lastColon); + $languageCode = substr($fullName, $lastColon + 1); + + return array( + 'name' => $name, + 'locale' => $languageCode + ); + } + /** * Gets the topic by id, its title or title * combined with the language and language code. @@ -387,6 +433,7 @@ public function getTopicByFullName($fullName) */ public function getTopicBy($string, $locale = null) { + $topic = $this->getTopicRepository() ->getTopicByIdOrName($string, $locale) ->getOneOrNullResult(); diff --git a/newscoop/template_engine/metaclasses/MetaTopic.php b/newscoop/template_engine/metaclasses/MetaTopic.php index eaa8e9101f..e74d0751a8 100755 --- a/newscoop/template_engine/metaclasses/MetaTopic.php +++ b/newscoop/template_engine/metaclasses/MetaTopic.php @@ -1,6 +1,7 @@ * @copyright 2014 Sourcefabric z.ú. * @license http://www.gnu.org/licenses/gpl-3.0.txt @@ -8,68 +9,60 @@ require_once __DIR__.'/MetaDbObject.php'; /** - * Meta topic class. + * Meta topic class */ class MetaTopic extends MetaDbObject { /** - * Topic. - * + * Topic * @var Topic object */ private $topic; /** - * Topic id. - * - * @var int + * Topic id + * @var integer */ public $identifier; /** - * Topic name. - * + * Topic name * @var string */ public $name; /** - * Topic full name e.g. topic:en. - * + * Topic full name e.g. topic:en * @var string */ public $value; /** - * Is topic root. - * - * @var bool + * Is topic root + * @var boolean */ public $is_root; /** - * Parent topic. - * + * Parent topic * @var MetaTopic */ public $parent; /** - * Checks if topic is defined. - * - * @var bool + * Checks if topic is defined + * @var boolean */ public $defined; /** - * Alias to identifier. - * - * @var int + * Alias to identifier + * @var integer */ public $id; /** - * Construct. + * Construct * * @param string $topicIdOrName */ @@ -84,28 +77,32 @@ public function __construct($topicIdOrName = null, $languageCode = null) if ($cacheService->contains($cacheKey)) { $this->topic = $cacheService->fetch($cacheKey); } else { + $em = \Zend_Registry::get('container')->getService('em'); + $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); if ($languageCode) { $locale = $languageCode; } else { $locale = $this->getLocale(); } - $topicService = \Zend_Registry::get('container')->getService('newscoop_newscoop.topic_service'); - $topic = $topicService->getTopicBy($topicIdOrName, $locale); - if ($topic) { - $topic->setTranslatableLocale($locale); - $this->topic = $topic; + $topic = $repository->getTopicByIdOrName($topicIdOrName, $locale)->getArrayResult(); + + if (empty($topic)) { + $topic = $repository->getTopicByFullNameAsArray($fullName); } - if (!$this->topic) { + if (empty($topic)) { return; } + $this->topic = $topic[0]; + $this->topic['locale'] = $locale; + $cacheService->save($cacheKey, $this->topic); } - $this->id = $this->topic->getId(); - $this->identifier = $this->topic->getId(); + $this->id = $this->topic['id']; + $this->identifier = $this->topic['id']; $this->name = $this->getName(); $this->value = $this->getValue(); $this->is_root = $this->isRoot(); @@ -113,21 +110,22 @@ public function __construct($topicIdOrName = null, $languageCode = null) $this->defined = isset($this->topic); } - protected function getName() + protected function getName($languageId = null) { - if ($this->topic->getTitle() !== '') { - return $this->topic->getTitle(); - } - - $titleByLanguage = null; - $currentLocale = \CampTemplate::singleton()->context()->language->code; - foreach ($this->topic->getTranslations() as $translation) { - if ($translation->getLocale() === $currentLocale) { - $titleByLanguage = $translation->getContent(); + if ($languageId) { + $em = \Zend_Registry::get('container')->getService('em'); + $locale = $em->getReference('Newscoop\Entity\Language', $languageId)->getCode(); + $titleByLanguage = null; + foreach ($this->topic['translations'] as $translation) { + if ($translation['locale'] === $locale) { + $titleByLanguage = $translation['content']; + } } + + return $titleByLanguage; } - return $titleByLanguage; + return $this->topic['title']; } protected function getLocale() @@ -137,17 +135,22 @@ protected function getLocale() protected function getValue() { - if (!$this->topic && !$this->name) { + if (!isset($this->topic) || empty($this->topic)) { + return; + } + + $name = $this->topic['title']; + if (empty($name)) { return; } - return $this->name.':'.$this->topic->getTranslatableLocale(); + return $name.':'.$this->topic['locale']; } protected function isRoot() { - if ($this->topic && $this->topic->getRoot()) { - if ($this->topic->getRoot() == $this->id) { + if (isset($this->topic['id']) && isset($this->topic['root'])) { + if ($this->topic['root'] == $this->topic['id']) { return true; } @@ -157,8 +160,8 @@ protected function isRoot() protected function getParent() { - if ($this->topic && $this->parent) { - return new self($this->parent->getId(), $this->topic->getTranslatableLocale()); + if (isset($this->topic['id']) && isset($this->topic['parent'])) { + return new MetaTopic($this->topic['parent']['id'], $this->topic['locale']); } return; From 8b82051d8b498c30182a7e174b297581b0b1d882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Thu, 9 Jul 2015 18:32:54 +0200 Subject: [PATCH 57/90] improve MetaTopic class --- .../Entity/Repository/TopicRepository.php | 5 ++-- .../NewscoopBundle/Services/TopicService.php | 4 +++- .../template_engine/metaclasses/MetaTopic.php | 24 +++++-------------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php index c8ab784580..100b703538 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php @@ -528,8 +528,9 @@ public function getRootNodes($locale = null, $childrenLevel = false, $sortByFiel public function getOneByExtractedFullName($name, $languageCode) { - return $this->_em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation') - ->createQueryBuilder('tt') + return $this + ->getQueryBuilder() + ->from('Newscoop\NewscoopBundle\Entity\TopicTranslation', 'tt') ->select('tt', 'o') ->leftJoin('tt.object', 'o') ->where('tt.content = :content') diff --git a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php index 4e96a03960..7c6b979269 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Services/TopicService.php @@ -393,7 +393,7 @@ public function getTopicByFullNameAsArray($fullName) $name = $extractedData['name']; $languageCode = $extractedData['locale']; - $topicTranslation = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\TopicTranslation') + $topicTranslation = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\Topic') ->getOneByExtractedFullName($name, $languageCode) ->getArrayResult(); @@ -401,6 +401,8 @@ public function getTopicByFullNameAsArray($fullName) return; } + $topicTranslation[0]['object']['title'] = $topicTranslation[0]['title']; + return $topicTranslation[0]['object']; } diff --git a/newscoop/template_engine/metaclasses/MetaTopic.php b/newscoop/template_engine/metaclasses/MetaTopic.php index e74d0751a8..6a70f92819 100755 --- a/newscoop/template_engine/metaclasses/MetaTopic.php +++ b/newscoop/template_engine/metaclasses/MetaTopic.php @@ -78,6 +78,7 @@ public function __construct($topicIdOrName = null, $languageCode = null) $this->topic = $cacheService->fetch($cacheKey); } else { $em = \Zend_Registry::get('container')->getService('em'); + $topicService = \Zend_Registry::get('container')->getService('newscoop_newscoop.topic_service'); $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic'); if ($languageCode) { $locale = $languageCode; @@ -86,16 +87,16 @@ public function __construct($topicIdOrName = null, $languageCode = null) } $topic = $repository->getTopicByIdOrName($topicIdOrName, $locale)->getArrayResult(); - if (empty($topic)) { - $topic = $repository->getTopicByFullNameAsArray($fullName); + $this->topic = $topicService->getTopicByFullNameAsArray($topicIdOrName); + } else { + $this->topic = $topic[0]; } - if (empty($topic)) { + if (empty($this->topic)) { return; } - $this->topic = $topic[0]; $this->topic['locale'] = $locale; $cacheService->save($cacheKey, $this->topic); @@ -110,21 +111,8 @@ public function __construct($topicIdOrName = null, $languageCode = null) $this->defined = isset($this->topic); } - protected function getName($languageId = null) + protected function getName() { - if ($languageId) { - $em = \Zend_Registry::get('container')->getService('em'); - $locale = $em->getReference('Newscoop\Entity\Language', $languageId)->getCode(); - $titleByLanguage = null; - foreach ($this->topic['translations'] as $translation) { - if ($translation['locale'] === $locale) { - $titleByLanguage = $translation['content']; - } - } - - return $titleByLanguage; - } - return $this->topic['title']; } From 38de28662eb9c5f1a4b6f0d7b36472069b79c3de Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Fri, 10 Jul 2015 11:32:54 +0200 Subject: [PATCH 58/90] use proper left join for thread, move search to header - it shows up mor comments on first screen --- .../Newscoop/Services/CommentService.php | 5 ++-- .../Controller/CommentsController.php | 12 ++++++++-- .../Resources/views/Comments/index.html.twig | 23 ++++++++++++------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/newscoop/library/Newscoop/Services/CommentService.php b/newscoop/library/Newscoop/Services/CommentService.php index 7ab2e70887..657e813e68 100644 --- a/newscoop/library/Newscoop/Services/CommentService.php +++ b/newscoop/library/Newscoop/Services/CommentService.php @@ -12,6 +12,7 @@ use Newscoop\EventDispatcher\Events\GenericEvent; use Newscoop\Entity\Comment; use Newscoop\Services\PublicationService; +use Doctrine\ORM\Query\Expr; /** * Comment service @@ -268,9 +269,9 @@ public function searchByPhrase($phrase) ->createQueryBuilder('c'); $queryBuilder - ->select('c', 'cm.name', 't.name') + ->select('c', 'cm.name') ->leftJoin('c.commenter', 'cm') - ->leftJoin('c.thread', 't') + ->leftJoin('Newscoop\Entity\Article', 't', Expr\Join::WITH, 'c.thread = t.number AND c.language = t.language') ->where($queryBuilder->expr()->orX( $queryBuilder->expr()->like('c.message', $queryBuilder->expr()->literal('%'.$phrase.'%')), $queryBuilder->expr()->like('c.subject', $queryBuilder->expr()->literal('%'.$phrase.'%')), diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php index 1cd8be20f2..ad6a00838b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/CommentsController.php @@ -72,8 +72,16 @@ public function indexAction(Request $request) if ($request->isMethod('POST')) { if ($searchForm->isValid()) { $data = $searchForm->getData(); - $comments = $commentService->searchByPhrase($data['search'])->getQuery(); - $pagination = $paginator->paginate($comments, $pageNumber, $displayPerPage); + + $commentsQueryBuilder = $commentService->searchByPhrase($data['search']); + $countQueryBuilder = clone $commentsQueryBuilder; + $countQueryBuilder->select('COUNT(c)'); + $count = $countQueryBuilder->getQuery()->getSingleScalarResult(); + + $comments = $commentsQueryBuilder->getQuery(); + $comments->setHint('knp_paginator.count', $count); + + $pagination = $paginator->paginate($comments, $pageNumber, $displayPerPage, array('distinct' => false)); $pagination->setTemplate('NewscoopNewscoopBundle:Pagination:pagination_bootstrap3.html.twig'); return array( diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig index 1c614eecd5..eaf3b8964c 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig @@ -2,7 +2,21 @@ {% trans_default_domain "new_comments" %} {% block admin_title %}{{ 'comments.label.comments'|trans }} - {{ parent() }}{% endblock %} -{% block admin_page_title_content %}{{ 'comments.label.comments'|trans }}{% endblock %} + +{% block admin_page_title_box %} +
      + {{ 'comments.label.comments'|trans }} +
      + +
      + {{ form_widget(searchForm.search, { 'attr': { 'class': 'form-control input-sm', 'placeholder' : 'comments.label.searchholder'|trans } }) }} +
      + + {{ form_rest(searchForm) }} + +
      +
      +{% endblock %} {% block admin_stylesheets %} @@ -55,13 +69,6 @@
    - {% if pagination.getTotalItemCount > 0 %}
    From d3150bc2b14cd8bd34611a1689bc4821c77cab0b Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Fri, 10 Jul 2015 12:54:32 +0200 Subject: [PATCH 59/90] CS-5888: Adds parameter published to list_related_articles On frontend the parameter defaults to true (except when in preview mode). When the parameter is set to true, it will only select related articles that are published. --- newscoop/classes/ContextBoxArticle.php | 17 ++++++++++++++--- .../block.list_related_articles.php | 5 +++++ .../template_engine/classes/BoxArticlesList.php | 3 ++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/newscoop/classes/ContextBoxArticle.php b/newscoop/classes/ContextBoxArticle.php index 4693e327d1..6d892d1419 100644 --- a/newscoop/classes/ContextBoxArticle.php +++ b/newscoop/classes/ContextBoxArticle.php @@ -91,12 +91,23 @@ public static function GetList(array $params, $p_order = null, . ' b.id IN (SELECT c.fk_context_id ' . ' FROM Articles a, context_articles c ' . ' WHERE c.fk_article_no = ' . $params['article'] - . ' AND a.Number = c.fk_article_no)' - . ' ORDER BY a0.PublishDate DESC'; + . ' AND a.Number = c.fk_article_no)'; + if (isset($params['published']) && $params['published'] == 'true') { + $sql .= ' AND a0.Published = "Y"'; + } + $sql .= ' ORDER BY a0.PublishDate DESC'; } else { - $sql = 'SELECT fk_article_no FROM context_articles' + if (isset($params['published']) && $params['published'] == 'true') { + $sql = 'SELECT b.fk_article_no FROM context_articles b, Articles a0' + . ' WHERE b.fk_context_id = ' . $params['context_box'] .' AND ' + . ' b.fk_article_no = a0.Number AND ' + . ' a0.Published = "Y"' + . ' ORDER BY b.id'; + } else { + $sql = 'SELECT fk_article_no FROM context_articles' . ' WHERE fk_context_id = ' . $params['context_box'] . ' ORDER BY id'; + } } if ($p_limit > 0) { $sql .= ' LIMIT ' . $p_limit; diff --git a/newscoop/include/smarty/campsite_plugins/block.list_related_articles.php b/newscoop/include/smarty/campsite_plugins/block.list_related_articles.php index 4151dbef9e..d2b9c3e575 100644 --- a/newscoop/include/smarty/campsite_plugins/block.list_related_articles.php +++ b/newscoop/include/smarty/campsite_plugins/block.list_related_articles.php @@ -26,6 +26,11 @@ function smarty_block_list_related_articles($p_params, $p_content, &$p_smarty, & $p_smarty->smarty->loadPlugin('smarty_shared_escape_special_chars'); $campContext = $p_smarty->getTemplateVars('gimme'); + // Default to true, but not when previewing + if (!isset($p_params['published']) && !$campContext->preview) { + $p_params['published'] = 'true'; + } + if (!isset($p_content)) { $start = $campContext->next_list_start('BoxArticlesList'); $boxArticlesList = new BoxArticlesList($start, $p_params); diff --git a/newscoop/template_engine/classes/BoxArticlesList.php b/newscoop/template_engine/classes/BoxArticlesList.php index 28503c2ebf..0dc44f5441 100644 --- a/newscoop/template_engine/classes/BoxArticlesList.php +++ b/newscoop/template_engine/classes/BoxArticlesList.php @@ -56,7 +56,7 @@ protected function CreateList($p_start = 0, $p_limit = 0, array $p_parameters, & if ($article->defined() && ($preview || $article->is_published)) { $metaBoxArticlesList[] = $article; } - } + } return $metaBoxArticlesList; } @@ -174,6 +174,7 @@ protected function ProcessParameters(array $p_parameters) case 'columns': case 'name': case 'order': + case 'published': case 'role': if ($parameter == 'length' || $parameter == 'columns') { $intValue = (int)$value; From cab9b1393a7921f15651f9e125ed446a566b4172 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Mon, 13 Jul 2015 12:32:42 +0200 Subject: [PATCH 60/90] update 4.4.4 release --- newscoop/DETAILED-CHANGELOG.txt | 8 +++++++- newscoop/template_engine/classes/CampVersion.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/newscoop/DETAILED-CHANGELOG.txt b/newscoop/DETAILED-CHANGELOG.txt index e3c5bf3096..6639e41184 100644 --- a/newscoop/DETAILED-CHANGELOG.txt +++ b/newscoop/DETAILED-CHANGELOG.txt @@ -3,7 +3,13 @@ VERSION 4 NEWSCOOP 4.3 ========================================================================================================= Version 4.4 - Newscoop 4.4 minor release - 09/07/2015 08:58 4.4.4 Newscoop 4.4.4 minor release + 13/07/2015 12:30 4.4.4 Newscoop 4.4.4 minor release + d3150bc CS-5888: Adds parameter published to list_related_articles + 38de286 use proper left join for thread, move search to header - it shows up mor comments on first screen + 8b82051 improve MetaTopic class + cc5aa8c fixing metatopic class - get results as an array each time + 4a8de20 fixed displaying subtopics - missing parameter + c2de384 improve detecting and updating plylist templates 271cc5d CS-5880 - Save of order is not working for root topics in topics management 7c15658 comment out php values in htacces and display a proper value 4d5077e CS-5878 - Newscoop 4.4.4 allows only 100M even if php.ini allows higher upload max size value diff --git a/newscoop/template_engine/classes/CampVersion.php b/newscoop/template_engine/classes/CampVersion.php index c21caae332..742939fbfa 100755 --- a/newscoop/template_engine/classes/CampVersion.php +++ b/newscoop/template_engine/classes/CampVersion.php @@ -42,7 +42,7 @@ final class CampVersion /** * @var string */ - private $m_releaseDate = '2015-07-09'; + private $m_releaseDate = '2015-07-13'; /** * @var string From 5b00d5335577b51e0efb6d0460acdd4824bcc817 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 13 Jul 2015 13:08:36 +0200 Subject: [PATCH 61/90] CS-5890: Returns null if there are no lists in theme --- newscoop/library/Newscoop/Services/PlaylistsService.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/newscoop/library/Newscoop/Services/PlaylistsService.php b/newscoop/library/Newscoop/Services/PlaylistsService.php index 64aeabfa7e..899262804e 100644 --- a/newscoop/library/Newscoop/Services/PlaylistsService.php +++ b/newscoop/library/Newscoop/Services/PlaylistsService.php @@ -277,6 +277,10 @@ public function clearPlaylistTemplates($playlist) public function buildNewThemePlaylists($themePlaylists) { + if (!array_key_exists('list', $themePlaylists)) { + return null; + } + $newThemePlaylists = array(); if (array_key_exists('template', $themePlaylists['list'])) { $bakThemePlaylists = $themePlaylists; From e4bd5e122941b71da4aded3ea773980a583efa80 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Tue, 14 Jul 2015 12:16:25 +0200 Subject: [PATCH 62/90] BN-220: Always close transaction --- .../Newscoop/Entity/Repository/PlaylistArticleRepository.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php b/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php index 349d04d930..4bb5133c5e 100644 --- a/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php +++ b/newscoop/library/Newscoop/Entity/Repository/PlaylistArticleRepository.php @@ -58,6 +58,8 @@ public function deleteArticle($articleId, $languageId) $em->getConnection()->rollback(); $em->close(); } + } else { + $em->getConnection()->commit(); } return $article; From 3f5b03f20315885b37445b2bb30dde5b681efe8f Mon Sep 17 00:00:00 2001 From: localizer Date: Tue, 14 Jul 2015 12:03:13 +0000 Subject: [PATCH 63/90] updated translation resources --- .../Resources/translations/article_images.da.yml | 8 ++++---- .../Resources/translations/article_type_fields.da.yml | 6 +++--- .../Resources/translations/article_types.da.yml | 6 +++--- .../NewscoopBundle/Resources/translations/articles.da.yml | 8 ++++---- .../NewscoopBundle/Resources/translations/help.da.yml | 2 +- .../NewscoopBundle/Resources/translations/library.da.yml | 2 +- .../NewscoopBundle/Resources/translations/themes.da.yml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml index 6a5ef50cea..8ebf369370 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml @@ -72,7 +72,7 @@ Date
    (yyyy-mm-dd): Dato
    (åååå-mm-dd) 'Filter by uploader...': 'Filtrer efter uploader...' 'Slideshow images': null 'Add items to slideshow': null -'Attached Slideshows': null -'Value is required and can''t be empty': null -'Select all images': null -'Unselect all images': null +'Attached Slideshows': 'Vedhæftede gallerier' +'Value is required and can''t be empty': 'Værdien er påkrævet og kan ikke være tom' +'Select all images': 'Vælg alle billeder' +'Unselect all images': 'Fravælg alle billeder' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml index 6a603180ea..e5e1b90df1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml @@ -1,5 +1,5 @@ -'Does serving this field count as a page read for statistics?': null -'Is this field intended for the reader to view? If not, it is metadata.': null +'Does serving this field count as a page read for statistics?': 'Skal visning af dette felt tælles som en sidelæsning i statistikken?' +'Is this field intended for the reader to view? If not, it is metadata.': 'Skal dette felt vises til læseren? Ellers er det metadata.' 'Event Color': 'Farve på begivenhed' 'You must input a number greater than $1 and less than $2 into the $3 field.': 'Indtast et tal større end $1 og mindre end $2 i $3 feltet.' 'You do not have the right to translate article types.': 'Du har ikke rettigheder til at oversætte artikel typer.' @@ -36,7 +36,7 @@ hide: skjul 'The field $1 does not exist.': 'Feltet $1 findes ikke.' 'The $1 field may only contain letters and underscore (_) character.': '$1 feltet må kun indeholde bogstaver og underscore tegnet (_).' 'Template Field Name': 'Skabelon feltnavn' -'Show to Authors?': null +'Show to Authors?': 'Vis til forfattere?' 'Renaming article type field': 'Omdøber artikel type felt' 'Rename field': 'Omdøb felt' 'Reassign a field type': 'Tildel en ny felttype' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_types.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_types.da.yml index 25dc3b6daa..021f791c6b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_types.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_types.da.yml @@ -1,6 +1,6 @@ list: liste filter: filter -'Show in Article Lists?': null +'Show in Article Lists?': 'Vis i artikel lister?' 'Are you sure you want to $1 articles of article type $2?': 'Vil du $1 artikler af type $2?' '$1 articles of article type $2': '$1 artikler af type $2' 'Hide human-readable field names': 'Skjul læsevenlige feltnavne' @@ -46,7 +46,7 @@ activate: aktiver 'The translation could not be added.': 'Oversættelsen kunne ikke tilføjes.' 'The article type $1 does not exist.': 'Artikel typen $1 findes ikke.' 'Template Type Name': 'Skabelon type navn' -'Show to Authors?': null +'Show to Authors?': 'Vis til forfattere?' 'Show article on section page': 'Vis artiklen på sektions siden' 'Show article on front page': 'Vis artiklen på forsiden' 'Publish date': 'Udgivelses dato' @@ -58,7 +58,7 @@ Merge!: Flet! 'Go to Step 2': 'Gå til trin 2' 'Display Name': 'Vist navn' 'Delete article type $1.': 'Slet artikel type $1.' -'Comments Enabled?': null +'Comments Enabled?': 'Slå kommentarer til?' 'Back to Step 2': 'Tilbage til trin 2' 'Back to Step 1': 'Tilbage til trin 1' 'Are you sure you want to delete the article type $1? WARNING: Deleting this article type will delete all the articles associated with this article type.': 'Vil du slette artikeltypen $1? ADVARSEL: Hvis du sletter artikeltypen bliver alle artikler af denne type slettet.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml index dc589dd76f..f249d1bb25 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml @@ -188,10 +188,10 @@ Snippet: Uddrag 'This list is already in a different state than the one in which it was loaded.': 'Listen er allerede ændret siden den blev åbnet.' 'List name should not be longer than 40 chars': 'Listens navn må ikke være længere end 40 tegn' 'Not valid number': 'Ikke et gyldigt tal' -'List limit': null -'The last article of this list has been removed.': null -Revert: null -'Could not automatically refresh the list': null +'List limit': 'Liste begrænsning' +'The last article of this list has been removed.': 'Den sidste artikel på denne liste er blevet fjernet.' +Revert: Fortryd +'Could not automatically refresh the list': 'Listen kunne ikke opdateres automatisk' 'The article slideshows have been successfully updated, please close the window.': null articles: playlists: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml index e97db1cf89..7ee077925e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/help.da.yml @@ -9,4 +9,4 @@ Version: Version 'Release date': Udgivelsesdato Help: Hjælp 'Alternatively, you can ask a question in our forums at': 'Alternativt kan du spørge på vores forum' -Documentation: null +Documentation: Dokumentation diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/library.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/library.da.yml index 7d3d7a8f85..d440b803d6 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/library.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/library.da.yml @@ -1,4 +1,4 @@ -'Show hidden Article Types?': null +'Show hidden Article Types?': 'Vis skjulte artikel typer?' Webcode: Webkode 'View article': 'Se artikel' Source: Kilde diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml index f15444c740..ca944acf64 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml @@ -87,7 +87,7 @@ Compatibility: Kompatibilitet '$1 files $2': '$1 filer $2' 'Available themes': 'Tilgængelige temaer' 'Update cached data': null -'Assigned templates': null +'Assigned templates': 'Tildelte skabeloner' 'Cached informations about theme playlists are not up to date!': null 'The theme''s configuration file does not contain information about the list of used featured articles.': null 'Below code should be placed into theme.xml (between ''theme'' nodes) file to make it work. This file is located in every theme''s main directory.': null From 20491346208de6d035f44197ef26ed8f3a70b465 Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 15 Jul 2015 15:55:11 +0000 Subject: [PATCH 64/90] updated translation resources --- .../NewscoopBundle/Resources/translations/api.da.yml | 2 +- .../Resources/translations/article_images.da.yml | 4 ++-- .../Resources/translations/article_type_fields.da.yml | 4 ++-- .../NewscoopBundle/Resources/translations/articles.da.yml | 6 +++--- .../NewscoopBundle/Resources/translations/comments.da.yml | 2 +- .../NewscoopBundle/Resources/translations/messages.da.yml | 4 ++-- .../Resources/translations/plugins_manager.da.yml | 8 ++++---- .../NewscoopBundle/Resources/translations/themes.da.yml | 2 +- .../NewscoopBundle/Resources/translations/users.da.yml | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml index b30037f31f..ee0a2afdeb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/api.da.yml @@ -76,7 +76,7 @@ api: clients: Klienter resources: info: 'Som standard er alle resourcer beskyttet af firewall, men du kan vælge resourcer der skal være offentligt tilgængelige.' - api_docs: null + api_docs: 'Fuld dokumentation for APIen kan findes på din server (det er offentligt)' add_button: 'Tilføj klient' clients: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml index 8ebf369370..478f7409d3 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_images.da.yml @@ -70,8 +70,8 @@ Date
    (yyyy-mm-dd): Dato
    (åååå-mm-dd) 'Change image information': 'Rediger billedinformation' 'You do not have the right to add images': 'Du har ikke rettigheder til at tilføje billeder' 'Filter by uploader...': 'Filtrer efter uploader...' -'Slideshow images': null -'Add items to slideshow': null +'Slideshow images': 'Galleri billeder' +'Add items to slideshow': 'Føj billeder til galleri' 'Attached Slideshows': 'Vedhæftede gallerier' 'Value is required and can''t be empty': 'Værdien er påkrævet og kan ikke være tom' 'Select all images': 'Vælg alle billeder' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml index e5e1b90df1..0321704bf0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/article_type_fields.da.yml @@ -22,8 +22,8 @@ Custom: Brugerdefineret Precision: Præcision 'Can not convert the field $1 from $2 to type $3.': 'Feltet $1 kan ikke konverteres fra type $2 til type $3.' 'Are you sure you want to make $1 a $2 field?': 'Vil du lave $1 til et $2 felt?' -'Page Read Count?': null -'Editorial Content?': null +'Page Read Count?': 'Besøgstæller?' +'Editorial Content?': 'Redaktionelt indhold?' 'Back to Article Types List': 'Tilbage til artikel type liste' show: vis hide: skjul diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml index f249d1bb25..087f8b06f0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.da.yml @@ -192,13 +192,13 @@ Snippet: Uddrag 'The last article of this list has been removed.': 'Den sidste artikel på denne liste er blevet fjernet.' Revert: Fortryd 'Could not automatically refresh the list': 'Listen kunne ikke opdateres automatisk' -'The article slideshows have been successfully updated, please close the window.': null +'The article slideshows have been successfully updated, please close the window.': 'Artiklens gallerier blev opdateret. Luk vinduet.' articles: playlists: namechanged: 'Er du sikker på du vil ændre lsitens navn? Navnet bruges muligvis i Newscoop skabeloner for at vise listen på hjemmesiden. Spørg hjemmesidens administrator hvis du er i tvivl.' - alert: null + alert: "Vil du ændre det maksimale antal artikler på listen? Hvis du reducerer grænsen vil alle yderligere artikler blive fjernet fra listen.\nEksempel: Hvis du ændrer grænsen fra 50 til 30 vil de 20 artikler fra nummer 31 til 50 blive fjernet fra listen." images: - see_original: null + see_original: 'Se billeder i fuld størrelse på en ny fane' edit: edit_image_metadata: 'Rediger billedets metadata' save: Gem diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/comments.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/comments.da.yml index d7cd19f45a..fef7f01cc0 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/comments.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/comments.da.yml @@ -114,7 +114,7 @@ editorial: delete: Slet reply: Svar label: - title: null + title: 'Redaktionelle kommentar' post: 'Skriv en ny kommentar' reply: Svar... nocomments: 'Ingen kommentarer endnu.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/messages.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/messages.da.yml index 40da5a1f34..265a252285 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/messages.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/messages.da.yml @@ -285,5 +285,5 @@ unpublished: 'træk tilbage' nopermissions: 'Du har ikke tilladelser til at tilgå denne ressource.' importantmessage: 'Vigtig information' anonymous: Anonym -'Successfully refreshed authentication token.': null -'Failed to refresh authentication token.': null +'Successfully refreshed authentication token.': 'Godkendelses token blev opdateret' +'Failed to refresh authentication token.': 'Godkendelses token kunne ikke opdateres' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/plugins_manager.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/plugins_manager.da.yml index 079096eb37..7c9bebcf4e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/plugins_manager.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/plugins_manager.da.yml @@ -21,7 +21,7 @@ newscoop.plugins_manager.form.package: 'Pakken skal være en zip fil.' newscoop.plugins_manager.form.submit: Upload newscoop.plugins_manager.runcommand: 'Kør kommando' newscoop.plugins_manager.openterminal: 'Åben terminal og kør kommando' -newscoop.plugins_manager.installassets: null +newscoop.plugins_manager.installassets: 'Installer aktiver' newscoop.plugins_manager.done: 'Færdig. Luk dette vindue og opdater siden.' newscoop.plugins_manager.close: Luk newscoop.plugins_manager.update: 'Hvordan opdateres denne plugin?' @@ -30,9 +30,9 @@ newscoop.plugins_manager.remove: 'Hvordan fjernes denne plugin?' newscoop.plugins_manager.installed: 'Færdig. Opdater denne side for at se pluginet i listen med installerede plugins.' newscoop.plugins_manager.clipboard: 'Kopier: Ctrl + C (Cmd + C på Mac), Enter' newscoop.plugins_manager.downloads: downloads -newscoop.plugins_manager.favers: null -newscoop.plugins_manager.private_plugins_not_writable: null -newscoop.plugins_manager.private_plugins_not_writable_commands: null +newscoop.plugins_manager.favers: fans +newscoop.plugins_manager.private_plugins_not_writable: 'Din webserver kan ikke skrive til %privatePluginsPath%.' +newscoop.plugins_manager.private_plugins_not_writable_commands: 'På en Linux server kan du løse det med kommandoerne:' newscoop: datatable: table: diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml index ca944acf64..282d204021 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/themes.da.yml @@ -86,7 +86,7 @@ Compatibility: Kompatibilitet '$1 $2': '$1 $2' '$1 files $2': '$1 filer $2' 'Available themes': 'Tilgængelige temaer' -'Update cached data': null +'Update cached data': 'Opdater cachede data' 'Assigned templates': 'Tildelte skabeloner' 'Cached informations about theme playlists are not up to date!': null 'The theme''s configuration file does not contain information about the list of used featured articles.': null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/users.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/users.da.yml index 13c9dedb81..106e41ce9a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/users.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/users.da.yml @@ -185,8 +185,8 @@ Miscellaneous: Diverse 'Editor Miscellaneous Settings': 'Diverse editor indstillinger' 'No such user account.': 'Bruger konto findes ikke.' 'User image (full-size)': 'Brugerfoto (fuld størrelse)' -'User account is highlighted as "featured account"': null -'Custom attribute...': null +'User account is highlighted as "featured account"': 'Brugerkontoen er en "fremhævet konto"' +'Custom attribute...': 'Brugerdefinerede egenskaber' users: label: title: 'Bruger søgning' From 49e0dd650caccbbb1636d9cb1091cfd8cf003bf8 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Thu, 16 Jul 2015 18:09:20 +0200 Subject: [PATCH 65/90] TW-236: Disabled escpaing when RichTextCaption setting is on --- newscoop/include/smarty/campsite_plugins/block.image.php | 8 +++++++- newscoop/template_engine/metaclasses/MetaImage.php | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/newscoop/include/smarty/campsite_plugins/block.image.php b/newscoop/include/smarty/campsite_plugins/block.image.php index a6db6fbbde..87f4d2f176 100644 --- a/newscoop/include/smarty/campsite_plugins/block.image.php +++ b/newscoop/include/smarty/campsite_plugins/block.image.php @@ -60,11 +60,17 @@ function smarty_block_image(array $params, $content, Smarty_Internal_Template $s } $imageService = \Zend_Registry::get('container')->getService('image'); + $preferencesService = \Zend_Registry::get('container')->getService('preferences'); + $caption = $imageService->getCaption($articleRendition->getImage(), $article->number, $article->language->number); + if ($preferencesService->get('MediaRichTextCaptions', 'N') == 'N') { + $caption = MetaDbObject::htmlFilter($caption); + } + $smarty->assign('image', (object) array( 'src' => \Zend_Registry::get('view')->url(array('src' => $image['src']), 'image', true, false), 'width' => $image['width'], 'height' => $image['height'], - 'caption' => $imageService->getCaption($articleRendition->getImage(), $article->number, $article->language->number), + 'caption' => $caption, 'description' => $articleRendition->getImage()->getDescription(), 'photographer' => $articleRendition->getImage()->getPhotographer(), 'original' => $image['original'], diff --git a/newscoop/template_engine/metaclasses/MetaImage.php b/newscoop/template_engine/metaclasses/MetaImage.php index b6391dd501..4e839066ea 100644 --- a/newscoop/template_engine/metaclasses/MetaImage.php +++ b/newscoop/template_engine/metaclasses/MetaImage.php @@ -56,6 +56,11 @@ public function __construct($p_imageId = null) $this->m_customProperties['type'] = 'getType'; $this->m_customProperties['photographer_url'] = 'getPhotographerUrl'; $this->m_customProperties['caption'] = 'getCaption'; + + $preferencesService = \Zend_Registry::get('container')->getService('preferences'); + if ($preferencesService->MediaRichTextCaptions == 'Y') { + $this->m_skipFilter = array('caption'); + } } // fn __construct From 131f909bef74984503f2496a7394166e7a7d63ad Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 20 Jul 2015 14:55:08 +0200 Subject: [PATCH 66/90] CS-5895: Adds custom redirect to confirm action --- newscoop/application/controllers/RegisterController.php | 3 +++ newscoop/application/forms/Confirm.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/newscoop/application/controllers/RegisterController.php b/newscoop/application/controllers/RegisterController.php index 4ce7c72e76..7c8b8cb144 100644 --- a/newscoop/application/controllers/RegisterController.php +++ b/newscoop/application/controllers/RegisterController.php @@ -126,6 +126,9 @@ public function confirmAction() $session->set('_security_frontend_area', serialize($token)); $OAuthtoken = $this->_helper->service('user')->loginUser($user, 'oauth_authorize'); $session->set('_security_oauth_authorize', serialize($OAuthtoken)); + if (isset($values['_target_path']) && !empty($values['_target_path'])) { + $this->_helper->redirector->gotoUrl($values['_target_path']); + } $this->_helper->redirector('index', 'dashboard', 'default', array('first' => 1)); } } catch (InvalidArgumentException $e) { diff --git a/newscoop/application/forms/Confirm.php b/newscoop/application/forms/Confirm.php index b774f50e75..b1d95ce78c 100644 --- a/newscoop/application/forms/Confirm.php +++ b/newscoop/application/forms/Confirm.php @@ -82,6 +82,11 @@ public function init() 'ignore' => true, )); $this->getElement('submit')->setOrder(8); + + $this->addElement('hidden', '_target_path', array( + 'decorators' => array('ViewHelper') + )); + $this->getElement('_target_path')->setOrder(9); } /** From 7981832f64469b7ec7afd8462e20cf426dc3b531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 28 Jul 2015 12:24:50 +0200 Subject: [PATCH 67/90] TW-275 - After update: Attaching a topic to an article doesnt work anymore --- newscoop/admin-files/articles/edit_javascript.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/newscoop/admin-files/articles/edit_javascript.php b/newscoop/admin-files/articles/edit_javascript.php index 02df199731..7bde26fc64 100644 --- a/newscoop/admin-files/articles/edit_javascript.php +++ b/newscoop/admin-files/articles/edit_javascript.php @@ -369,12 +369,13 @@ function unlockArticle(doAction) { } }); -$('#topic_box_frame a.iframe').fancybox({ - 'showCloseButton' : false, - 'width': '100%', - 'height': '100%', - 'scrolling': 'auto', - 'centerOnScroll': true, +$('#topic_box_frame a.iframe').each(function() { + var fancyBox = $(this).data('fancybox'); + fancyBox.width = '100%'; + fancyBox.height = '100%'; + fancyBox.showCloseButton = false; + fancyBox.scrolling = 'auto'; + fancyBox.centerOnScroll = true; }); $("#context_box a.iframe").fancybox({ From 1c79915b908b8a9964146961a921652214c596ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= Date: Tue, 28 Jul 2015 13:47:20 +0200 Subject: [PATCH 68/90] CS-5900 - Translations for legacy plugins dont work anymore --- .../EventListener/OldPluginsTranslationListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/EventListener/OldPluginsTranslationListener.php b/newscoop/src/Newscoop/NewscoopBundle/EventListener/OldPluginsTranslationListener.php index 16e9c97995..fb202ca5b1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/EventListener/OldPluginsTranslationListener.php +++ b/newscoop/src/Newscoop/NewscoopBundle/EventListener/OldPluginsTranslationListener.php @@ -37,7 +37,7 @@ public function onRequest(GetResponseEvent $event) { $request = $event->getRequest(); $route = $request->attributes->get('_route'); - if (strpos($route, 'newscoop_gimme_') === false || $route == 'newscoop_get_img') { + if (strpos($route, 'newscoop_gimme_') !== false || $route == 'newscoop_get_img') { return; } From 25e5222307f24b8390c253c09c00303ff9d8bc1f Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Tue, 28 Jul 2015 16:07:42 +0200 Subject: [PATCH 69/90] CS-5903: Adds DISTINCT so related article numbers are only returned once --- newscoop/classes/ContextBoxArticle.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/classes/ContextBoxArticle.php b/newscoop/classes/ContextBoxArticle.php index 6d892d1419..7d1a245c71 100644 --- a/newscoop/classes/ContextBoxArticle.php +++ b/newscoop/classes/ContextBoxArticle.php @@ -85,7 +85,7 @@ public static function GetList(array $params, $p_order = null, } if (isset($params['role']) && $params['role'] == 'child') { - $sql = 'SELECT b.fk_article_no FROM context_boxes b, Articles a0' + $sql = 'SELECT DISTINCT b.fk_article_no FROM context_boxes b, Articles a0' . ' WHERE a0.Number = b.fk_article_no AND ' . ' a0.Type = "dossier" AND ' . ' b.id IN (SELECT c.fk_context_id ' @@ -98,7 +98,7 @@ public static function GetList(array $params, $p_order = null, $sql .= ' ORDER BY a0.PublishDate DESC'; } else { if (isset($params['published']) && $params['published'] == 'true') { - $sql = 'SELECT b.fk_article_no FROM context_articles b, Articles a0' + $sql = 'SELECT DISTINCT b.fk_article_no FROM context_articles b, Articles a0' . ' WHERE b.fk_context_id = ' . $params['context_box'] .' AND ' . ' b.fk_article_no = a0.Number AND ' . ' a0.Published = "Y"' From 944c30e2f8de5aa2cabd06b8cccbb0c2497c46c6 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Thu, 30 Jul 2015 17:38:41 +0200 Subject: [PATCH 70/90] setup default images (generated by Newscoop) quality to 90 (from 0 to 100) --- newscoop/classes/Image.php | 10 ++++++++-- newscoop/library/Newscoop/Image/ImageService.php | 8 ++++++-- newscoop/template_engine/classes/CampGetImage.php | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/newscoop/classes/Image.php b/newscoop/classes/Image.php index f68f3ebcc4..48284f3c9d 100644 --- a/newscoop/classes/Image.php +++ b/newscoop/classes/Image.php @@ -408,7 +408,10 @@ public function generateThumbnailFromImage() $imageHandler = $createMethodName($target); $thumbnailImage = Image::ResizeImage($imageHandler, $Campsite['THUMBNAIL_MAX_SIZE'], $Campsite['THUMBNAIL_MAX_SIZE']); - $thumbnailImage->save($thumbnail, array('format' => $extension)); + $thumbnailImage->save($thumbnail, array( + 'format' => $extension, + 'quality' => 90, //from 0 to 100 + )); self::chmod($thumbnail, 0644); } catch (Exception $ex) { @@ -620,7 +623,10 @@ public static function OnImageUpload($p_fileVar, $p_attributes, } $thumbnailImage = Image::ResizeImage($imageHandler, $Campsite['THUMBNAIL_MAX_SIZE'], $Campsite['THUMBNAIL_MAX_SIZE']); - $thumbnailImage->save($thumbnail, array('format' => $extension)); + $thumbnailImage->save($thumbnail, array( + 'format' => $extension, + 'quality' => 90, //from 0 to 100 + )); self::chmod($thumbnail, 0644); } catch (Exception $ex) { diff --git a/newscoop/library/Newscoop/Image/ImageService.php b/newscoop/library/Newscoop/Image/ImageService.php index f317077e57..d59f29ee0e 100644 --- a/newscoop/library/Newscoop/Image/ImageService.php +++ b/newscoop/library/Newscoop/Image/ImageService.php @@ -145,7 +145,9 @@ public function upload(UploadedFile $file, array $attributes, ImageInterface $im $imagine->open($imagePath) ->resize(new Box($newImageWidth, $newImageHeight)) - ->save($thumbnailPath, array()); + ->save($thumbnailPath, array( + 'quality' => 90, //from 0 to 100 + )); $filesystem->chmod($thumbnailPath, 0644); } catch (\Exceptiom $e) { $filesystem->remove($imagePath); @@ -266,7 +268,9 @@ public function generateFromSrc($src) $rendition = new Rendition($width, $height, $specs); $image = $rendition->generateImage($this->decodePath($imagePath)); - $image->save($destFolder . '/' . $imagePath); + $image->save($destFolder . '/' . $imagePath, array( + 'quality' => 90, //from 0 to 100 + )); return $image; } diff --git a/newscoop/template_engine/classes/CampGetImage.php b/newscoop/template_engine/classes/CampGetImage.php index 35f4811aa7..a712c9b3b0 100644 --- a/newscoop/template_engine/classes/CampGetImage.php +++ b/newscoop/template_engine/classes/CampGetImage.php @@ -635,7 +635,7 @@ private function createImage($p_target=null) return $function($t); } else { - $function($t, $p_target); + $function($t, $p_target, 90); imagedestroy($t); return $this->sendCachedImage(); } From 486286cb0321cd1352984f655f4760ecf04d46ad Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Fri, 31 Jul 2015 12:22:49 +0200 Subject: [PATCH 71/90] add support to Imagick --- newscoop/library/Newscoop/Image/ImageService.php | 14 ++++++++++++-- newscoop/library/Newscoop/Image/Rendition.php | 4 +--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/newscoop/library/Newscoop/Image/ImageService.php b/newscoop/library/Newscoop/Image/ImageService.php index d59f29ee0e..068cf070e4 100644 --- a/newscoop/library/Newscoop/Image/ImageService.php +++ b/newscoop/library/Newscoop/Image/ImageService.php @@ -8,7 +8,6 @@ namespace Newscoop\Image; use Imagine\Image\Box; -use Imagine\Gd\Imagine; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\File\Exception\FileException; use Symfony\Component\HttpFoundation\File\UploadedFile; @@ -65,6 +64,17 @@ public function __construct(array $config, \Doctrine\ORM\EntityManager $orm, $ca $this->cacheService = $cacheService; } + public static function getImagine() + { + try { + $imagine = new \Imagine\Imagick\Imagine(); + } catch (\Imagine\Exception\RuntimeException $e) { + $imagine = new \Imagine\Gd\Imagine(); + } + + return $imagine; + } + /** * Upload image and create entity * @@ -77,7 +87,7 @@ public function __construct(array $config, \Doctrine\ORM\EntityManager $orm, $ca public function upload(UploadedFile $file, array $attributes, ImageInterface $image = null, $keepRatio = true) { $filesystem = new Filesystem(); - $imagine = new Imagine(); + $imagine = self::getImagine(); $mimeType = $file->getClientMimeType(); if (!in_array($mimeType, $this->supportedTypes)) { diff --git a/newscoop/library/Newscoop/Image/Rendition.php b/newscoop/library/Newscoop/Image/Rendition.php index 5d84717693..228c72e819 100644 --- a/newscoop/library/Newscoop/Image/Rendition.php +++ b/newscoop/library/Newscoop/Image/Rendition.php @@ -215,12 +215,10 @@ public function getThumbnail(ImageInterface $image, ImageService $imageService) public function generateImage($imagePath) { $path = is_file(APPLICATION_PATH . '/../' . $imagePath) ? APPLICATION_PATH . '/../' . $imagePath : $imagePath; - - $imagine = new \Imagine\Gd\Imagine(); + $imagine = ImageService::getImagine(); $image = $imagine->open($path); $imageSize = $image->getSize(); - if ($this->isCrop()) { $cropSpecs = explode('_', $this->getSpecs()); if (count($cropSpecs) === 1) { From f71a3b53bf9994d292282c2591927cd03f3123b8 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Fri, 31 Jul 2015 13:24:19 +0200 Subject: [PATCH 72/90] hide visible for non subscriber only when plugin is not enabled and article is public. that checkbox should be always in form, just hidden if not needed. --- newscoop/admin-files/articles/edit_switches_box.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/newscoop/admin-files/articles/edit_switches_box.php b/newscoop/admin-files/articles/edit_switches_box.php index d30fc0c8dc..ec57c3d037 100644 --- a/newscoop/admin-files/articles/edit_switches_box.php +++ b/newscoop/admin-files/articles/edit_switches_box.php @@ -17,12 +17,12 @@ class="input_checkbox" onSectionPage()) { ?> checkedratingEnabled()) { ?> checked disabled />
    • - get('newscoop.plugins.service'); - if ($pluginsService->isEnabled('newscoop/newscoop-paywall-bundle')) { ?> -
  • isPublic()) { ?> checked disabled />
    • - + if (!$pluginsService->isEnabled('newscoop/newscoop-paywall-bundle') && $articleObj->isPublic()) { ?> style="display:none" + >isPublic()) { ?> checked disabled /> + Date: Fri, 31 Jul 2015 16:48:33 +0200 Subject: [PATCH 73/90] CS-5898: Use issue number fetched from db --- newscoop/admin-files/sections/duplicate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/admin-files/sections/duplicate.php b/newscoop/admin-files/sections/duplicate.php index d683101bfd..c052f0635c 100644 --- a/newscoop/admin-files/sections/duplicate.php +++ b/newscoop/admin-files/sections/duplicate.php @@ -55,7 +55,7 @@ $sqlOptions = array("LIMIT" => 50, "ORDER BY" => array("Number" => "DESC")); $allIssues = Issue::GetIssues($f_dest_publication_id, $f_language_id, null, null, null, false, $sqlOptions, true); if (count($allIssues) == 1) { - $f_dest_issue_number = $f_src_issue_number; + $f_dest_issue_number = $allIssues[0]->getIssueNumber(); } } From 63580e78fb3a395bdd47f448b980b926e17eb196 Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Mon, 3 Aug 2015 11:17:17 +0200 Subject: [PATCH 74/90] Add validation for meta properties in publications form, fix some minor ui issues --- .../Controller/BackendPublicationsController.php | 6 +++++- .../NewscoopBundle/Form/Type/PublicationType.php | 9 +++++++++ .../Resources/translations/validators.en.yml | 8 +++++++- .../Resources/views/BackendPublications/edit.html.twig | 2 ++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php index e8d333074e..b177d3c6ea 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php @@ -62,7 +62,11 @@ public function editAction(Request $request, Publication $publication) $form = $this->createForm(new PublicationType(), $publication, array('publication_id' => $publication->getId())); if ($request->getMethod() === 'POST') { - return $this->processRequest($request, $form, $publication); + $form = $this->processRequest($request, $form, $publication); + + if ($form instanceof RedirectResponse) { + return $form; + } } return $this->render( diff --git a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php index c2b377ca13..71165b87cc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php +++ b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php @@ -83,16 +83,25 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'label' => 'publications.form_type.label.meta_title', 'error_bubbling' => true, 'required' => false, + 'constraints' => array( + new Length(array('max' => 255, 'maxMessage' => 'type_publications.metaTitle.max')), + ) )) ->add('metaKeywords', null, array( 'label' => 'publications.form_type.label.meta_keywords', 'error_bubbling' => true, 'required' => false, + 'constraints' => array( + new Length(array('max' => 255, 'maxMessage' => 'type_publications.metaKeywords.max')), + ) )) ->add('metaDescription', 'textarea', array( 'label' => 'publications.form_type.label.meta_description', 'required' => false, 'error_bubbling' => true, + 'constraints' => array( + new Length(array('max' => 255, 'maxMessage' => 'type_publications.metaDescription.max')), + ) )) ->add('moderator_to', 'email', array( 'label' => 'publications.form_type.label.moderator_to', diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml index 21ed084d55..5c3a130a25 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml @@ -1,3 +1,9 @@ type_publications: name: - min: "Publication name must be longer than {{ limit }} characters." \ No newline at end of file + min: "Publication name must be longer than {{ limit }} characters." + metaDescription: + max: "Publication description must be shorter than {{ limit }} characters." + metaTitle: + max: "Publication title must be shorter than {{ limit }} characters." + metaKeywords: + max: "Publication keywords must not have than {{ limit }} characters." \ No newline at end of file diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendPublications/edit.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendPublications/edit.html.twig index c58e394b9a..e18c0fa687 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendPublications/edit.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendPublications/edit.html.twig @@ -34,6 +34,8 @@ .checkbox-group .checkbox {padding-top: 3px;} .checkbox-group .checkbox label input {margin-right: 5px;} .ns_container input {background-color: #fff} + .alert-danger ul {margin-bottom: 0px!important;} + #publication_seoChoices label input {margin-right: 5px;} {% endblock %} From db27b20d3614786731620432be93d6db14b103ae Mon Sep 17 00:00:00 2001 From: Pawel Mikolajczuk Date: Tue, 4 Aug 2015 09:39:51 +0200 Subject: [PATCH 75/90] removed reloading after removing comment, added option to check comment with just clicking in row --- .../Resources/views/Comments/index.html.twig | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig index eaf3b8964c..1c3487e2b1 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Comments/index.html.twig @@ -104,7 +104,7 @@ {% for row in commentsArray %} - + {% if pagination.getCurrentPageNumber == 1 %} {{ row.index }}. @@ -112,7 +112,7 @@ {{ (pagination.getItemNumberPerPage * (pagination.getCurrentPageNumber - 1)) + row.index }}. {% endif %} - +
    {% if row.user is empty %} @@ -144,7 +144,7 @@

    - +

    {{ row.comment.timeCreated|date("Y.m.d") }} {{ 'comments.label.at'|trans }} {{ row.comment.timeCreated|date("H:i:s") }} @@ -190,7 +190,7 @@

    - +

    {{ row.article.name }}
    @@ -304,6 +304,10 @@ $('input[data=hidden_'+value+']').prop('checked', false); $('input[data=pending_'+value+']').prop('checked', true); } + + if (status == 'deleted') { + $('.comment_'+value).remove(); + } }; $("tr#use-hover").hover(function() { @@ -336,9 +340,12 @@ "status": status }, success: function (data) { + $.each(data.comments, function(index, value) { + changeCommentStatus(data.status, value); + }); + if ('deleted' == status) { flashMessage('{{ 'comments.msg.status.single'|trans }} {{ 'comments.msg.deleted'|trans }}'); - location.href = Routing.generate('newscoop_newscoop_comments_index'); } else if (status == 'pending') { flashMessage('{{ 'comments.msg.status.single'|trans }} {{ 'comments.msg.status.new'|trans }}'); $('.comment_'+ids).removeClass('status-hidden'); @@ -412,6 +419,11 @@ $('.content-reply_'+el.attr('id')).slideToggle("slow"); }); + $('.js-comment-body td.clickable').live('click', function () { + var commentCheckbox = $('.table-checkbox', $(this).parent()); + commentCheckbox.attr('checked', !commentCheckbox.attr("checked")); + }); + $('.action-edit').live('click', function () { var el = $(this); var subject = $('#comment-section_'+el.attr('id')).find('.commentSubject'); @@ -562,7 +574,6 @@ if ('deleted' == status) { flashMessage(translationComment+' {{ 'comments.msg.deleted'|trans }}'); - location.href = Routing.generate('newscoop_newscoop_comments_index'); } else if (status == 'pending') { flashMessage(translationComment+' {{ 'comments.msg.status.new'|trans }}'); } else if (status == 'approved') { From a17ef9e66f771c5502f09d9cbbfa961b3592fad7 Mon Sep 17 00:00:00 2001 From: localizer Date: Tue, 4 Aug 2015 09:15:39 +0000 Subject: [PATCH 76/90] updated translation resources --- .../NewscoopBundle/Resources/translations/validators.ar.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.az.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.be.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.bn.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.cs.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.da.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.de.yml | 6 ++++++ .../Resources/translations/validators.de_AT.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.el.yml | 6 ++++++ .../Resources/translations/validators.en_GB.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.es.yml | 6 ++++++ .../Resources/translations/validators.es_AR.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.fa.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.fr.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.he.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.hr.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.hu.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.hy.yml | 6 ++++++ .../Resources/translations/validators.hy_AM.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.id.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.it.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ka.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ko.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ku.yml | 6 ++++++ .../Resources/translations/validators.nb_NO.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.nl.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.pa.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.pl.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ps.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.pt.yml | 6 ++++++ .../Resources/translations/validators.pt_BR.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ro.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.ru.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.sh.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.sq.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.sr.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.sv.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.tr.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.uk.yml | 6 ++++++ .../NewscoopBundle/Resources/translations/validators.zh.yml | 6 ++++++ .../Resources/translations/validators.zh_TW.yml | 6 ++++++ 41 files changed, 246 insertions(+) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ar.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ar.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ar.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ar.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.az.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.az.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.be.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.be.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.be.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.be.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.bn.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.bn.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.bn.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.bn.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.cs.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.cs.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.cs.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.cs.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.da.yml index b7bcaf114c..7c8526e224 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.da.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'Publikationens navn skal være længere end {{ limit }} tegn.' + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de_AT.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de_AT.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de_AT.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.de_AT.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.el.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.el.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.el.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.el.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml index 52b93cab55..cd11b50c3b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'Publication name must be longer than {{ limit }} characters.' + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es_AR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es_AR.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es_AR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.es_AR.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fa.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fa.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fr.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.fr.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.he.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.he.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.he.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.he.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hr.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hr.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hu.yml index 976b216309..52f7b1f090 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hu.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'A kiadvány címének hosszabbnak kell lennie {{ limit }} karakternél.' + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml index 52b93cab55..01157aed13 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'Publication name must be longer than {{ limit }} characters.' + metaDescription: + max: 'Publication description must be shorter than {{ limit }} characters.' + metaTitle: + max: 'Publication title must be shorter than {{ limit }} characters.' + metaKeywords: + max: 'Publication keywords must not have than {{ limit }} characters.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy_AM.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy_AM.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy_AM.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy_AM.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.id.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.id.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.id.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.id.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.it.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.it.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.it.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.it.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ka.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ka.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ka.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ka.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ko.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ko.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ko.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ko.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ku.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ku.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ku.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ku.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nb_NO.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nb_NO.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nb_NO.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nb_NO.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nl.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.nl.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml index a01e369585..e3a77ffb1d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: 'Publication description must be shorter than {{ limit }} characters.' + metaTitle: + max: 'Publication title must be shorter than {{ limit }} characters.' + metaKeywords: + max: 'Publication keywords must not have than {{ limit }} characters.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pl.yml index ffadb1d3b8..79b0bd0145 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pl.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'Nazwa publikacji musi być dłuższa nie {{ limit }} znak(ów).' + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ps.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ps.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ps.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ps.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt_BR.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt_BR.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt_BR.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pt_BR.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ro.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ro.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ro.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ro.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ru.yml index 3a1b0e30a9..00f1d5cad8 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.ru.yml @@ -1,3 +1,9 @@ type_publications: name: min: 'Название издания должно содержать более {{ limit }} знаков.' + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sh.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sh.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sq.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sq.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sq.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sq.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sr.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sr.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sv.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sv.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sv.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.sv.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.tr.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.tr.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.tr.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.tr.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.uk.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.uk.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.uk.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.uk.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh_TW.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh_TW.yml index a01e369585..0209137fba 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh_TW.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.zh_TW.yml @@ -1,3 +1,9 @@ type_publications: name: min: null + metaDescription: + max: null + metaTitle: + max: null + metaKeywords: + max: null From ce77c0e7cbf499c8dc6ead117bb3220858bac278 Mon Sep 17 00:00:00 2001 From: localizer Date: Tue, 4 Aug 2015 09:52:04 +0000 Subject: [PATCH 77/90] updated translation resources --- .../NewscoopBundle/Resources/translations/validators.en_GB.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml index cd11b50c3b..4bcbbbe8bb 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml @@ -4,6 +4,6 @@ type_publications: metaDescription: max: null metaTitle: - max: null + max: 'Publication title must be shorter than {{ limit }} characters.' metaKeywords: max: null From 695ce5e7b4ecebb03c87d460498ac497e45b87b8 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 4 Aug 2015 11:03:57 +0100 Subject: [PATCH 78/90] CS-5907 Typo and ambiguity in core string --- .../NewscoopBundle/Resources/translations/validators.en.yml | 2 +- .../NewscoopBundle/Resources/translations/validators.hy.yml | 2 +- .../NewscoopBundle/Resources/translations/validators.pa.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml index 5c3a130a25..a3cf4ae970 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en.yml @@ -6,4 +6,4 @@ type_publications: metaTitle: max: "Publication title must be shorter than {{ limit }} characters." metaKeywords: - max: "Publication keywords must not have than {{ limit }} characters." \ No newline at end of file + max: "Publication keyword total must be shorter than {{ limit }} characters." diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml index 01157aed13..650ae76833 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.hy.yml @@ -6,4 +6,4 @@ type_publications: metaTitle: max: 'Publication title must be shorter than {{ limit }} characters.' metaKeywords: - max: 'Publication keywords must not have than {{ limit }} characters.' + max: 'Publication keyword total must be shorter than {{ limit }} characters.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml index e3a77ffb1d..66815f587e 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.pa.yml @@ -6,4 +6,4 @@ type_publications: metaTitle: max: 'Publication title must be shorter than {{ limit }} characters.' metaKeywords: - max: 'Publication keywords must not have than {{ limit }} characters.' + max: 'Publication keyword total must be shorter than {{ limit }} characters.' From 180bd31f66993757f716982e18cd544f6d37771f Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Wed, 5 Aug 2015 11:44:38 +0200 Subject: [PATCH 79/90] CS-5908: Adds updating of time_update when workflow_status changes --- newscoop/admin-files/articles/do_article_action.php | 5 ++++- newscoop/admin-files/articles/do_article_list_action.php | 3 +++ newscoop/admin-files/libs/ArticleList/do_action.php | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/newscoop/admin-files/articles/do_article_action.php b/newscoop/admin-files/articles/do_article_action.php index 9a867dd72a..7a9f6a3557 100644 --- a/newscoop/admin-files/articles/do_article_action.php +++ b/newscoop/admin-files/articles/do_article_action.php @@ -150,6 +150,9 @@ $articleObj->setWorkflowStatus($f_action_workflow); + // Make sure that the time stamp is updated. + $articleObj->setProperty('time_updated', 'NOW()', true, true); + $cacheService = \Zend_Registry::get('container')->getService('newscoop.cache'); $cacheService->clearNamespace('article'); @@ -159,4 +162,4 @@ camp_html_goto_page($url); } -?> \ No newline at end of file +?> diff --git a/newscoop/admin-files/articles/do_article_list_action.php b/newscoop/admin-files/articles/do_article_list_action.php index 43e4cf5550..4ea02f82e7 100644 --- a/newscoop/admin-files/articles/do_article_list_action.php +++ b/newscoop/admin-files/articles/do_article_list_action.php @@ -80,6 +80,7 @@ if ($g_user->hasPermission('Publish') || ($g_user->hasPermission('ChangeArticle') && ($articleObj->getWorkflowStatus() == 'S'))) { $articleObj->setWorkflowStatus('N'); + $articleObj->setProperty('time_updated', 'NOW()', true, true); } } camp_html_add_msg($translator->trans("Article status set to $1", array('$1' => $translator->trans("New")), 'articles'), "ok"); @@ -90,6 +91,7 @@ // A user who owns the article may submit it. if ($g_user->hasPermission("Publish") || $articleObj->userCanModify($g_user)) { $articleObj->setWorkflowStatus('S'); + $articleObj->setProperty('time_updated', 'NOW()', true, true); } } camp_html_add_msg($translator->trans("Article status set to $1", array('$1' => $translator->trans("Submitted")), 'articles'), "ok"); @@ -98,6 +100,7 @@ foreach ($articleCodes as $articleCode) { $articleObj = new Article($articleCode['language_id'], $articleCode['article_id']); $articleObj->setWorkflowStatus('Y'); + $articleObj->setProperty('time_updated', 'NOW()', true, true); \Zend_Registry::get('container')->getService('dispatcher') ->dispatch('article.publish', new \Newscoop\EventDispatcher\Events\GenericEvent($this, array( diff --git a/newscoop/admin-files/libs/ArticleList/do_action.php b/newscoop/admin-files/libs/ArticleList/do_action.php index 5c78244c28..da00564d73 100755 --- a/newscoop/admin-files/libs/ArticleList/do_action.php +++ b/newscoop/admin-files/libs/ArticleList/do_action.php @@ -116,6 +116,7 @@ function returnJson($affectedNo, $message, $notAffectedNo, $errorMessage, $hiper foreach ($articleCodes as $articleCode) { $articleObj = new Article($articleCode['language_id'], $articleCode['article_id']); if ($articleObj->setWorkflowStatus('Y')) { + $articleObj->setProperty('time_updated', 'NOW()', true, true); $success = true; $affectedArticles += 1; } else { @@ -132,6 +133,7 @@ function returnJson($affectedNo, $message, $notAffectedNo, $errorMessage, $hiper $articleObj = new Article($articleCode['language_id'], $articleCode['article_id']); if ($g_user->hasPermission("Publish") || $articleObj->userCanModify($g_user)) { if ($articleObj->setWorkflowStatus('S')) { + $articleObj->setProperty('time_updated', 'NOW()', true, true); $success = true; $affectedArticles += 1; } else { @@ -152,6 +154,7 @@ function returnJson($affectedNo, $message, $notAffectedNo, $errorMessage, $hiper if ($g_user->hasPermission("Publish") || ($g_user->hasPermission('ChangeArticle') && ($articleObj->getWorkflowStatus() == 'S'))) { if ($articleObj->setWorkflowStatus('N')) { + $articleObj->setProperty('time_updated', 'NOW()', true, true); $success = true; $affectedArticles += 1; } else { From 10f9e3cf5fd079266aaa414444271c003a71cd75 Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 5 Aug 2015 10:03:05 +0000 Subject: [PATCH 80/90] updated translation resources --- .../NewscoopBundle/Resources/translations/validators.en_GB.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml index 4bcbbbe8bb..e2ec0b914d 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml @@ -6,4 +6,4 @@ type_publications: metaTitle: max: 'Publication title must be shorter than {{ limit }} characters.' metaKeywords: - max: null + max: 'Publication keyword total must be shorter than {{ limit }} characters.' From ff63bb54b5fad1281e70183057bc73c1aa0e2cbc Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Fri, 7 Aug 2015 11:37:55 +0200 Subject: [PATCH 81/90] Improves popover text for rich text captions related settings --- .../NewscoopBundle/Resources/translations/system_pref.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en.yml index 05257ae8f1..959290750a 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en.yml @@ -147,8 +147,8 @@ newscoop: separator: "Specify the separator for Keywords in the Edit Article page (comma or hyphen)." stats: "This option enables the collection of statistics on reader access to publications on the server. You may wish to click No if you use a third-party statistical service, as disabling the collection of statistics may reduce the load on your Newscoop server." zoom: "If is set to Yes, readers can enlarge article images in your publications pages by clicking on them. This zooming feature works for any images inserted inline with the article text." - richtext_status: "Enable rich text editing for image captions." - richtext_length: "By default set to 255 (also when rich text captions are disabled). Use 0 for no limit." + richtext_status: "Enables a HTML editor for captions. Disabling rich text will escape, but not remove, any HTML present in the caption source. If disabled, the character limit will be fixed to 255, and any longer captions will be truncated the next time they are edited." + richtext_length: "The limit includes any HTML and defaults to 255 characters. Set 0 here to have unlimited caption lengths, if your theme supports them." ratio: "The resizing ratio takes precedence over any Resizing Width or Resizing Height value which is set here. If Ratio is not set but both Width and Height are set, then Newscoop will use the value which results in a smaller image size. The default settings here can be overridden by the ratio, width or height settings for a specific inline image set on the Article Edit page." replication: "Enables you to set up Newscoop to operate on two servers at once, which is a safety feature in case of hardware or network problems." filter: "Enter keywords for templates that you wish to hide from the template editor accessible via the Theme Management page. For example, templates that are no longer in use, but you do not wish to delete from the server." From 3df4f561c47b490a7593b2fc2fd59b6d076ac2a0 Mon Sep 17 00:00:00 2001 From: localizer Date: Sat, 8 Aug 2015 09:15:26 +0000 Subject: [PATCH 82/90] updated translation resources --- .../NewscoopBundle/Resources/translations/system_pref.az.yml | 4 ++-- .../NewscoopBundle/Resources/translations/system_pref.da.yml | 4 ++-- .../Resources/translations/system_pref.en_GB.yml | 4 ++-- .../NewscoopBundle/Resources/translations/system_pref.hu.yml | 4 ++-- .../NewscoopBundle/Resources/translations/system_pref.hy.yml | 4 ++-- .../NewscoopBundle/Resources/translations/system_pref.pl.yml | 4 ++-- .../NewscoopBundle/Resources/translations/system_pref.ru.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.az.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.az.yml index 4c413da868..497b4d8b77 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.az.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.az.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Məqalənin Dəyişilmə səhifəsindəki Açarsöz üçün ayırıcı təyin et (vergül və ya defis).' stats: 'Bu seçim serverdəki nəşrlərə oxucu girişinin statistikasının toplanmasını aktivləşdirir. Əgər tamamilə başqa mənbədən olan statistika xidmətini istifadə edirsənsə, Yox düyməsini klikləyə bilərsən. Nəzərə al ki, statistika toplanmasının deaktivasiya edilməsi Newscoop serverində yüklənməni azaldacaqdır.' zoom: 'Bəli seçimini etsən, oxucular məqalə tərkibindəki şəkilləri klikləməklə onların ölçüsünü böyüdə bilərlər. Yaxınlaşdırma xüsusiyyəti məqalə mətni daxilində yerləşdirilən istənilən şəkil üçün keçərlidir.' - richtext_status: 'Şəkilaltılar üçün əlavə redaktə imkanlarını yandır.' - richtext_length: '255-i standart kimi müəyyən et (hətta əlavə şəkilaltılar söndürüləndə. 0-ı limitsiz üçün istifadə et.)' + richtext_status: null + richtext_length: null ratio: 'Ölçülərin uyğunlaşdırılması burada qeyd olunan Dəyişdirilən Uzunluq və Dəyişdirilən En ölçülərinə uyğun aparılır. Əgər nisbət göstərilibsə və eyni zamanda Uzunluq və En də göstərilibsə Newscoop avtomatik olaraq daha kiçik ölçünü seçəcək. Standart ölçüləri yeni yaradılan nisbətlə dəyişməklə mükündür, bunu Yazını Dəyiş səhifəsində etmək olar.' replication: 'Avadanlıq və şəbəkə problemləri yarandığı hallarda təhlükəsizlik göstəricisi olaraq Newscoop-un iki serverdə eyni zamanda əməliyyat həyata keçirməyə imkan yaradır.' filter: 'Mövzu İdarəçiliyi səhifəsi tərəfindən əldə edilə bilən nümunələrin nümunə dəyişmə səhifəsindən gizləmək üçün açar sözləri daxil et. Məsələn, artıq istifadədə olmayan, amma serverdən silmək istəmədiyin nümunələr.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.da.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.da.yml index 047ccfff75..ca5b962326 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.da.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.da.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Angiv separator for nøgleord ved artikelredigering (komma eller tankestreg).' stats: 'Denne indstilling gør det muligt at indsamle statistik om læsernes brug af publikationer på serveren. Du ønsker måske at klikke på Nej, hvis du bruger en tredjeparts statistiktjeneste, da deaktivering af statistikindsamling kan reducere belastningen på din Newscoop serveren.' zoom: 'Sæt til Ja for at lade læsere forstørre artikelbilleder ved at klikke på dem. Denne zoom funktion virker for alle billeder indsat i artikel teksten.' - richtext_status: 'Brug tekstformatering til billedtekster?' - richtext_length: 'Indstillet til 255 som standard (også når tekstformatering ikke er slået til). Brug 0 for ingen grænse.' + richtext_status: null + richtext_length: null ratio: 'Størrelses ratio har forrang for bredde eller højde værdier som indstilles her. Hvis ratio ikke er indstillet, men både bredde og højde er indstillet, så Newscoop vil bruge værdien der giver den mindste billedstørrelse. Standardindstillingerne her kan tilsidesættes af ratio, højde eller bredde indstillingerne for de enkelte billeder ved artikelredigering.' replication: 'Bruges til at køre Newscoop på to servere samtidigt, en sikkerhed i tilfælde af hardware eller netværksproblemer.' filter: 'Indtast nøgleord til skabeloner, som du ønsker at skjule fra skabelonsredigeringen tilgængelig via tema administrationssiden. For eksempel skabeloner der er ikke længere i brug, men som du ikke ønsker at slette fra serveren.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml index 025b916155..f890369edf 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Specify the separator for Keywords in the Edit Article page (comma or hyphen).' stats: 'This option enables the collection of statistics on reader access to publications on the server. You may wish to click No if you use a third-party statistical service, as disabling the collection of statistics may reduce the load on your Newscoop server.' zoom: 'If set to Yes, readers can enlarge article images in your publications pages by clicking on them. This zooming feature works for any images inserted inline with the article text.' - richtext_status: 'Enable rich text editing for image captions.' - richtext_length: 'By default set to 255 (also when rich text captions are disabled). Use 0 for no limit.' + richtext_status: null + richtext_length: null ratio: 'The resizing ratio takes precedence over any Resizing Width or Resizing Height value which is set here. If Ratio is not set but both Width and Height are set, then Newscoop will use the value which results in a smaller image size. The default settings here can be overridden by the ratio, width or height settings for a specific inline image set on the Article Edit page.' replication: 'Enables you to set up Newscoop to operate on two servers at once, which is a safety feature in case of hardware or network problems.' filter: 'Enter keywords for templates that you wish to hide from the template editor accessible via the Theme Management page. For example, templates that are no longer in use, but you do not wish to delete from the server.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hu.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hu.yml index b1476d02b9..7c4173ab34 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hu.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hu.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Add meg a Kulcsszavak elválasztóját (vessző vagy kötőjel) a Cikkszerkesztés oldalon.' stats: 'Ez a beállítás teszi lehetővé statisztika gyűjtését a kiszolgálón a kiadványok olvasói eléréséről. Ha külső statisztikai szolgáltatást használ, kattinthat a Nem gombra, ugyanis a statisztikagyűjtés letiltása csökkentheti a Newscoop-kiszolgáló leterheltségét.' zoom: 'Igenre állításakor az olvasók rákattintással felnagyíthatják a cikkek képeit a kiadványok oldalain. Ez a nagyítás funkció a cikk szövegébe beszúrt bármilyen képhez használható.' - richtext_status: 'A rich text szerkesztés engedélyezése a képaláírásokhoz.' - richtext_length: 'Alapértelmezésként 255 van megadva (a rich text képaláírások letiltásakor is). Adj meg 0-t, ha nincs korlátozás.' + richtext_status: null + richtext_length: null ratio: 'Az átméretezési arány elsőbbséget élvez bármely, itt megadott átméretezendő szélesség vagy átméretezendő magasság értékéhez képest. Ha az arány nincs megadva, csak a szélesség és a magasság, akkor a Newscoop azt az értéket fogja használni, mely kisebb képméretet eredményez. Az itt megadott alapértelmezett beállításokat az arány felülbírálhatja, egy konkrét sorközi kép szélessége vagy magassága a Cikkszerkesztés lapon van beállítva.' replication: 'A Newscoop egyszerre két kiszolgálón való működésének beállítását teszi lehetővé, ami hardver- vagy hálózati problémák esetén biztonsági funkció.' filter: 'Írd be azoknak a sablonoknak a kulcsszavait, melyeket el akarsz rejteni a Témakezelés lapról elérhető sablonszerkesztőből. Olyan sablonokét például, melyek már nincsenek használatban, viszont nem kívánod őket törölni a kiszolgálóról.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hy.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hy.yml index c1c1dd6adc..d3f403454b 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hy.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.hy.yml @@ -147,8 +147,8 @@ newscoop: separator: null stats: null zoom: null - richtext_status: 'Enable rich text editing for image captions.' - richtext_length: 'By default set to 255 (also when rich text captions are disabled). Use 0 for no limit.' + richtext_status: 'Enables a HTML editor for captions. Disabling rich text will escape, but not remove, any HTML present in the caption source. If disabled, the character limit will be fixed to 255, and any longer captions will be truncated the next time they are edited.' + richtext_length: 'The limit includes any HTML and defaults to 255 characters. Set 0 here to have unlimited caption lengths, if your theme supports them.' ratio: null replication: null filter: null diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.pl.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.pl.yml index 86ca8f90d4..f610654653 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.pl.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.pl.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Określa separator słów kluczowych na stronie Edycji artykułu (przecinek lub myślnik).' stats: 'Ta opcja pozwala na gromadzenie statystyk dostępu czytelników do publikacji na serwerze. Jeśli używasz innej usługi do statystyk, wybierz ''Nie''. Wyłaczenie zbierania statystyk może zmniejszyć obciążenie serwera Newscoop.' zoom: 'Jeśli jest ustawiona na Tak, czytelnicy mogą powiększać obrazy artykułów w publikacjach stron, klikając na nie. Ta funkcja powiększania działa na wszelkie obrazy wstawiane do tekstu artykułu.' - richtext_status: 'Włącz edycję rozbudowanych tekstów dla podpisów zdjęcia.' - richtext_length: 'Domyślnie ustawione na 255 (nawet gdy pełen tekst podpisów jest wyłączony). Użyj 0 aby wyłączyć limit.' + richtext_status: null + richtext_length: null ratio: 'Wskaźnik zmiany rozmiaru ma pierwszeństwo przed każdą zmianą szerokości lub wartości zmiany wysokości, który jest ustawiony tutaj. Jeśli współczynnik nie jest ustawiony, ale wysokość i szerokość są ustawione to Newscoop użyje tych ostatnich wartości, co skutkuje mniejszym rozmiarem. Domyślne ustawienia mogą być przesłonięte przez stosunek szerokości lub wysokości ustawienia dla konkretnego obrazu ustawionej na inline stronie Edycji artykułu.' replication: 'Pozwala ustawić Newscoop aby działał na dwóch serwerach jednocześnie, co jest cechą bezpieczeństwa w przypadku sprzętu lub problemu z siecią.' filter: 'Wprowadź słowa kluczowe dla szablonów, które chcesz ukryć przed edytorami szablonów dostępnych za pośrednictwem strony ''Szablony''. Na przykład szablony, które są już w użyciu, ale nie chcesz, aby zostały usunięte z serwera.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.ru.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.ru.yml index db9c73168a..f6fcbbb1be 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.ru.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.ru.yml @@ -147,8 +147,8 @@ newscoop: separator: null stats: 'Функция сбора статистики посещений. Если вы пользуетесь внешними сервисами статистического учета, можете ответить Нет. Отключение функции снимает нагрузку на сервер Newscoop.' zoom: 'Если выбран ответ Да, читатели смогут увеличивать изображения в статьях, кликнув на них. Эта опция масштабирования работает для любых изображений, размещенных в тексте статьи.' - richtext_status: 'Разрешить расширенное редактирование текста для подписей к изображениям.' - richtext_length: 'Значение по умолчанию 255 (в т.ч., когда отключены форматированные подписи). Если ограничение не нужно, используйте значение 0. ' + richtext_status: null + richtext_length: null ratio: 'Сохранение пропорций при изменении изображения более приоритетно, чем указанные здесь изменения ширины или высоты. Если пропорции не указаны, но указаны ширина и высота, Newscoop выберет значение, которое приведет к уменьшению изображения. Значения, указанные здесь по умолчанию, можно отменить для отдельного изображения, применив настройки на странице редактирования статьи.' replication: 'Дает возможность организации работы Newscoop на двух серверах одновременно в качестве меры предосторожности в случаях проблем с аппаратным обеспечением или ошибок сети. ' filter: null From b40e46d87c45ac44d7dc26f9c5d1b7f37227f722 Mon Sep 17 00:00:00 2001 From: localizer Date: Mon, 10 Aug 2015 09:37:13 +0000 Subject: [PATCH 83/90] updated translation resources --- .../Resources/translations/system_pref.en_GB.yml | 4 ++-- .../Resources/translations/validators.en_GB.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml index f890369edf..a0d75339dc 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/system_pref.en_GB.yml @@ -147,8 +147,8 @@ newscoop: separator: 'Specify the separator for Keywords in the Edit Article page (comma or hyphen).' stats: 'This option enables the collection of statistics on reader access to publications on the server. You may wish to click No if you use a third-party statistical service, as disabling the collection of statistics may reduce the load on your Newscoop server.' zoom: 'If set to Yes, readers can enlarge article images in your publications pages by clicking on them. This zooming feature works for any images inserted inline with the article text.' - richtext_status: null - richtext_length: null + richtext_status: 'Enables a HTML editor for captions. Disabling rich text will escape, but not remove, any HTML present in the caption source. If disabled, the character limit will be fixed to 255, and any longer captions will be truncated the next time they are edited.' + richtext_length: 'The limit includes any HTML and defaults to 255 characters. Set 0 here to have unlimited caption lengths, if your theme supports them.' ratio: 'The resizing ratio takes precedence over any Resizing Width or Resizing Height value which is set here. If Ratio is not set but both Width and Height are set, then Newscoop will use the value which results in a smaller image size. The default settings here can be overridden by the ratio, width or height settings for a specific inline image set on the Article Edit page.' replication: 'Enables you to set up Newscoop to operate on two servers at once, which is a safety feature in case of hardware or network problems.' filter: 'Enter keywords for templates that you wish to hide from the template editor accessible via the Theme Management page. For example, templates that are no longer in use, but you do not wish to delete from the server.' diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml index e2ec0b914d..650ae76833 100644 --- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml +++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/validators.en_GB.yml @@ -2,7 +2,7 @@ type_publications: name: min: 'Publication name must be longer than {{ limit }} characters.' metaDescription: - max: null + max: 'Publication description must be shorter than {{ limit }} characters.' metaTitle: max: 'Publication title must be shorter than {{ limit }} characters.' metaKeywords: From bb7edfea442e17b7c3097eea3ee79e83dccfc8f5 Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Mon, 10 Aug 2015 14:53:18 +0200 Subject: [PATCH 84/90] Adds auto increment to article playlist id --- newscoop/install/Resources/sql/campsite_core.sql | 2 +- .../install/Resources/sql/upgrade/4.4.x/2015.08.10/tables.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 newscoop/install/Resources/sql/upgrade/4.4.x/2015.08.10/tables.sql diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql index b3041fcf8f..3c4c0cfb35 100644 --- a/newscoop/install/Resources/sql/campsite_core.sql +++ b/newscoop/install/Resources/sql/campsite_core.sql @@ -2661,7 +2661,7 @@ CREATE TABLE playlist ( DROP TABLE IF EXISTS `playlist_article`; CREATE TABLE `playlist_article` ( - `id_playlist_article` int(11) NOT NULL, + `id_playlist_article` int(11) AUTO_INCREMENT NOT NULL, `id_playlist` int(11) NOT NULL, `article_no` int(11) NOT NULL, `article_language` int(11) NOT NULL, diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.08.10/tables.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.08.10/tables.sql new file mode 100644 index 0000000000..7f8f3ada07 --- /dev/null +++ b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.08.10/tables.sql @@ -0,0 +1 @@ +ALTER TABLE `playlist_article` CHANGE `id_playlist_article` `id_playlist_article` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT ; From e0c6455d8bb05fadb883ffdaa99a1f125d280b2a Mon Sep 17 00:00:00 2001 From: Mischa Gorinskat Date: Tue, 11 Aug 2015 17:16:38 +0200 Subject: [PATCH 85/90] IM-2915: Removed date limits from search datepicker According to the documentation a number represents the days from today and not the actual year. --- newscoop/admin-files/lib_campsite.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/newscoop/admin-files/lib_campsite.php b/newscoop/admin-files/lib_campsite.php index d6582bd043..a02280c5aa 100644 --- a/newscoop/admin-files/lib_campsite.php +++ b/newscoop/admin-files/lib_campsite.php @@ -584,8 +584,6 @@ function camp_get_calendar_field($p_fieldName, $p_defaultValue = null,