mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Even better (and unified) torrent origin logic for GTK+, Qt and web clients

This commit is contained in:
Mike Gelfand 2015-04-22 21:04:49 +00:00
parent ea368388ed
commit 06d73853b9
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/details.c
View File

@ -690,15 +690,22 @@ refreshInfo (struct DetailsImpl * di, tr_torrent ** torrents, int n)
mixed_date |= (date != infos[i]->dateCreated);
}
if (mixed_date && mixed_creator)
const gboolean empty_creator = !*creator;
const gboolean empty_date = date == 0;
if (mixed_date || mixed_creator)
{
str = mixed;
}
else if (empty_date && empty_creator)
{
str = _("N/A");
}
else
{
if (mixed_date)
if (empty_date && !empty_creator)
g_snprintf (buf, sizeof (buf), _("Created by %1$s"), creator);
else if (mixed_creator || !*creator)
else if (empty_creator && !empty_date)
g_snprintf (buf, sizeof (buf), _("Created on %1$s"), datestr);
else
g_snprintf (buf, sizeof (buf), _("Created by %1$s on %2$s"), creator, datestr);

15
qt/details.cc
View File

@ -748,14 +748,17 @@ Details::refresh ()
mixed_date |= (date != t->dateCreated ().toString ());
}
if (mixed_creator && mixed_date)
const bool empty_creator = creator.isEmpty ();
const bool empty_date = date.isEmpty ();
if (mixed_creator || mixed_date)
string = mixed;
else if (mixed_date && !creator.isEmpty ())
string = tr ("Created by %1").arg (creator);
else if (mixed_creator && !date.isEmpty ())
string = tr ("Created on %1").arg (date);
else if (creator.isEmpty () && date.isEmpty ())
else if (empty_creator && empty_date)
string = tr ("N/A");
else if (empty_date && !empty_creator)
string = tr ("Created by %1").arg (creator);
else if (empty_creator && !empty_date)
string = tr ("Created on %1").arg (date);
else
string = tr ("Created by %1 on %2").arg (creator).arg (date);
}

6
web/javascript/inspector.js
View File

@ -424,13 +424,13 @@ function Inspector(controller) {
}
var empty_creator = !creator || !creator.length,
empty_date = !date;
if(mixed_creator && mixed_date)
if(mixed_creator || mixed_date)
str = mixed;
else if(empty_creator && empty_date)
str = unknown;
else if((mixed_date || empty_date) && !empty_creator)
else if(empty_date && !empty_creator)
str = 'Created by ' + creator;
else if((mixed_creator || empty_creator) && !empty_date)
else if(empty_creator && !empty_date)
str = 'Created on ' + (new Date(date*1000)).toDateString();
else
str = 'Created by ' + creator + ' on ' + (new Date(date*1000)).toDateString();