aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/FUNDING.yml2
-rw-r--r--composer.lock104
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php3
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig6
20 files changed, 100 insertions, 50 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..3081fc9d
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
1# github: [nicosomb, j0k3r, tcitworld, Kdecherf]
2liberapay: wallabag
diff --git a/composer.lock b/composer.lock
index effd6029..124226d6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -482,16 +482,16 @@
482 }, 482 },
483 { 483 {
484 "name": "doctrine/collections", 484 "name": "doctrine/collections",
485 "version": "v1.6.1", 485 "version": "v1.6.2",
486 "source": { 486 "source": {
487 "type": "git", 487 "type": "git",
488 "url": "https://github.com/doctrine/collections.git", 488 "url": "https://github.com/doctrine/collections.git",
489 "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956" 489 "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be"
490 }, 490 },
491 "dist": { 491 "dist": {
492 "type": "zip", 492 "type": "zip",
493 "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956", 493 "url": "https://api.github.com/repos/doctrine/collections/zipball/c5e0bc17b1620e97c968ac409acbff28b8b850be",
494 "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956", 494 "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be",
495 "shasum": "" 495 "shasum": ""
496 }, 496 },
497 "require": { 497 "require": {
@@ -548,7 +548,7 @@
548 "iterators", 548 "iterators",
549 "php" 549 "php"
550 ], 550 ],
551 "time": "2019-03-25T19:03:48+00:00" 551 "time": "2019-06-09T13:48:14+00:00"
552 }, 552 },
553 { 553 {
554 "name": "doctrine/common", 554 "name": "doctrine/common",
@@ -1153,21 +1153,24 @@
1153 }, 1153 },
1154 { 1154 {
1155 "name": "doctrine/lexer", 1155 "name": "doctrine/lexer",
1156 "version": "v1.0.1", 1156 "version": "1.0.2",
1157 "source": { 1157 "source": {
1158 "type": "git", 1158 "type": "git",
1159 "url": "https://github.com/doctrine/lexer.git", 1159 "url": "https://github.com/doctrine/lexer.git",
1160 "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" 1160 "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
1161 }, 1161 },
1162 "dist": { 1162 "dist": {
1163 "type": "zip", 1163 "type": "zip",
1164 "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", 1164 "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
1165 "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", 1165 "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
1166 "shasum": "" 1166 "shasum": ""
1167 }, 1167 },
1168 "require": { 1168 "require": {
1169 "php": ">=5.3.2" 1169 "php": ">=5.3.2"
1170 }, 1170 },
1171 "require-dev": {
1172 "phpunit/phpunit": "^4.5"
1173 },
1171 "type": "library", 1174 "type": "library",
1172 "extra": { 1175 "extra": {
1173 "branch-alias": { 1176 "branch-alias": {
@@ -1175,8 +1178,8 @@
1175 } 1178 }
1176 }, 1179 },
1177 "autoload": { 1180 "autoload": {
1178 "psr-0": { 1181 "psr-4": {
1179 "Doctrine\\Common\\Lexer\\": "lib/" 1182 "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
1180 } 1183 }
1181 }, 1184 },
1182 "notification-url": "https://packagist.org/downloads/", 1185 "notification-url": "https://packagist.org/downloads/",
@@ -1197,13 +1200,16 @@
1197 "email": "schmittjoh@gmail.com" 1200 "email": "schmittjoh@gmail.com"
1198 } 1201 }
1199 ], 1202 ],
1200 "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", 1203 "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
1201 "homepage": "http://www.doctrine-project.org", 1204 "homepage": "https://www.doctrine-project.org/projects/lexer.html",
1202 "keywords": [ 1205 "keywords": [
1206 "annotations",
1207 "docblock",
1203 "lexer", 1208 "lexer",
1204 "parser" 1209 "parser",
1210 "php"
1205 ], 1211 ],
1206 "time": "2014-09-09T13:34:57+00:00" 1212 "time": "2019-06-08T11:03:04+00:00"
1207 }, 1213 },
1208 { 1214 {
1209 "name": "doctrine/migrations", 1215 "name": "doctrine/migrations",
@@ -5783,20 +5789,20 @@
5783 }, 5789 },
5784 { 5790 {
5785 "name": "php-http/httplug-bundle", 5791 "name": "php-http/httplug-bundle",
5786 "version": "1.15.2", 5792 "version": "1.16.0",
5787 "source": { 5793 "source": {
5788 "type": "git", 5794 "type": "git",
5789 "url": "https://github.com/php-http/HttplugBundle.git", 5795 "url": "https://github.com/php-http/HttplugBundle.git",
5790 "reference": "35d281804a90f0359aa9da5b5b1f55c18aeafaf8" 5796 "reference": "5044b655fcd3a43243383cd692a6bb6cd18af24f"
5791 }, 5797 },
5792 "dist": { 5798 "dist": {
5793 "type": "zip", 5799 "type": "zip",
5794 "url": "https://api.github.com/repos/php-http/HttplugBundle/zipball/35d281804a90f0359aa9da5b5b1f55c18aeafaf8", 5800 "url": "https://api.github.com/repos/php-http/HttplugBundle/zipball/5044b655fcd3a43243383cd692a6bb6cd18af24f",
5795 "reference": "35d281804a90f0359aa9da5b5b1f55c18aeafaf8", 5801 "reference": "5044b655fcd3a43243383cd692a6bb6cd18af24f",
5796 "shasum": "" 5802 "shasum": ""
5797 }, 5803 },
5798 "require": { 5804 "require": {
5799 "php": "^5.5 || ^7.0", 5805 "php": "^7.1",
5800 "php-http/client-common": "^1.9 || ^2.0", 5806 "php-http/client-common": "^1.9 || ^2.0",
5801 "php-http/client-implementation": "^1.0", 5807 "php-http/client-implementation": "^1.0",
5802 "php-http/discovery": "^1.0", 5808 "php-http/discovery": "^1.0",
@@ -5806,33 +5812,34 @@
5806 "php-http/message-factory": "^1.0.2", 5812 "php-http/message-factory": "^1.0.2",
5807 "php-http/stopwatch-plugin": "^1.2", 5813 "php-http/stopwatch-plugin": "^1.2",
5808 "psr/http-message": "^1.0", 5814 "psr/http-message": "^1.0",
5809 "symfony/config": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5815 "symfony/config": "^3.4.20 || ^4.2.1",
5810 "symfony/dependency-injection": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5816 "symfony/dependency-injection": "^3.4.20 || ^4.2.1",
5811 "symfony/event-dispatcher": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5817 "symfony/event-dispatcher": "^3.4.20 || ^4.2.1",
5812 "symfony/http-kernel": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5818 "symfony/http-kernel": "^3.4.20 || ^4.2.1",
5813 "symfony/options-resolver": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1" 5819 "symfony/options-resolver": "^3.4.20 || ^4.2.1"
5814 }, 5820 },
5815 "conflict": { 5821 "conflict": {
5822 "php-http/curl-client": "<2.0",
5816 "php-http/guzzle6-adapter": "<1.1" 5823 "php-http/guzzle6-adapter": "<1.1"
5817 }, 5824 },
5818 "require-dev": { 5825 "require-dev": {
5819 "guzzlehttp/psr7": "^1.0", 5826 "guzzlehttp/psr7": "^1.0",
5820 "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.3", 5827 "matthiasnoback/symfony-dependency-injection-test": "^3.0",
5821 "nyholm/nsa": "^1.1", 5828 "nyholm/nsa": "^1.1",
5822 "php-http/cache-plugin": "^1.6", 5829 "php-http/cache-plugin": "^1.6",
5823 "php-http/guzzle6-adapter": "^1.1.1 || ^2.0.1", 5830 "php-http/guzzle6-adapter": "^1.1.1 || ^2.0.1",
5824 "php-http/mock-client": "^1.2", 5831 "php-http/mock-client": "^1.2",
5825 "php-http/promise": "^1.0", 5832 "php-http/promise": "^1.0",
5826 "polishsymfonycommunity/symfony-mocker-container": "^1.0", 5833 "polishsymfonycommunity/symfony-mocker-container": "^1.0",
5827 "symfony/browser-kit": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5834 "symfony/browser-kit": "^3.4.20 || ^4.2.1",
5828 "symfony/cache": "^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5835 "symfony/cache": "^3.4.20 || ^4.2.1",
5829 "symfony/dom-crawler": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5836 "symfony/dom-crawler": "^3.4.20 || ^4.2.1",
5830 "symfony/framework-bundle": "^2.8.1 || ^3.0.1 || ^4.0", 5837 "symfony/framework-bundle": "^3.4.0 || ^4.2",
5831 "symfony/http-foundation": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5838 "symfony/http-foundation": "^3.4.20 || ^4.2.1",
5832 "symfony/phpunit-bridge": "^3.4 || ^4.2", 5839 "symfony/phpunit-bridge": "^3.4 || ^4.2",
5833 "symfony/stopwatch": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5840 "symfony/stopwatch": "^3.4.20 || ^4.2.1",
5834 "symfony/twig-bundle": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5841 "symfony/twig-bundle": "^3.4.20 || ^4.2.1",
5835 "symfony/web-profiler-bundle": "^2.8.49 || ^3.0.9 || ^3.1.10 || ^3.2.14 || ^3.3.18 || ^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1", 5842 "symfony/web-profiler-bundle": "^3.4.20 || ^4.2.1",
5836 "twig/twig": "^1.36 || ^2.6" 5843 "twig/twig": "^1.36 || ^2.6"
5837 }, 5844 },
5838 "suggest": { 5845 "suggest": {
@@ -5880,7 +5887,7 @@
5880 "message", 5887 "message",
5881 "php-http" 5888 "php-http"
5882 ], 5889 ],
5883 "time": "2019-04-18T14:01:25+00:00" 5890 "time": "2019-06-05T12:03:16+00:00"
5884 }, 5891 },
5885 { 5892 {
5886 "name": "php-http/logger-plugin", 5893 "name": "php-http/logger-plugin",
@@ -7938,7 +7945,7 @@
7938 }, 7945 },
7939 { 7946 {
7940 "name": "Gert de Pagter", 7947 "name": "Gert de Pagter",
7941 "email": "backendtea@gmail.com" 7948 "email": "BackEndTea@gmail.com"
7942 } 7949 }
7943 ], 7950 ],
7944 "description": "Symfony polyfill for ctype functions", 7951 "description": "Symfony polyfill for ctype functions",
@@ -9583,34 +9590,35 @@
9583 }, 9590 },
9584 { 9591 {
9585 "name": "doctrine/doctrine-fixtures-bundle", 9592 "name": "doctrine/doctrine-fixtures-bundle",
9586 "version": "3.1.0", 9593 "version": "3.2.0",
9587 "source": { 9594 "source": {
9588 "type": "git", 9595 "type": "git",
9589 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", 9596 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
9590 "reference": "f016565b251c2dfa32a8d6da44d1650dc9ec1498" 9597 "reference": "13b2e8e1af099bc06f8611497fe079a4e0b4e497"
9591 }, 9598 },
9592 "dist": { 9599 "dist": {
9593 "type": "zip", 9600 "type": "zip",
9594 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/f016565b251c2dfa32a8d6da44d1650dc9ec1498", 9601 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/13b2e8e1af099bc06f8611497fe079a4e0b4e497",
9595 "reference": "f016565b251c2dfa32a8d6da44d1650dc9ec1498", 9602 "reference": "13b2e8e1af099bc06f8611497fe079a4e0b4e497",
9596 "shasum": "" 9603 "shasum": ""
9597 }, 9604 },
9598 "require": { 9605 "require": {
9599 "doctrine/data-fixtures": "^1.3", 9606 "doctrine/data-fixtures": "^1.3",
9600 "doctrine/doctrine-bundle": "^1.6", 9607 "doctrine/doctrine-bundle": "^1.6",
9608 "doctrine/orm": "^2.6.0",
9601 "php": "^7.1", 9609 "php": "^7.1",
9602 "symfony/doctrine-bridge": "~3.4|^4.1", 9610 "symfony/doctrine-bridge": "~3.4|^4.1",
9603 "symfony/framework-bundle": "^3.4|^4.1" 9611 "symfony/framework-bundle": "^3.4|^4.1"
9604 }, 9612 },
9605 "require-dev": { 9613 "require-dev": {
9606 "doctrine/coding-standard": "^5.0", 9614 "doctrine/coding-standard": "^6.0",
9607 "phpunit/phpunit": "^7.4", 9615 "phpunit/phpunit": "^7.4",
9608 "symfony/phpunit-bridge": "^4.1" 9616 "symfony/phpunit-bridge": "^4.1"
9609 }, 9617 },
9610 "type": "symfony-bundle", 9618 "type": "symfony-bundle",
9611 "extra": { 9619 "extra": {
9612 "branch-alias": { 9620 "branch-alias": {
9613 "dev-master": "3.1.x-dev" 9621 "dev-master": "3.2.x-dev"
9614 } 9622 }
9615 }, 9623 },
9616 "autoload": { 9624 "autoload": {
@@ -9642,7 +9650,7 @@
9642 "Fixture", 9650 "Fixture",
9643 "persistence" 9651 "persistence"
9644 ], 9652 ],
9645 "time": "2018-12-21T10:10:51+00:00" 9653 "time": "2019-06-07T11:21:53+00:00"
9646 }, 9654 },
9647 { 9655 {
9648 "name": "friendsofphp/php-cs-fixer", 9656 "name": "friendsofphp/php-cs-fixer",
@@ -10829,16 +10837,16 @@
10829 }, 10837 },
10830 { 10838 {
10831 "name": "symfony/phpunit-bridge", 10839 "name": "symfony/phpunit-bridge",
10832 "version": "v4.3.0", 10840 "version": "v4.3.1",
10833 "source": { 10841 "source": {
10834 "type": "git", 10842 "type": "git",
10835 "url": "https://github.com/symfony/phpunit-bridge.git", 10843 "url": "https://github.com/symfony/phpunit-bridge.git",
10836 "reference": "7bfc1b57d1ac9513703391498aa8da4764388bc6" 10844 "reference": "4c02cf116370da969b88bb607563f614e2450f73"
10837 }, 10845 },
10838 "dist": { 10846 "dist": {
10839 "type": "zip", 10847 "type": "zip",
10840 "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/7bfc1b57d1ac9513703391498aa8da4764388bc6", 10848 "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4c02cf116370da969b88bb607563f614e2450f73",
10841 "reference": "7bfc1b57d1ac9513703391498aa8da4764388bc6", 10849 "reference": "4c02cf116370da969b88bb607563f614e2450f73",
10842 "shasum": "" 10850 "shasum": ""
10843 }, 10851 },
10844 "require": { 10852 "require": {
@@ -10890,7 +10898,7 @@
10890 ], 10898 ],
10891 "description": "Symfony PHPUnit Bridge", 10899 "description": "Symfony PHPUnit Bridge",
10892 "homepage": "https://symfony.com", 10900 "homepage": "https://symfony.com",
10893 "time": "2019-05-08T13:47:25+00:00" 10901 "time": "2019-05-30T08:57:55+00:00"
10894 } 10902 }
10895 ], 10903 ],
10896 "aliases": [], 10904 "aliases": [],
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index d0155c60..90d36d71 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -87,6 +87,8 @@ class TagController extends Controller
87 { 87 {
88 $tags = $this->get('wallabag_core.tag_repository') 88 $tags = $this->get('wallabag_core.tag_repository')
89 ->findAllFlatTagsWithNbEntries($this->getUser()->getId()); 89 ->findAllFlatTagsWithNbEntries($this->getUser()->getId());
90 $nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
91 ->countUntaggedEntriesByUser($this->getUser()->getId());
90 92
91 $renameForms = []; 93 $renameForms = [];
92 foreach ($tags as $tag) { 94 foreach ($tags as $tag) {
@@ -96,6 +98,7 @@ class TagController extends Controller
96 return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [ 98 return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
97 'tags' => $tags, 99 'tags' => $tags,
98 'renameForms' => $renameForms, 100 'renameForms' => $renameForms,
101 'nbEntriesUntagged' => $nbEntriesUntagged,
99 ]); 102 ]);
100 } 103 }
101 104
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 16c44885..d9675982 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -130,6 +130,21 @@ class EntryRepository extends EntityRepository
130 } 130 }
131 131
132 /** 132 /**
133 * Retrieve the number of untagged entries for a user.
134 *
135 * @param int $userId
136 *
137 * @return int
138 */
139 public function countUntaggedEntriesByUser($userId)
140 {
141 return (int) $this->getRawBuilderForUntaggedByUser($userId)
142 ->select('count(e.id)')
143 ->getQuery()
144 ->getSingleScalarResult();
145 }
146
147 /**
133 * Find Entries. 148 * Find Entries.
134 * 149 *
135 * @param int $userId 150 * @param int $userId
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 884a67ba..5c4ca29c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -423,6 +423,7 @@ tag:
423 list: 423 list:
424 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 424 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
425 # see_untagged_entries: 'See untagged entries' 425 # see_untagged_entries: 'See untagged entries'
426 # no_untagged_entries: 'There are no untagged entries.'
426 new: 427 new:
427 # add: 'Add' 428 # add: 'Add'
428 # placeholder: 'You can add several tags, separated by a comma.' 429 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 97a6a387..a21bd0f1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -414,6 +414,7 @@ tag:
414 list: 414 list:
415 number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.' 415 number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
416 see_untagged_entries: 'Zeige nicht getaggte Einträge' 416 see_untagged_entries: 'Zeige nicht getaggte Einträge'
417 # no_untagged_entries: 'There are no untagged entries.'
417 new: 418 new:
418 add: 'Hinzufügen' 419 add: 'Hinzufügen'
419 placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' 420 placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 2bd4828a..2f310246 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -423,6 +423,7 @@ tag:
423 list: 423 list:
424 number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 424 number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
425 see_untagged_entries: 'See untagged entries' 425 see_untagged_entries: 'See untagged entries'
426 no_untagged_entries: 'There are no untagged entries.'
426 new: 427 new:
427 add: 'Add' 428 add: 'Add'
428 placeholder: 'You can add several tags, separated by a comma.' 429 placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 24dc5929..c194041a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -423,6 +423,7 @@ tag:
423 list: 423 list:
424 number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.' 424 number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
425 see_untagged_entries: 'Ver artículos sin etiquetas' 425 see_untagged_entries: 'Ver artículos sin etiquetas'
426 # no_untagged_entries: 'There are no untagged entries.'
426 new: 427 new:
427 add: 'Añadir' 428 add: 'Añadir'
428 placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' 429 placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index f041ef9e..9aef7dde 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -423,6 +423,7 @@ tag:
423 list: 423 list:
424 number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.' 424 number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
425 # see_untagged_entries: 'See untagged entries' 425 # see_untagged_entries: 'See untagged entries'
426 # no_untagged_entries: 'There are no untagged entries.'
426 new: 427 new:
427 # add: 'Add' 428 # add: 'Add'
428 # placeholder: 'You can add several tags, separated by a comma.' 429 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 5d2c5e36..9848ed9a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -423,6 +423,7 @@ tag:
423 list: 423 list:
424 number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." 424 number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
425 see_untagged_entries: "Voir les articles sans tag" 425 see_untagged_entries: "Voir les articles sans tag"
426 no_untagged_entries: 'Aucun article sans tag.'
426 new: 427 new:
427 add: "Ajouter" 428 add: "Ajouter"
428 placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." 429 placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index dd650bf4..efbf062b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -422,6 +422,7 @@ tag:
422 list: 422 list:
423 number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette." 423 number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette."
424 see_untagged_entries: 'Vedi articoli non etichettati' 424 see_untagged_entries: 'Vedi articoli non etichettati'
425 # no_untagged_entries: 'There are no untagged entries.'
425 new: 426 new:
426 add: 'Aggiungi' 427 add: 'Aggiungi'
427 placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' 428 placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 0097377d..86ce4644 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -422,6 +422,7 @@ tag:
422 list: 422 list:
423 number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas." 423 number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
424 see_untagged_entries: "Afichar las entradas sens etiquetas" 424 see_untagged_entries: "Afichar las entradas sens etiquetas"
425 # no_untagged_entries: 'There are no untagged entries.'
425 new: 426 new:
426 add: 'Ajustar' 427 add: 'Ajustar'
427 placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." 428 placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 9ff4f459..9ebe0236 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -422,6 +422,7 @@ tag:
422 list: 422 list:
423 number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.' 423 number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
424 see_untagged_entries: 'Zobacz nieotagowane wpisy' 424 see_untagged_entries: 'Zobacz nieotagowane wpisy'
425 # no_untagged_entries: 'There are no untagged entries.'
425 new: 426 new:
426 add: 'Dodaj' 427 add: 'Dodaj'
427 placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' 428 placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index b90e5a54..d310e016 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -422,6 +422,7 @@ tag:
422 list: 422 list:
423 number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.' 423 number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.'
424 see_untagged_entries: 'Ver entradas sem tags' 424 see_untagged_entries: 'Ver entradas sem tags'
425 # no_untagged_entries: 'There are no untagged entries.'
425 new: 426 new:
426 # add: 'Add' 427 # add: 'Add'
427 # placeholder: 'You can add several tags, separated by a comma.' 428 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 514df6dc..c11ff0b8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -422,6 +422,7 @@ tag:
422 list: 422 list:
423 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 423 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
424 # see_untagged_entries: 'See untagged entries' 424 # see_untagged_entries: 'See untagged entries'
425 # no_untagged_entries: 'There are no untagged entries.'
425 new: 426 new:
426 # add: 'Add' 427 # add: 'Add'
427 # placeholder: 'You can add several tags, separated by a comma.' 428 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 34d5cce8..9fe75369 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -411,6 +411,7 @@ tag:
411 list: 411 list:
412 number_on_the_page: '{0} Теги не найдены.|{1} Найден один тег.|]1,Inf[ Найдено %count% тегов.' 412 number_on_the_page: '{0} Теги не найдены.|{1} Найден один тег.|]1,Inf[ Найдено %count% тегов.'
413 see_untagged_entries: 'Просмотреть записи без тегов' 413 see_untagged_entries: 'Просмотреть записи без тегов'
414 # no_untagged_entries: 'There are no untagged entries.'
414 new: 415 new:
415 add: 'Добавить' 416 add: 'Добавить'
416 placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.' 417 placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index aad2e51b..672dcbf0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -420,6 +420,7 @@ tag:
420 list: 420 list:
421 number_on_the_page: '{0} ไม่มีการแท็ก|{1} มีหนึ่งแท็ก|]1,Inf[ มี %count% แท็ก' 421 number_on_the_page: '{0} ไม่มีการแท็ก|{1} มีหนึ่งแท็ก|]1,Inf[ มี %count% แท็ก'
422 see_untagged_entries: 'พบรายการที่ไม่ได้แท็ก' 422 see_untagged_entries: 'พบรายการที่ไม่ได้แท็ก'
423 # no_untagged_entries: 'There are no untagged entries.'
423 new: 424 new:
424 add: 'เพิ่ม' 425 add: 'เพิ่ม'
425 placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma' 426 placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index c23461f6..c2ad854d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -420,6 +420,7 @@ tag:
420 list: 420 list:
421 number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.' 421 number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
422 # see_untagged_entries: 'See untagged entries' 422 # see_untagged_entries: 'See untagged entries'
423 # no_untagged_entries: 'There are no untagged entries.'
423 new: 424 new:
424 # add: 'Add' 425 # add: 'Add'
425 # placeholder: 'You can add several tags, separated by a comma.' 426 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
index ae8403bd..aa17b842 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
@@ -31,6 +31,10 @@
31 </ul> 31 </ul>
32 32
33 <div> 33 <div>
34 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a> 34 {% if nbEntriesUntagged == 0 %}
35 {{ 'tag.list.no_untagged_entries'|trans }}
36 {% else %}
37 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}})</a>
38 {% endif %}
35 </div> 39 </div>
36{% endblock %} 40{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 79907bbb..0a3475ef 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -34,6 +34,10 @@
34 </div> 34 </div>
35 35
36 <div> 36 <div>
37 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a> 37 {% if nbEntriesUntagged == 0 %}
38 {{ 'tag.list.no_untagged_entries'|trans }}
39 {% else %}
40 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}})</a>
41 {% endif %}
38 </div> 42 </div>
39{% endblock %} 43{% endblock %}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 11:46:06 +0000