diff --git a/ikwambe-foundation-ios/Localizable.strings b/ikwambe-foundation-ios/Localizable.strings index bede316..2acb2b2 100644 --- a/ikwambe-foundation-ios/Localizable.strings +++ b/ikwambe-foundation-ios/Localizable.strings @@ -6,11 +6,13 @@ */ +"water-pump" = "Water pump"; + "help-to-build" = "Help to build a water pump"; "by-making-a-donation" = "By making a donation to the foundation, you can help us with building a water pump."; -"at-this-moment" = "At this moment, drinking water isn't available in the village of ikwambe"; +"at-this-moment" = "At this moment, drinking water isn't available in the village of Ikwambe"; "stories-from-ikwambe" = "Stories from Ikwambe"; @@ -34,7 +36,7 @@ "welcome-back" = "Welcome back!"; -"do-i-need-account" = "Do i need an account?"; +"do-i-need-account" = "Do I need an account?"; "account-explanation" = "An account is fully optional. \nWith an account you can keep track of your donations."; @@ -52,11 +54,13 @@ "logout" = "Logout"; +"loading-donations" = "Loading donations"; + "build-a-water-pump" = "Build a water pump"; "overview" = "Overview"; -"project-overview" = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie nunc scelerisque, suscipit metus feugiat, interdum augue. Nam dolor mauris, euismod sed lectus ut, hendrerit rutrum libero. Vestibulum facilisis quam rhoncus pharetra mattis. Nulla facilisi. Curabitur ex ligula, ornare vel ex sed, fringilla iaculis mauris."; +"project-overview" = "It is the first step towards the big challenges. Ikwambe is a small village in Tanzania. There is no water source at all, no dispenser, no electricity. But people live there and must survive every day."; "milestones" = "Milestones"; @@ -96,6 +100,8 @@ "by-donating" = "By donating, you will help to bring clean water to Ikwambe. Please select an amount below:"; +"other" = "Other"; + "loading-payment" = "Loading payment, please wait"; "who-we-are" = "Who we are"; @@ -110,7 +116,7 @@ "stories-from-ikwambe" = "Stories from Ikwambe"; -"stories-from-ikwambe-text" = "Be surprised by the most unique, moving or telling stories of the Ikwambe foundation.\nRead their stories here."; +"stories-from-ikwambe-text" = "Be surprised by the most unique, moving or telling stories of the Ikwambe Foundation.\nRead their stories here."; "loading-stories" = "Loading stories"; @@ -128,7 +134,7 @@ Furthermore there is limited access to clean water all year long. Few people can boil (dirty) water for drinking. The rest use it only for other domestic purposes. -The other option is to walk 3 to 5 km (to and fro) to the neighboring village of Sululu, where there is a pumping well. +The other option is to walk 3 to 5 km (to and from) to the neighboring village of Sululu, where there is a pumping well. However, the villagers are limited by the amount of water they can carry. diff --git a/ikwambe-foundation-ios/views/donation/DonationView.swift b/ikwambe-foundation-ios/views/donation/DonationView.swift index eebd9c4..b8b0290 100644 --- a/ikwambe-foundation-ios/views/donation/DonationView.swift +++ b/ikwambe-foundation-ios/views/donation/DonationView.swift @@ -69,7 +69,7 @@ struct DonationView: View { }.buttonStyle(DonationAmountButton()) .disabled(!buttonsEnabled) - Button("Other") { + Button(NSLocalizedString("other", comment: "")) { amount = 0.00 customAmountEnabled = true }.buttonStyle(DonationAmountButton()) diff --git a/ikwambe-foundation-ios/views/projects/DonationsOverview.swift b/ikwambe-foundation-ios/views/projects/DonationsOverview.swift deleted file mode 100644 index 32eefda..0000000 --- a/ikwambe-foundation-ios/views/projects/DonationsOverview.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// DonationsOverview.swift -// ikwambe-foundation-ios -// -// Created by Luuk Kenselaar on 09/01/2022. -// - -import SwiftUI - -struct DonationsOverview: View { - struct Message: Identifiable { - var id: String { messageID } - let messageID: String - let author: String - let amount: Double - let datetime: String - let message: String - } - - @State var donationMessages: [Message] = [Message.init(messageID: "0", author: "John Doe", amount: 14.95, datetime: "23/11/2021, 15:10", message: "Goodluck with the project"), Message.init(messageID: "1", author: "Jane Roe", amount: 149.95, datetime: "28/11/2021, 10:00", message: "All the best")] - - var body: some View { - ScrollView { - ForEach(donationMessages) { donationMessage in - VStack { - HStack { - VStack { - Text(donationMessage.author) - - Text(donationMessage.datetime) - - Text(donationMessage.message) - } - - Spacer() - - VStack { - Text("\(donationMessage.amount)") - } - } - - }.padding(.bottom) - } - }.navigationTitle(NSLocalizedString("donations", comment: "")) - .padding(.horizontal, 15) - .padding(.top, 15) - } -} - -struct DonationsOverview_Previews: PreviewProvider { - static var previews: some View { - DonationsOverview() - } -} diff --git a/ikwambe-foundation-ios/views/user/ProfileView.swift b/ikwambe-foundation-ios/views/user/ProfileView.swift index 1116347..c1705d0 100644 --- a/ikwambe-foundation-ios/views/user/ProfileView.swift +++ b/ikwambe-foundation-ios/views/user/ProfileView.swift @@ -49,7 +49,7 @@ struct ProfileView: View { if (donations.isEmpty == false) { ForEach(donations) { donation in VStack(alignment: .center) { - Text("Waterpump") + Text(NSLocalizedString("water-pump", comment: "")) .font(Font.headline.weight(.bold)) Text("€\(donation.amount, specifier: "%.2f") on \(String(donation.donationDate.prefix(10)))") @@ -62,7 +62,7 @@ struct ProfileView: View { }.multilineTextAlignment(.center) } } else { - ProgressView("Loading donations") + ProgressView(NSLocalizedString("loading-donations", comment: "")) .onAppear { getDonations() }