Index: modules/tv/tmpl/wap/upcoming.php
===================================================================
--- modules/tv/tmpl/wap/upcoming.php	(revision 11673)
+++ modules/tv/tmpl/wap/upcoming.php	(working copy)
@@ -171,7 +171,7 @@
     <tr><td></td><td>
       <?php echo $show->channel->name ?><br />
       <?php echo date('D, M j', $show->starttime) ?>
-      <?php echo date('(g:i A)', $show->starttime) ?> <?php echo nice_length($show->length) ?></td></tr>
+      <?php echo '('.strftime($_SESSION['time_format'], $show->starttime).')' ?> <?php echo nice_length($show->length) ?></td></tr>
       <tr><td></td><td>
 <?php
             echo implode(' | ', $commands);
Index: modules/tv/tmpl/wap/detail.php
===================================================================
--- modules/tv/tmpl/wap/detail.php	(revision 11673)
+++ modules/tv/tmpl/wap/detail.php	(working copy)
@@ -25,7 +25,7 @@
 
 <?php echo $program->title ?><BR>
 <?php echo date('D m/d/y', $program->starttime) ?><br />
-<?php echo date('g:i A', $program->starttime) ?> to <?php echo date('g:i A', $program->endtime) ?> (<?php echo (int)($program->length/60) ?> minutes)<BR>
+<?php echo strftime($_SESSION['time_format'], $program->starttime) ?> to <?php echo strftime($_SESSION['time_format'], $program->endtime) ?> (<?php echo (int)($program->length/60) ?> minutes)<BR>
                 <?php
                 if ($program->previouslyshown)
                     echo '(Rerun) ';
Index: modules/tv/tmpl/wap/recorded.php
===================================================================
--- modules/tv/tmpl/wap/recorded.php	(revision 11673)
+++ modules/tv/tmpl/wap/recorded.php	(working copy)
@@ -49,7 +49,7 @@
             echo "<b>".$show->subtitle."</b><br />";
         if(strlen($show->description)>1)
             echo $show->description."<br />";
-        echo date('D, M j,Y (g:i A)', $show->starttime)."<br />";
+        echo date('D, M j, Y', $show->starttime).' ('.strftime($_SESSION['time_format'], $show->starttime).")<br />";
         echo nice_length($show->length)." ".nice_filesize($show->filesize)."<br />";
 
         if ($show->endtime > time()) { ?>
Index: modules/tv/tmpl/wap/channel.php
===================================================================
--- modules/tv/tmpl/wap/channel.php	(revision 11673)
+++ modules/tv/tmpl/wap/channel.php	(working copy)
@@ -62,7 +62,8 @@
         foreach ($this_channel->programs as $show) {
     // Print the content
     ?>
-    <?php echo date('g:i A', $show->starttime) ?> - <?php echo date('g:i A', $show->endtime) ?><br />
+    <?php echo strftime($_SESSION['time_format'], $show->starttime) ?> - 
+    <?php echo strftime($_SESSION['time_format'], $show->endtime) ?><br />
 <?php
         echo '<a href="'.root.'tv/detail/'.$show->chanid.'/'.$show->starttime.'">'.$show->title.'</a><br />';
         if(strlen($show->subtitle))