Skip to content
Snippets Groups Projects
Commit e04fea68 authored by Tormod Mork Müller's avatar Tormod Mork Müller :computer:
Browse files

Changed English words with Norwegian. If there is time, try to add support for LocalizedStringKey

parent b07e2332
No related branches found
No related tags found
1 merge request!110Made changes for the Mobile application
Show whitespace changes
Inline Side-by-side
Showing
with 67 additions and 68 deletions
stillasMobileApplication/stillasMobileApplication/Views/NavigationBarBottom.swift
+ 3
− 3
View file @ e04fea68
......@@ -23,19 +23,19 @@ struct NavigationBarBottom: View {
TabView(selection: $selection) {
ProjectListView()
.tabItem {
Label("Project", systemImage: "square.grid.2x2")
Label("Prosjekt", systemImage: "square.grid.2x2")
}
.tag(Tab.project)
MapView()
.tabItem {
Label("Map", systemImage: "map")
Label("Kart", systemImage: "map")
}
.tag(Tab.map)
ProfileView()
.tabItem {
Label("Profile", systemImage: "person.crop.circle")
Label("Profil", systemImage: "person.crop.circle")
}
.tag(Tab.profile)
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProfileView/ProfileView.swift
+ 3
− 3
View file @ e04fea68
......@@ -56,7 +56,7 @@ struct ProfileDetails: View {
Text("MBStillas")
//.font(.subheadline)
Spacer()
Text("Role: \(user.role)")
Text("Rolle: \(user.role)")
//.font(.subheadline)
}
//.font(.subheadline)
......@@ -65,7 +65,7 @@ struct ProfileDetails: View {
Divider()
VStack {
Text("Date of birth")
Text("Fødselsdato")
.font(.title2)
Text("\(user.dateOfBirth)")
.foregroundColor(.secondary)
......@@ -78,7 +78,7 @@ struct ProfileDetails: View {
Button (action: {
viewModel.signOut()
}) {
Text("Sign out")
Text("Logg av")
.frame(width: 150, height: 50, alignment: .center)
}
.foregroundColor(.white)
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/FilterData/SizeFilter/FilterProjectSize.swift
+ 4
− 4
View file @ e04fea68
......@@ -22,7 +22,7 @@ struct FilterProjectSize: View {
@Binding var selection: String
//@State var swipeHorizontalDirection: SwipeHorizontalDirection = .none { didSet { print(swipeHorizontalDirection) } }
let sizeSelections = ["Less Than", "Between", "Greater Than"]
let sizeSelections = ["Mindre enn", "Mellom", "Større enn"]
var body: some View {
......@@ -39,7 +39,7 @@ struct FilterProjectSize: View {
Spacer()
switch selection {
case "Less Than":
case "Mindre enn":
SizeLessThanFilter(sizeFilterActive: $sizeFilterActive, scoreFrom: scoreFrom, scoreFromBind: $scoreFromBind)
.onChange(of: scoreFrom) { val in
scoreFromBind = val
......@@ -54,7 +54,7 @@ struct FilterProjectSize: View {
selection = "Between"
}
}).transition(.asymmetric(insertion: .scale, removal: .opacity))*/
case "Between":
case "Mellom":
SizeBetweenFilter(sizeFilterActive: $sizeFilterActive, scoreFrom: scoreFrom, scoreFromBind: $scoreFromBind, scoreTo: scoreTo, scoreToBind: $scoreToBind)
.onChange(of: scoreTo) { val in
scoreToBind = val
......@@ -64,7 +64,7 @@ struct FilterProjectSize: View {
scoreFromBind = val
sizeFilterActive = true
}
case "Greater Than":
case "Større enn":
SizeGreaterThanFilter(sizeFilterActive: $sizeFilterActive, scoreTo: scoreTo, scoreToBind: $scoreToBind)
.onChange(of: scoreFrom) { val in
scoreFromBind = val
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/HistoryOfScaffolding.swift
+ 13
− 13
View file @ e04fea68
......@@ -33,13 +33,13 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -61,13 +61,13 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -89,13 +89,13 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -125,14 +125,14 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
.font(.system(size: 15))
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -155,14 +155,14 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
.font(.system(size: 15))
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -185,14 +185,14 @@ struct HistoryOfScaffolding: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected))
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
.font(.system(size: 15))
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -206,7 +206,7 @@ struct HistoryOfScaffolding: View {
}
}
}
.navigationTitle(Text("History of \(scaffolding.type)".capitalizingFirstLetter()))
.navigationTitle(Text("Historie for \(scaffolding.type)".capitalizingFirstLetter()))
}
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/ProjectInfoDetailedView.swift
+ 11
− 12
View file @ e04fea68
......@@ -46,15 +46,14 @@ struct ProjectInfoDetailedView: View {
@Environment(\.colorScheme) var colorScheme
//let projectInfoTitle = "Project Information"
let duration = "DURATION"
let customer = "CUSTOMER"
let amountScaff = "AMOUNT"
let scaffoldingSize = "SIZE"
let duration = "VARIGHET"
let customer = "KUNDE"
let amountScaff = "MENGDE"
let scaffoldingSize = "STØRRELSE"
let state = "STATUS"
let address = "ADDRESS"
let contactPerson = "CONTACT PERSON"
let phoneNumber = "PHONE NUMBER"
let address = "ADRESSE"
let contactPerson = "KONTAKT PERSON"
let phoneNumber = "MOBILNUMMER"
let email = "EMAIL"
var body: some View {
......@@ -72,11 +71,11 @@ struct ProjectInfoDetailedView: View {
.frame(width: 30, height: 30)
.foregroundColor(.blue)
Text("Project info")
Text("Prosjekt info")
.font(Font.system(size: 20).bold())
.padding(.bottom, 2)
Text("Below you find the project info for this project.")
Text("Nedenfor finner du informasjon om dette prosjektet.")
.font(.caption)
.foregroundColor(Color.gray)
.padding(.bottom, 5)
......@@ -143,11 +142,11 @@ struct ProjectInfoDetailedView: View {
.frame(width: 30, height: 30)
.foregroundColor(.blue)
Text("Contact info")
Text("Kontakt info")
.font(Font.system(size: 20).bold())
.padding(.bottom, 2)
Text("Below you find the contact info for this project.")
Text("Nedenfor finner du kontaktinformasjonen til kunden.")
.font(.caption)
.foregroundColor(Color.gray)
.padding(.bottom, 5)
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/ProjectInfoView.swift
+ 4
− 4
View file @ e04fea68
......@@ -15,8 +15,8 @@ struct ProjectInfoView: View {
var projects: [Project]
var project: Project
let sizeSelections = ["Scaffolding", "Project Info"]
@State var selection: String = "Project Info"
let sizeSelections = ["Stillas", "Prosjekt Info"]
@State var selection: String = "Prosjekt Info"
var body: some View {
ScrollView {
......@@ -41,12 +41,12 @@ struct ProjectInfoView: View {
Spacer()
switch selection {
case "Project Info":
case "Prosjekt Info":
VStack {
//ProjectInfoDetailedView(project: project)
ProjectInfoDetailedView(project: project)
}
case "Scaffolding":
case "Stillas":
VStack {
ScaffoldingView(projects: projects, scaffolding: project.scaffolding!)
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/ScaffoldingItem.swift
+ 2
− 2
View file @ e04fea68
......@@ -24,7 +24,7 @@ struct ScaffoldingItem: View {
VStack {
Text(String(format: "%d", scaffolding.quantity.expected)).foregroundColor(.black)
.font(.system(size: 15))
Text("EXPECTED")
Text("FORVENTET")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......@@ -32,7 +32,7 @@ struct ScaffoldingItem: View {
VStack {
amountOfScaffoldingRegistered(expected: scaffolding.quantity.expected, registered: scaffolding.quantity.registered)
Text("REGISTERED")
Text("REGISTRERT")
.foregroundColor(.gray)
.font(.system(size: 10))
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/TransfereScaffolding.swift
+ 1
− 1
View file @ e04fea68
......@@ -24,7 +24,7 @@ struct TransfereScaffolding: View {
var body: some View {
VStack {
TransfereScaffoldingView(isShowingSheet: $isShowingSheet, projects: projects, scaffolding: scaffolding)
.navigationTitle(Text("Transfere \(scaffolding.type)"))
.navigationTitle(Text("Overfør \(scaffolding.type)"))
}
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/TransfereScaffoldingButton.swift
+ 1
− 1
View file @ e04fea68
......@@ -17,7 +17,7 @@ struct TransfereScaffoldingButton: View {
Button {
isShowingSheet.toggle()
} label: {
Text("Transfere Scaffolding")
Text("Overfør Stillas")
.padding(12)
.font(.system(size: 20))
.foregroundColor(colorScheme == .dark ? Color(UIColor.white) : Color(UIColor.white))
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectDetailView/TransfereScaffoldingView.swift
+ 18
− 18
View file @ e04fea68
......@@ -55,9 +55,9 @@ struct TransfereScaffoldingView: View {
var body: some View {
NavigationView {
Form {
Section(header: Text("From project")) {
Picker(selection: $pickerSelectionFrom, label: Text("From project")) {
SearchBar(text: $searchTerm, placeholder: "Search project")
Section(header: Text("Fra prosjekt")) {
Picker(selection: $pickerSelectionFrom, label: Text("Fra prosjekt")) {
SearchBar(text: $searchTerm, placeholder: "Søk etter prosjekt")
.onAppear {
searchTerm = ""
anumber.removeAll()
......@@ -78,9 +78,9 @@ struct TransfereScaffoldingView: View {
}
}
Section(header: Text("To project")) {
Picker(selection: $pickerSelectionTo, label: Text("To project")) {
SearchBar(text: $searchTerm, placeholder: "Search project")
Section(header: Text("Til prosjekt")) {
Picker(selection: $pickerSelectionTo, label: Text("Til prosjekt")) {
SearchBar(text: $searchTerm, placeholder: "Søk etter prosjekt")
.onAppear {
searchTerm = ""
}
......@@ -94,9 +94,9 @@ struct TransfereScaffoldingView: View {
}
}
Section (header: Text("Number of \(scaffolding.type)")){
Section (header: Text("Antall \(scaffolding.type)")){
VStack(alignment: .leading) {
Text("Predefined quantity")
Text("Forhåndsdefinert mengde")
Picker("Pick a number", selection: $anumber) {
ForEach(commonNumbers, id: \.self) { aNumber in
Image(systemName: "\(aNumber).circle.fill")
......@@ -107,8 +107,8 @@ struct TransfereScaffoldingView: View {
.padding()
HStack {
Text("Manual entry")
TextField("Input number", text: $anumber)
Text("Manuell innfylling")
TextField("Input", text: $anumber)
.disabled(pickerSelectionFromNotPicked)
//.modifier(ClearButton(text: $anumber))
.onChange(of: anumber) {
......@@ -147,7 +147,7 @@ struct TransfereScaffoldingView: View {
Button(action: {
Task {
if !empty {
transfereMessage = "Transfere \(Int(anumber)!)x \(scaffolding.type) from \(pickerSelectionFrom) to \(pickerSelectionTo)?"
transfereMessage = "Overfør \(Int(anumber)!)x \(scaffolding.type) fra \(pickerSelectionFrom) til \(pickerSelectionTo)?"
transfereConfirmation = true
}
}
......@@ -162,7 +162,7 @@ struct TransfereScaffoldingView: View {
.padding(.bottom, 50)
}
.ignoresSafeArea(.keyboard)
.navigationTitle(Text("Transfere \(scaffolding.type)"))
.navigationTitle(Text("Overfør \(scaffolding.type)"))
.alert(isPresented: $showingConfirmation) {
Alert(
title: Text(confirmationTitle),
......@@ -176,9 +176,9 @@ struct TransfereScaffoldingView: View {
}
.alert(isPresented: $transfereConfirmation) {
Alert(
title: Text("Are you sure you want to proceed?"),
title: Text("Er du sikker på at du vil fortsette?"),
message: Text(transfereMessage),
primaryButton: .default(Text("Yes")) {
primaryButton: .default(Text("Ja")) {
transfereConfirmation = false
Task {
if !empty {
......@@ -232,11 +232,11 @@ struct TransfereScaffoldingView: View {
if let response = response as? HTTPURLResponse {
if response.statusCode == 200 {
confirmationTitle = "Success!"
confirmationMessage = "Successfully transfered \(body.scaffold[0].quantity)x \(body.scaffold[0].type) from project \(body.fromProjectID) to project \(body.toProjectID)!"
confirmationTitle = "Suksess!"
confirmationMessage = "Overføringen av \(body.scaffold[0].quantity)x \(body.scaffold[0].type) fra prosjekt \(body.fromProjectID) til prosjekt \(body.toProjectID) var en suksess!"
} else {
confirmationTitle = "Failed!"
confirmationMessage = "Failed to transfere \(body.scaffold[0].quantity)x \(body.scaffold[0].type) from project \(body.fromProjectID) to project \(body.toProjectID)!"
confirmationTitle = "Mislykket!"
confirmationMessage = "Overføringen av \(body.scaffold[0].quantity)x \(body.scaffold[0].type) fra prosjekt \(body.fromProjectID) til prosjekt \(body.toProjectID) feilet!"
}
showingConfirmation = true
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectListView.swift
+ 7
− 7
View file @ e04fea68
......@@ -79,7 +79,7 @@ struct ProjectListView: View {
@State private var showFilterModalView: Bool = false
@State private var showAddProjectModalView: Bool = false
@State var sizeSortType: String = "Between"
@State var sizeSortType: String = "Mellom"
@State var filter: FilterType = .none
@State var filterArr: [String] = []
@State var filterArrArea: [String] = []
......@@ -97,7 +97,7 @@ struct ProjectListView: View {
VStack {
NavigationView {
Form {
Section(header: Text("All Projects")) {
Section(header: Text("Alle Prosjekter")) {
/*List(searchResults, id: \.projectID) { project in
NavigationLink(destination: ProjectDetailView(project: project), label: {
ProjectRow(project: project) }
......@@ -109,7 +109,7 @@ struct ProjectListView: View {
ProjectRow(project: project) }
)
}
.navigationTitle("Projects")
.navigationTitle("Prosjekter")
//.listStyle(.grouped)
}
}
......@@ -129,7 +129,7 @@ struct ProjectListView: View {
print("Add project tapped!")
self.showAddProjectModalView.toggle()
}) {
Label("Add", systemImage: "plus.circle")
Label("Legg til", systemImage: "plus.circle")
}
}
}
......@@ -149,11 +149,11 @@ struct ProjectListView: View {
if filterArr.contains("area") {
filter = .county
}
if filterArr.contains("size") && sizeSortType == "Between" {
if filterArr.contains("size") && sizeSortType == "Mellom" {
filter = .sizeBetween
} else if filterArr.contains("size") && sizeSortType == "Less Than" {
} else if filterArr.contains("size") && sizeSortType == "Mindre enn" {
filter = .sizeLessThan
} else if filterArr.contains("size") && sizeSortType == "Greater Than" {
} else if filterArr.contains("size") && sizeSortType == "Større enn" {
filter = .sizeGreaterThan
}
if filterArr.contains("status") {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment