Changeset 4054


Ignore:
Timestamp:
Dec 3, 2007, 7:59:11 PM (14 years ago)
Author:
livings124
Message:

patch from BiHi? to always display the second value of remaining times with double digits; rephrase "Resume Selected Without Wait" to "Resume Selected Right Away"

Location:
trunk/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r4030 r4054  
    1111        <key>IBOpenObjects</key>
    1212        <array>
    13                 <integer>1480</integer>
    14                 <integer>21</integer>
     13                <integer>1808</integer>
    1514        </array>
    1615        <key>IBSystem Version</key>
  • trunk/macosx/Torrent.m

    r3975 r4054  
    750750        return [NSString stringWithFormat: NSLocalizedString(@"%d sec", "Torrent -> remaining time"), eta];
    751751    else if (eta < 3600) //60 * 60
    752         return [NSString stringWithFormat: NSLocalizedString(@"%d min %d sec", "Torrent -> remaining time"),
     752        return [NSString stringWithFormat: NSLocalizedString(@"%d min %02d sec", "Torrent -> remaining time"),
    753753                                                eta / 60, eta % 60];
    754754    else if (eta < 86400) //24 * 60 * 60
    755         return [NSString stringWithFormat: NSLocalizedString(@"%d hr %d min", "Torrent -> remaining time"),
     755        return [NSString stringWithFormat: NSLocalizedString(@"%d hr %02d min", "Torrent -> remaining time"),
    756756                                                eta / 3600, (eta / 60) % 60];
    757757    else
     
    759759        int days = eta / 86400, hours = (eta / 3600) % 24;
    760760        if (days > 1)
    761             return [NSString stringWithFormat: NSLocalizedString(@"%d days %d hr", "Torrent -> remaining time"), days, hours];
     761            return [NSString stringWithFormat: NSLocalizedString(@"%d days %02d hr", "Torrent -> remaining time"), days, hours];
    762762        else
    763             return [NSString stringWithFormat: NSLocalizedString(@"1 day %d hr", "Torrent -> remaining time"), hours];
     763            return [NSString stringWithFormat: NSLocalizedString(@"1 day %02d hr", "Torrent -> remaining time"), hours];
    764764    }
    765765}
Note: See TracChangeset for help on using the changeset viewer.