From 5f04462e554e4604c04c2c9ca2fe97df6f6f6376 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 6 Mar 2016 12:51:39 +0100
Subject: [PATCH 1/3] Fix redirection while deleting a feed

Before, when deleting a feed from the statistics idle page, there was an error in the redirection process.
Now, the redirection works properly and redirects to the idle page.
---
 app/views/stats/idle.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 11b7df8c4..ba88b679f 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -6,10 +6,10 @@
 	<h1><?php echo _t('admin.stats.idle'); ?></h1>
 
 	<?php
-		$current_url = urlencode(Minz_Url::display(
+		$current_url = Minz_Url::display(
 			array('c' => 'stats', 'a' => 'idle'),
 			'php', true
-		));
+		);
 		$nothing = true;
 		foreach ($this->idleFeeds as $period => $feeds) {
 			if (!empty($feeds)) {

From e265c943190ad490c6da414b1e243ade14797652 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 6 Mar 2016 14:26:20 +0100
Subject: [PATCH 2/3] Fix url ending

---
 lib/Minz/Url.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 4279b045b..382437e9a 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -27,6 +27,8 @@ class Minz_Url {
 			$url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
 			if ($url_string === PUBLIC_TO_INDEX_PATH) {
 				$url_string = Minz_Request::guessBaseUrl();
+			} else {
+				$url_string .= '/';
 			}
 		} else {
 			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;

From bb0319c1c7823471a4a2474712d8301e07a5f44e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 14:50:43 +0100
Subject: [PATCH 3/3] i18n-cz JSON XML

https://github.com/FreshRSS/FreshRSS/pull/1097#commitcomment-16382595
https://github.com/FreshRSS/FreshRSS/issues/1094
---
 app/i18n/cz/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 969b69271..bc3e01992 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Pro parsování JSON chybí doporučená knihovna.',
+			'ok' => 'Máte doporučenou knihovnu pro parsování JSON.',
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Pro parsování XML chybí požadovaná knihovna.',
+			'ok' => 'Máte požadovanou knihovnu pro parsování XML.',
 		),
 	),
 	'conf' => array(