meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.6.2'

Browse source 
#Conflicts:
#	Localizable.xcstrings
This commit is contained in:
Garth Vander Houwen 2025-05-08 14:53:04 -07:00
commit febe290ca8
28 changed files with 3153 additions and 4050 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Meshtastic/Extensions/Date.swift
View file

@ -30,11 +30,11 @@ extension Date {
let hour = Calendar.current.component(.hour, from: self)
switch hour {
case 6..<12: return "relativetimeofday.morning".localized
case 12: return "relativetimeofday.midday".localized
case 13..<17: return "relativetimeofday.afternoon".localized
case 17..<22: return "relativetimeofday.evening".localized
default: return "relativetimeofday.nighttime".localized
case 6..<12: return "Morning".localized
case 12: return "Midday".localized
case 13..<17: return "Afternoon".localized
case 17..<22: return "Evening".localized
default: return "Nighttime".localized
}
}
}