From 19b98ea3e15c5843660bb5ebfae11dc751bc5075 Mon Sep 17 00:00:00 2001
From: Chris Offner <chrisoffner@pm.me>
Date: Sun, 21 Mar 2021 20:18:34 +0100
Subject: [PATCH] Localized "Sort by", "Name", and "Last Contacted" strings in
RecipientListView. Temporary fix in AddressRecord to keep app from crashing
when sorting by recency. Corrected Localizable.strings so both language
files' lines match.
---
enzevalos_iphone/SwiftUI/Compose/RecipientListView.swift | 6 +++---
enzevalos_iphone/de.lproj/Localizable.strings | 8 +++++---
enzevalos_iphone/en.lproj/Localizable.strings | 3 +++
enzevalos_iphone/persistentData/AddressRecord.swift | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/enzevalos_iphone/SwiftUI/Compose/RecipientListView.swift b/enzevalos_iphone/SwiftUI/Compose/RecipientListView.swift
index db3c21a6..09897319 100644
--- a/enzevalos_iphone/SwiftUI/Compose/RecipientListView.swift
+++ b/enzevalos_iphone/SwiftUI/Compose/RecipientListView.swift
@@ -25,15 +25,15 @@ struct RecipientListView: View {
VStack(alignment: .leading) {
// Sorting options
HStack {
- Text("Sort by:")
+ Text("SortBy")
.foregroundColor(.secondary)
- Button(sortByName ? "Name" : "Last Contacted") {
+ Button(sortByName ? "Name" : "LastContacted") {
sortByName.toggle()
}
}
.font(.caption)
.transition(.opacity)
- .id(sortByName ? "Name" : "Last Contacted")
+ .id(sortByName ? "Name" : "LastContacted")
// Contact list
ScrollView {
diff --git a/enzevalos_iphone/de.lproj/Localizable.strings b/enzevalos_iphone/de.lproj/Localizable.strings
index 9645bd31..09632edf 100644
--- a/enzevalos_iphone/de.lproj/Localizable.strings
+++ b/enzevalos_iphone/de.lproj/Localizable.strings
@@ -6,10 +6,9 @@
Copyright © 2016 fu-berlin. All rights reserved.
*/
"Permission.contactDenied.Title" = "Oops! Zugriff erlauben!";
-"Permission.contactDenied.Description" = "Bitte erlaube zugriff auf Kontakte In Einstellungen -> Datenschutz -> Kontakte";
+"Permission.contactDenied.Description" = "Bitte erlaube Zugriff auf Kontakte in Einstellungen -> Datenschutz -> Kontakte";
"Permission.Notification.Title" = "Mitteilungen erlauben";
-"Permission.Notification.Description" = "Letterbox möchte dich benachrichtigen.
-Du kannst das jederzeit ändern. In der Einstellungen -> Mitteilungen -> Letterbox";
+"Permission.Notification.Description" = "Letterbox möchte dich benachrichtigen. Du kannst das jederzeit ändern in Einstellungen -> Mitteilungen -> Letterbox";
"Permission.AccessContacts.Title" = "Zugriff auf Kontakte";
"Permission.AccessContacts.Description" = "Wir teilen diese Daten mit niemandem und senden sie auch nicht über das Internet.";
"AccessNotGranted" = "Bitte schalte unter Einstellungen den Zugriff auf die Kontakte frei, wenn du möchtest, dass die App richtig funktioniert";
@@ -23,6 +22,9 @@ Du kannst das jederzeit ändern. In der Einstellungen -> Mitteilungen -> Letterb
"Bcc" = "Bcc";
"Cancel" = "Abbrechen";
"Cc" = "Cc";
+"Name" = "Name";
+"SortBy" = "Sortiere nach";
+"LastContacted" = "zuletzt kontaktiert";
"Compose.Suggestions" = "Empfehlungen";
"Checkmarks" = "Du hast Nachrichten von den Adressen mit Haken bekommen";
"Close" = "Schließen";
diff --git a/enzevalos_iphone/en.lproj/Localizable.strings b/enzevalos_iphone/en.lproj/Localizable.strings
index bad3e4d9..a103f0e2 100644
--- a/enzevalos_iphone/en.lproj/Localizable.strings
+++ b/enzevalos_iphone/en.lproj/Localizable.strings
@@ -22,6 +22,9 @@
"Bcc" = "Bcc";
"Cancel" = "Cancel";
"Cc" = "Cc";
+"SortBy" = "Sort by";
+"Name" = "Name";
+"LastContacted" = "Last Contacted";
"Compose.Suggestions" = "Suggestions";
"Checkmarks" = "You received mails from addresses with checkmarks"; // ????
"Close" = "Close";
diff --git a/enzevalos_iphone/persistentData/AddressRecord.swift b/enzevalos_iphone/persistentData/AddressRecord.swift
index a43ac022..20828173 100644
--- a/enzevalos_iphone/persistentData/AddressRecord.swift
+++ b/enzevalos_iphone/persistentData/AddressRecord.swift
@@ -16,7 +16,7 @@ extension AddressRecord {
/// Enum defining which key to to sort contacts by (name, recency).
enum SortBy: String {
case name = "displayname"
- case recency = "last" // still unavailable
+ case recency = "email" // TODO: change to "last" once that data is implemented
}
private static var sorting: [NSSortDescriptor] {
--
GitLab