More inactive cutoffs (#2831)

* Fill additional cutoffs

* Update phpdoc

* Add translation strings

* Update app/i18n/fr/gen.php

Co-Authored-By: Alexandre Alapetite <alexandre@alapetite.fr>

* Add Dutch translation

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

16 files changed, 66 insertions, 3 deletions

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 0d7d8f65a..03f945ab4 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -73,6 +73,9 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 	 *
 	 * It displays the list of idle feed for different period. The supported
 	 * periods are:
+	 *   - last 5 years
+	 *   - last 3 years
+	 *   - last 2 years
 	 *   - last year
 	 *   - last 6 months
 	 *   - last 3 months
@@ -83,6 +86,9 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$statsDAO = FreshRSS_Factory::createStatsDAO();
 		$feeds = $statsDAO->calculateFeedLastDate();
 		$idleFeeds = array(
+			'last_5_year' => array(),
+			'last_3_year' => array(),
+			'last_2_year' => array(),
 			'last_year' => array(),
 			'last_6_month' => array(),
 			'last_3_month' => array(),
@@ -101,13 +107,25 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$last6Month->modify('-6 month');
 		$lastYear = clone $now;
 		$lastYear->modify('-1 year');
+		$last2Year = clone $now;
+		$last2Year->modify('-2 year');
+		$last3Year = clone $now;
+		$last3Year->modify('-3 year');
+		$last5Year = clone $now;
+		$last5Year->modify('-5 year');
 
 		foreach ($feeds as $feed) {
 			$feedDate->setTimestamp($feed['last_date']);
 			if ($feedDate >= $lastWeek) {
 				continue;
 			}
-			if ($feedDate < $lastYear) {
+			if ($feedDate < $last5Year) {
+				$idleFeeds['last_5_year'][] = $feed;
+			} elseif ($feedDate < $last3Year) {
+				$idleFeeds['last_3_year'][] = $feed;
+			} elseif ($feedDate < $last2Year) {
+				$idleFeeds['last_2_year'][] = $feed;
+			} elseif ($feedDate < $lastYear) {
 				$idleFeeds['last_year'][] = $feed;
 			} elseif ($feedDate < $last6Month) {
 				$idleFeeds['last_6_month'][] = $feed;
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index bf1efeadd..945b9b713 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\Č\\e\\r\\v\\e\\n',
 		'jun' => 'čer',
 		'june' => 'Čer',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Minulé tři měsíce',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Minulých šest měsíců',
 		'last_month' => 'Minulý měsíc',
 		'last_week' => 'Minulý týden',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 43fbcfe10..0d0d4d7c3 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\i',
 		'jun' => 'Jun',
 		'june' => 'Juni',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Letzte drei Monate',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Letzte sechs Monate',
 		'last_month' => 'Letzter Monat',
 		'last_week' => 'Letzte Woche',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 747b92109..cd9a21da1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\e',
 		'jun' => 'June',
 		'june' => 'June',
+		'last_2_year' => 'Last two years',
 		'last_3_month' => 'Last three months',
+		'last_3_year' => 'Last three years',
+		'last_5_year' => 'Last five years',
 		'last_6_month' => 'Last six months',
 		'last_month' => 'Last month',
 		'last_week' => 'Last week',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 8a573fbf0..3750f6db8 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\i\\o',
 		'jun' => 'jun',
 		'june' => 'junio',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Últimos tres meses',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Últimos seis meses',
 		'last_month' => 'Mes pasado',
 		'last_week' => 'Semana pasada',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 62f3265da..5889fdef7 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\j\\u\\i\\n',
 		'jun' => 'juin',
 		'june' => 'juin',
+		'last_2_year' => 'Depuis deux ans',
 		'last_3_month' => 'Depuis les trois derniers mois',
+		'last_3_year' => 'Depuis trois ans',
+		'last_5_year' => 'Depuis cinq ans',
 		'last_6_month' => 'Depuis les six derniers mois',
 		'last_month' => 'Depuis le mois dernier',
 		'last_week' => 'Depuis la semaine dernière',
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 85fcc0979..7fad51e35 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\e',	// TODO - Translation
 		'jun' => 'jun',
 		'june' => 'Jun',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'בשלושת החודשים האחרונים',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'בששת החודשים האחרונים',
 		'last_month' => 'בחודש שעבר',
 		'last_week' => 'בשבוע שעבר',
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 559ed4a2a..93ae7e850 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\G\\i\\u\\g\\n\\o',
 		'jun' => 'jun',
 		'june' => 'giugno',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Ultimi 3 mesi',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Ultimi 6 mesi',
 		'last_month' => 'Ultimo mese',
 		'last_week' => 'Ultima settimana',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index 1518a1394..53a16cc4e 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\e',
 		'jun' => '6월',
 		'june' => '6월',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => '최근 3 개월',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => '최근 6 개월',
 		'last_month' => '최근 한 달',
 		'last_week' => '최근 한 주',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 296caee6f..0de4eb95c 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -73,8 +73,11 @@ return array(
 		'Jun' => '\\J\\u\\n\\i',
 		'jun' => 'jun',
 		'june' => 'Jun',
-		'last_3_month' => 'Laatste drie maanden',
-		'last_6_month' => 'Laatste zes maanden',
+		'last_2_year' => 'Afgelopen twee jaar',
+		'last_3_month' => 'Afgelopen drie maanden',
+		'last_3_year' => 'Afgelopen drie jaar',
+		'last_5_year' => 'Afgelopen vijf jaar',
+		'last_6_month' => 'Afgelopen zes maanden',
 		'last_month' => 'Vorige maand',
 		'last_week' => 'Vorige week',
 		'last_year' => 'Vorig jaar',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 9726291cc..2274af44e 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\j\\u\\n\\h',
 		'jun' => 'junh',
 		'june' => 'junh',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Dempuèi los darrièrs tres meses',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Dempuèi los darrièrs sièis meses',
 		'last_month' => 'Dempuèi lo mes passat',
 		'last_week' => 'Dempuèi la setmana passada',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 757f3a4e5..eb826141e 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\h\\o',
 		'jun' => 'jun',
 		'june' => 'Jun',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Últimos três meses',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Últimos seis meses',
 		'last_month' => 'Últimos mês',
 		'last_week' => 'Última semana',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index c910dea2d..4487613a1 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\u\\n\\e',	// TODO - Translation
 		'jun' => 'jun',
 		'june' => 'Jun',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Last three months',	// TODO - Translation
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Last six months',	// TODO - Translation
 		'last_month' => 'Last month',	// TODO - Translation
 		'last_week' => 'Last week',	// TODO - Translation
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
index 1e32b5096..f0c04e534 100644
--- a/app/i18n/sk/gen.php
+++ b/app/i18n/sk/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\J\\ú\\n',
 		'jun' => 'Jún',
 		'june' => 'Jún',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Posledné 3 mesiace',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Posledných 6 mesiacov',
 		'last_month' => 'Posledný mesiac',
 		'last_week' => 'Posledný týždeň',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index af41b3df1..b5f3dde69 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\H\\a\\z\\i\\r\\a\\n',
 		'jun' => 'haz',
 		'june' => 'Haz',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => 'Son 3 ay',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => 'Son 6 ay',
 		'last_month' => 'Geçen ay',
 		'last_week' => 'Geçen hafta',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index d89a19b32..9ae18cfcb 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -73,7 +73,10 @@ return array(
 		'Jun' => '\\六\\月',
 		'jun' => '六月',
 		'june' => '六月',
+		'last_2_year' => 'Last two years',	// TODO - Translation
 		'last_3_month' => '最近三个月',
+		'last_3_year' => 'Last three years',	// TODO - Translation
+		'last_5_year' => 'Last five years',	// TODO - Translation
 		'last_6_month' => '最近六个月',
 		'last_month' => '上月',
 		'last_week' => '上周',