From 1b8b9ed7ee10fb9c2d7a35a2d08f9b6edf834132 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Fri, 8 Feb 2019 04:14:10 +0530 Subject: iOS: Use shorter pretty time Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/TunnelViewModel.swift | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'WireGuard/WireGuard/UI') diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift index 39d55be..5de6cab 100644 --- a/WireGuard/WireGuard/UI/TunnelViewModel.swift +++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift @@ -681,6 +681,24 @@ private func prettyTime(secondsLeft: Int64) -> String { left = left % (60 * 60) let minutes = 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 { 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)) } return timeStrings.joined(separator: ", ") + #endif } -- cgit v1.2.3-59-g8ed1b