diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-08 13:48:06 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-08 13:48:06 +0100 |
| commit | 38e00525e62cb2e995bfe310aabf03762b1fdf7a (patch) | |
| tree | 4cca167083fbe914931f53b308a3f69bac0ec855 | |
| parent | 73fc19d055b20178e5efae08013fe24663f6d89c (diff) | |
* apt-pkg/contrib/strutl.cc:
- fix TimeToStr i18n (LP: #289807)
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 14 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 98d9c41e4..327381d03 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -331,23 +331,27 @@ string TimeToStr(unsigned long Sec) { if (Sec > 60*60*24) { - sprintf(S,"%lid %lih%limin%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); + //d means days, h means hours, min means minutes, s means seconds + sprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60*60) { - sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60); + //h means hours, min means minutes, s means seconds + sprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60) { - sprintf(S,"%limin%lis",Sec/60,Sec % 60); + //min means minutes, s means seconds + sprintf(S,_("%limin %lis"),Sec/60,Sec % 60); break; } - - sprintf(S,"%lis",Sec); + + //s means seconds + sprintf(S,_("%lis"),Sec); break; } diff --git a/debian/changelog b/debian/changelog index 7600db699..fea9133ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.7.21) UNRELEASED; urgency=low and show a message (LP: #202219) * apt-pkg/deb/debsystem.cc: - make strings i18n able + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) [ Dereck Wonnacott ] * apt-ftparchive might write corrupt Release files (LP: #46439) |