iOS: Use shorter pretty time
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
@@ -108,6 +108,9 @@
|
|||||||
"tunnelHandshakeTimestampSecond (%d)" = "%d second";
|
"tunnelHandshakeTimestampSecond (%d)" = "%d second";
|
||||||
"tunnelHandshakeTimestampSeconds (%d)" = "%d seconds";
|
"tunnelHandshakeTimestampSeconds (%d)" = "%d seconds";
|
||||||
|
|
||||||
|
"tunnelHandshakeTimestampHours hh:mm:ss (%@)" = "%@ hours";
|
||||||
|
"tunnelHandshakeTimestampMinutes mm:ss (%@)" = "%@ minutes";
|
||||||
|
|
||||||
// Error alerts while creating / editing a tunnel configuration
|
// Error alerts while creating / editing a tunnel configuration
|
||||||
|
|
||||||
/* Alert title for error in the interface data */
|
/* Alert title for error in the interface data */
|
||||||
|
|||||||
@@ -681,6 +681,24 @@ private func prettyTime(secondsLeft: Int64) -> String {
|
|||||||
left = left % (60 * 60)
|
left = left % (60 * 60)
|
||||||
let minutes = left / 60
|
let minutes = left / 60
|
||||||
let seconds = left % 60
|
let seconds = left % 60
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
if years > 0 {
|
||||||
|
return years == 1 ? tr(format: "tunnelHandshakeTimestampYear (%d)", years) : tr(format: "tunnelHandshakeTimestampYears (%d)", years)
|
||||||
|
}
|
||||||
|
if days > 0 {
|
||||||
|
return days == 1 ? tr(format: "tunnelHandshakeTimestampDay (%d)", days) : tr(format: "tunnelHandshakeTimestampDays (%d)", days)
|
||||||
|
}
|
||||||
|
if hours > 0 {
|
||||||
|
let hhmmss = String(format: "%02d:%02d:%02d", hours, minutes, seconds)
|
||||||
|
return tr(format: "tunnelHandshakeTimestampHours hh:mm:ss (%@)", hhmmss)
|
||||||
|
}
|
||||||
|
if minutes > 0 {
|
||||||
|
let mmss = String(format: "%02d:%02d", minutes, seconds)
|
||||||
|
return tr(format: "tunnelHandshakeTimestampMinutes mm:ss (%@)", mmss)
|
||||||
|
}
|
||||||
|
return seconds == 1 ? tr(format: "tunnelHandshakeTimestampSecond (%d)", seconds) : tr(format: "tunnelHandshakeTimestampSeconds (%d)", seconds)
|
||||||
|
#elseif os(macOS)
|
||||||
if years > 0 {
|
if years > 0 {
|
||||||
timeStrings.append(years == 1 ? tr(format: "tunnelHandshakeTimestampYear (%d)", years) : tr(format: "tunnelHandshakeTimestampYears (%d)", years))
|
timeStrings.append(years == 1 ? tr(format: "tunnelHandshakeTimestampYear (%d)", years) : tr(format: "tunnelHandshakeTimestampYears (%d)", years))
|
||||||
}
|
}
|
||||||
@@ -697,4 +715,5 @@ private func prettyTime(secondsLeft: Int64) -> String {
|
|||||||
timeStrings.append(seconds == 1 ? tr(format: "tunnelHandshakeTimestampSecond (%d)", seconds) : tr(format: "tunnelHandshakeTimestampSeconds (%d)", seconds))
|
timeStrings.append(seconds == 1 ? tr(format: "tunnelHandshakeTimestampSecond (%d)", seconds) : tr(format: "tunnelHandshakeTimestampSeconds (%d)", seconds))
|
||||||
}
|
}
|
||||||
return timeStrings.joined(separator: ", ")
|
return timeStrings.joined(separator: ", ")
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user