Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Localize sources to German #107

Merged
merged 10 commits into from
May 11, 2020
Merged

Localize sources to German #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6de5670
Changes due to code review
TheVaan May 8, 2020
b7fca46
Merge pull request #1 from Dimillian/master
TheVaan May 8, 2020
4c5dfd2
Merge pull request #3 from Dimillian/master
TheVaan May 9, 2020
8a8906d
Merge branch 'master' of https://github.com/Dimillian/ACHNBrowserUI
TheVaan May 10, 2020
53c8ef2
Merge pull request #4 from Dimillian/master
TheVaan May 10, 2020
311a957
Merge pull request #5 from Dimillian/master
TheVaan May 11, 2020
c4d9cbc
translated source of fish and bugs to German
TheVaan May 11, 2020
fff36ad
even more translation (German)
TheVaan May 11, 2020
452a2be
removed english stuff to match master
TheVaan May 11, 2020
73e5b80
updated english localization to upstream master
TheVaan May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
303 changes: 301 additions & 2 deletions ACHNBrowserUI/ACHNBrowserUI/de.lproj/Localizable.strings
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ACHNBrowserUI/ACHNBrowserUI/en.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/models/Item.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public extension Item {
return nil
}
if startTime == 0 && endTime == 0 {
return "All day"
return NSLocalizedString("All day", comment: "")
}
return "\(startTime) - \(endTime)h"
}
Expand Down
2 changes: 1 addition & 1 deletion ACHNBrowserUI/ACHNBrowserUI/views/items/ItemRowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct ItemRowView: View {
Group {
Text(item.localizedName.capitalized)
.style(appStyle: .rowTitle)
Text(item.obtainedFrom ?? item.obtainedFromNew?.first ?? "unknown source")
Text(LocalizedStringKey(item.obtainedFrom ?? item.obtainedFromNew?.first ?? "unknown source"))
.font(.subheadline)
.fontWeight(.semibold)
.foregroundColor(.acSecondaryText)
Expand Down
10 changes: 5 additions & 5 deletions ACHNBrowserUI/ACHNBrowserUI/views/items/detail/ItemDetailInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,28 @@ struct ItemDetailInfoView: View {
Spacer()
}
if item.obtainedFrom != nil || item.obtainedFromNew?.isEmpty == false {
Text(item.obtainedFrom ?? item.obtainedFromNew?.first ?? "")
Text(LocalizedStringKey(item.obtainedFrom ?? item.obtainedFromNew?.first ?? ""))
.foregroundColor(.acSecondaryText)
.fontWeight(.semibold)
}
item.sourceNotes.map{
Text($0)
Text(LocalizedStringKey($0))
.foregroundColor(.acSecondaryText)
.font(.footnote)
}
if item.isCritter {
HStack(spacing: 8) {
VStack(spacing: 4) {
item.rarity.map { rarity in
HStack(spacing: 4) {
Text("Rarity:")
Text(rarity)
Text(LocalizedStringKey(rarity))
.foregroundColor(.acSecondaryText)
}
}
item.shadow.map { shadow in
HStack(spacing: 4) {
Text("Shadow size:")
Text(shadow)
Text(LocalizedStringKey(shadow))
.foregroundColor(.acSecondaryText)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ACHNBrowserUI/ACHNBrowserUI/views/items/detail/ItemsCrosslineSectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct ItemsCrosslineSectionView: View {
VStack(alignment: .center, spacing: 4) {
ItemImage(path: item.filename,
size: 75)
Text(item.name)
Text(item.localizedName)
.font(.caption)
.foregroundColor(.acText)
}.onTapGesture {
Expand Down