From ffe54a20ed08b55168c502e9fdc65c574a560eb1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 8 Nov 2010 19:16:03 +0000 Subject: [PATCH] (trunk) #3698 "creation date of magnet links are set before the epoch." -- fixed. --- gtk/details.c | 4 ++++ qt/details.cc | 6 ++++-- web/javascript/formatter.js | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gtk/details.c b/gtk/details.c index b312ab81c..cd5634ce9 100644 --- a/gtk/details.c +++ b/gtk/details.c @@ -605,6 +605,10 @@ get_short_date_string( time_t t ) { char buf[64]; struct tm tm; + + if( !t ) + return g_strdup( _( "N/A" ) ); + tr_localtime_r( &t, &tm ); strftime( buf, sizeof( buf ), "%d %b %Y", &tm ); return g_locale_to_utf8( buf, -1, NULL, NULL, NULL ); diff --git a/qt/details.cc b/qt/details.cc index 68a7ae671..6a6a5e230 100644 --- a/qt/details.cc +++ b/qt/details.cc @@ -619,10 +619,12 @@ Details :: refresh( ) } if( mixed_creator && mixed_date ) string = mixed; - else if( mixed_date ) + else if( mixed_date && !creator.isEmpty()) string = tr( "Created by %1" ).arg( creator ); - else if( mixed_creator || creator.isEmpty( ) ) + else if( mixed_creator && !date.isEmpty()) string = tr( "Created on %1" ).arg( date ); + else if( creator.isEmpty() && date.isEmpty()) + string = tr( "N/A" ); else string = tr( "Created by %1 on %2" ).arg( creator ).arg( date ); } diff --git a/web/javascript/formatter.js b/web/javascript/formatter.js index 9160ad5fe..4f64f64fd 100644 --- a/web/javascript/formatter.js +++ b/web/javascript/formatter.js @@ -210,6 +210,9 @@ Transmission.fmt = (function() timestamp: function( seconds ) { + if( !seconds ) + return 'N/A'; + var myDate = new Date(seconds*1000); var now = new Date(); -- 2.40.0