From 3299ee2546cee392fe5e4cf31c91e9adec246108 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Wed, 4 Nov 2009 21:25:29 +0300
Subject: [PATCH] * added into translation: feed title and description

---
 langs/ru.php               | 2 ++
 src/feed.php               | 9 ++++++---
 src/lang/class.default.php | 2 ++
 src/lang/en.php            | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/langs/ru.php b/langs/ru.php
index 9f6f9d0..7a6b427 100644
--- a/langs/ru.php
+++ b/langs/ru.php
@@ -77,6 +77,8 @@ class Lang extends DefaultLang
 		'alltags_hide' => "Скрыть все",
 		'a_settings' => "Настройки",
 		'rss_feed' => "RSS-лента",
+		'feed_title' => "%s",
+		'feed_description' => "%s - новые задачи",
 	);
 }
 
diff --git a/src/feed.php b/src/feed.php
index 95356d0..09b2074 100644
--- a/src/feed.php
+++ b/src/feed.php
@@ -22,6 +22,8 @@ $listData = $db->sqa("SELECT * FROM lists WHERE id=$listId");
 if(!$listData) {
 	die("No such list");
 }
+$listData['_feed_title'] = sprintf($lang->get('feed_title'), $listData['name']);
+$listData['_feed_descr'] = sprintf($lang->get('feed_description'), $listData['name']);
 htmlarray_ref($listData);
 
 $data = array();
@@ -49,7 +51,7 @@ function printRss($listData, $data)
 	$buildDate = gmdate('r');
 
 	$s = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rss version=\"2.0\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n<channel>\n".
-		"<title>$listData[name]</title>\n<link>$link</link>\n<description>New tasks in $listData[name]</description>\n".
+		"<title>$listData[_feed_title]</title>\n<link>$link</link>\n<description>$listData[_feed_descr]</description>\n".
 		"<lastBuildDate>$buildDate</lastBuildDate>\n\n";
 
 	foreach($data as $v)
@@ -57,9 +59,10 @@ function printRss($listData, $data)
 		$da = explode(' ', $v['d']);
 		$dDate = explode('-', $da[0]);
 		$dTime = explode(':', $da[1]);
-		$d = gmdate('r', mktime((int)$dTime[0],(int)$dTime[1],(int)$dTime[2], (int)$dDate[1],(int)$dDate[2],(int)$dDate[0]));
+		$d_ts = mktime((int)$dTime[0],(int)$dTime[1],(int)$dTime[2], (int)$dDate[1],(int)$dDate[2],(int)$dDate[0]);
+		$d = gmdate('r', $d_ts);
 
-		$guid = $listData['id'].'-'.$v['id'].'-'.$da[0].'_'.$da[1];
+		$guid = $listData['id'].'-'.$v['id'].'-'.$d_ts;
 
 		$s .= "<item>\n<title>$v[title]</title>\n".
 			"<link>$link</link>\n".
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 8184e55..46a5f53 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -77,6 +77,8 @@ class DefaultLang
 		'alltags_hide' => "Hide all",
 		'a_settings' => "Settings",
 		'rss_feed' => "RSS Feed",
+		'feed_title' => "%s",
+		'feed_description' => "New tasks in %s",
 	);
 
 	var $js = array();
diff --git a/src/lang/en.php b/src/lang/en.php
index 332f48a..0d4c0de 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -72,6 +72,8 @@ class Lang extends DefaultLang
 		'alltags_hide' => "Hide all",
 		'a_settings' => "Settings",
 		'rss_feed' => "RSS Feed",
+		'feed_title' => "%s",
+		'feed_description' => "New tasks in %s",
 	);
 }