From 9ffb94a275c285bb70d9e21037c882956bb6001e Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Fri, 11 Feb 2011 22:31:46 +0200
Subject: Unified date formatting and added recording duration format into
 translations.

---
 pages/recordings.ecpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'pages')

diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index d213b54..f256a0b 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -182,9 +182,11 @@ else
 	recItems.sort(RecordingsItemPtrCompare::ByAscendingName);
 for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 		RecordingsItemPtr recItem = *recIter;
-		string day(FormatDateTime("%a,", recItem->StartTime()));
+		// xgettext:no-c-format
+		string day(FormatDateTime(tr("%a,"), recItem->StartTime()));
 		string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;");
-		string duration(LiveSetup().GetShowRecDuration() ? "(" + lexical_cast<string, int>(recItem->Duration()) + "')" : "");
+		// TRANSLATORS: recording duration format
+		string duration(LiveSetup().GetShowRecDuration() ? FormatDuration(tr("(%d')"), recItem->Duration()) : "");
 		string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : "");
 		string hint(tr("Click to view details.")); if (!shortDescr.empty()) hint = shortDescr + "<br />" + hint;
 </%cpp>
@@ -284,15 +286,10 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	string shortDescr;
 	string archived;
 </%args>
-<%cpp>
-	// TRANSLATORS: strftime format string for recording start info: day, date, hour.
-	// xgettext:no-c-format
-	char const * recFormatStr( tr("%a %x %X") );
-</%cpp>
 	<div class="recording_item">
 	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { </%cpp><input type="checkbox" name="deletions" value="<$ id $>" /><%cpp> } </%cpp></div>
 	<div class="recording_spec">
-		<div class="recording_day"><$ FormatDateTime(recFormatStr, startTime) $></div>
+		<div class="recording_day"><$ FormatDateTime(tr("%a,"), startTime) + string(" ") + FormatDateTime(tr("%b %d %y"), startTime) + string(" ") + FormatDateTime(tr("%I:%M %p"), startTime) $></div>
 		<div class="recording_duration"><$ duration $></div>
 		<div class="recording_name"><a <& tooltip.hint text=(hint) &><& tooltip.display domId=(id) &>><$ name $><br /><%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {</%cpp><span><$ shortDescr $></span><%cpp> } else { </%cpp><span>&nbsp;</span><%cpp> } </%cpp></a></div>
 	</div>
-- 
cgit v1.2.3