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

Add German Localization #68 #92

Merged
merged 22 commits into from
May 10, 2020
Merged

Add German Localization #68 #92

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 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
8392b7b
Initial draft of localization
TheVaan May 9, 2020
4c5dfd2
Merge pull request #3 from Dimillian/master
TheVaan May 9, 2020
ef8350d
merge
TheVaan May 9, 2020
b5024e7
localization progress:
TheVaan May 9, 2020
17c5e1a
Translated ActiveCrittersView to German
TheVaan May 9, 2020
e6b0be0
improved localization files
TheVaan May 9, 2020
8c64151
Merge upstream master to branch
TheVaan May 9, 2020
f173ae7
more German translation
TheVaan May 9, 2020
a453c44
Merge branch 'master' of https://github.com/Dimillian/ACHNBrowserUI i…
TheVaan May 10, 2020
8ebeac7
translated ItemList to German
TheVaan May 10, 2020
d278071
missed ItemRowView in last commit
TheVaan May 10, 2020
7354f35
translated Shared View to German
TheVaan May 10, 2020
32d5eb3
removed dashboard folder due to corrupted merge
TheVaan May 10, 2020
c128761
translated Turnips to German - Part I
TheVaan May 10, 2020
bab341b
Merge branch 'master' of https://github.com/Dimillian/ACHNBrowserUI i…
TheVaan May 10, 2020
006cb1c
Translated Turnips Chart to German
TheVaan May 10, 2020
cbedcac
Translated Turnips to German part II (turnips.exchange View; disabled…
TheVaan May 10, 2020
7cce1f0
translated Villagers to German
TheVaan May 10, 2020
6730d4e
translated Listings and Categories to German
TheVaan May 10, 2020
6d49d91
Fixes
Dimillian May 10, 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
43 changes: 41 additions & 2 deletions ACHNBrowserUI/ACHNBrowserUI/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
Copyright © 2020 Thomas Ricouard. All rights reserved.
*/

"Make an Offer" = "Angebot abgeben";
"Need Materials" = "Need Materials";
"Tap here to preview a notification" = "Tippe hier für eine Vorschau";
"Upgrade to +" = "Upgrade auf +";
"You're subscribed to AC Helper+" = "You're subscribed to AC Helper+";
Expand Down Expand Up @@ -287,6 +285,47 @@ Du kannst das Abonnement jederzeit in deinen iTunes Kontoeinstellungen beenden.
"Unknown" = "Unbekannt";
"Villager items" = "Gegenstände des Bewohners";

// ListingRow
"Make an Offer" = "Angebot abgeben";
"Need Materials" = "Benötigt Materialien";
"No Raiting" = "Keine Bewertungen";
"Raiting" = "Bewertung";

// CategoryRow
"housewares" = "Haushaltswaren";
"miscellaneous" = "Sonstiges";
"wall-mounted" = "Wand Dekoration";
"wallpapers" = "Tapeten";
"floors" = "Fußböden";
"rugs" = "Teppiche";
"photos" = "Fotos";
"posters" = "Poster";
"fencing" = "Zäune";
"tools" = "Werkzeuge";
"tops" = "Oberteile";
"bottoms" = "Unterteile";
"dresses" = "Kleider";
"headwear" = "Kopfbedeckungen";
"accessories" = "Accessoires";
"socks" = "Socken";
"shoes" = "Schuhe";
"bags" = "Taschen";
"umbrellas" = "Regenschirme";
"music" = "Musik";
"recipes" = "Anleitungen";
"construction" = "Bau";
"nookmiles" = "Nook Miles";
"other" = "Anderes";
"art" = "Kunst";
"bugs" = "Insekten";
"fish" = "Fische";
"fossils" = "Fossilien";
// CategoriesView
"Nature" = "Natur";
"Wardrobe" = "Kleidung";
"No results for %@" = "Kein Ergebnis für %@";


// Shared
// SearchField
"Search..." = "Suchen...";
Expand Down
Binary file modified ACHNBrowserUI/ACHNBrowserUI/en.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.
13 changes: 2 additions & 11 deletions ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/models/Category.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,8 @@ public enum Category: String, CaseIterable {
case umbrellas, music, recipes, construction, nookmiles, other
case art, bugs, fish, fossils

public func label() -> String {
switch self {
case .fish:
return "Fishes"
case .wallMounted:
return "Wall mounted"
case .nookmiles:
return "Nook Miles"
default:
return self.rawValue.capitalized
}
public func label() -> LocalizedStringKey {
return LocalizedStringKey(self.rawValue)
Comment on lines -20 to +21
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced label() function because using rawValue as LocalizedStringKey makes this obsolet to transform value to readable label.

}

public func iconName() -> String {
Expand Down
2 changes: 1 addition & 1 deletion ACHNBrowserUI/ACHNBrowserUI/views/categories/CategoriesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extension CategoriesView {
.renderingMode(.original)
.resizable()
.frame(width: 46, height: 46)
Text(name)
Text(LocalizedStringKey(name))
.style(appStyle: .rowTitle)
Spacer()
Text("\(items.itemsCount(for: categories))")
Expand Down
2 changes: 1 addition & 1 deletion ACHNBrowserUI/ACHNBrowserUI/views/listing/ListingRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct ListingRow: View {
}
}
if !hideDetail {
Text("\(listing.username)\(listing.discord.map { $0.isEmpty ? "" : " · \($0)" } ?? "")\(listing.rating.map { $0.isEmpty ? " · No Rating" : " · \($0[..<$0.index($0.startIndex, offsetBy: 4)]) Rating" } ?? " · No Rating")")
Text("\(listing.username)\(listing.discord.map { $0.isEmpty ? "" : " · \($0)" } ?? "")\(listing.rating.map { $0.isEmpty ? " · "+NSLocalizedString("No Rating", comment: "") : " · \($0[..<$0.index($0.startIndex, offsetBy: 4)]) "+NSLocalizedString("Rating", comment: "") } ?? " · "+NSLocalizedString("No Rating", comment: ""))")
.font(.subheadline)
.foregroundColor(.acSecondaryText)
}
Expand Down