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

[iOS] Localize bookmarks #1193

Merged
merged 2 commits into from
Sep 12, 2023
Merged

[iOS] Localize bookmarks #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc036f0
Localize Bookmarks
woxtu Sep 12, 2023
1e8a36c
Add horizontal padding to the filter menu
woxtu Sep 12, 2023
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
5 changes: 5 additions & 0 deletions app-ios/Modules/Sources/Assets/Resources/Strings/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
"about.app_version" = "App Version";
"about.android_robot_description" = "The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.";

"bookmark.title" = "Bookmarks";
"bookmark.all_day" = "All";
"bookmark.bookmarks_not_found" = "No sessions registered";
"bookmark.bookmarks_not_found_note" = "Add the sessions you are interested in to your bookmarks\nand collect them!";

"search.day" = "Day";
"search.category" = "Category";
"search.session_type" = "Session type";
Expand Down
5 changes: 5 additions & 0 deletions app-ios/Modules/Sources/Assets/Resources/Strings/ja.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
"about.app_version" = "アプリバージョン";
"about.android_robot_description" = "The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.";

"bookmark.title" = "Bookmarks";
"bookmark.all_day" = "全て";
"bookmark.bookmarks_not_found" = "登録されたセッションが\nありません";
"bookmark.bookmarks_not_found_note" = "気になるセッションをブックマークに追加して\n集めてみましょう！";

"search.day" = "開催日";
"search.category" = "カテゴリー";
"search.session_type" = "セッション種別";
Expand Down
9 changes: 5 additions & 4 deletions app-ios/Modules/Sources/Timetable/Bookmark/BookmarkView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct BookmarkView<SessionView: View>: View {
VStack(alignment: .leading, spacing: 0) {
HStack {
FilterLabel(
title: "全て",
title: L10n.Bookmark.allDay,
isSelection: false,
isSelected: viewModel.state.selectedDay == nil,
onSelect: {
Expand All @@ -48,6 +48,7 @@ struct BookmarkView<SessionView: View>: View {
)
}
}
.padding(.horizontal, 16)
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

if timetableItems.map({ $0.items }).flatMap({ $0 }).isEmpty {
BookmarkEmptyView()
} else {
Expand All @@ -68,7 +69,7 @@ struct BookmarkView<SessionView: View>: View {
}
}
.background(AssetColors.Surface.surface.swiftUIColor)
.navigationTitle("Bookmark")
.navigationTitle(L10n.Bookmark.title)
}
}

Expand All @@ -82,12 +83,12 @@ private struct BookmarkEmptyView: View {
.background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
.clipShape(RoundedRectangle(cornerRadius: 24))
Spacer().frame(height: 24)
Text("登録されたセッションがありません")
Text(L10n.Bookmark.bookmarksNotFound)
.font(Font.custom(FontAssets.Montserrat.medium, size: 22))
.multilineTextAlignment(.center)
.foregroundStyle(AssetColors.Surface.onSurface.swiftUIColor)
Spacer().frame(height: 8)
Text("気になるセッションをブックマークに追加して集めてみましょう！")
Text(L10n.Bookmark.bookmarksNotFoundNote)
.font(Font.custom(FontAssets.Montserrat.medium, size: 14))
.multilineTextAlignment(.center)
.foregroundStyle(AssetColors.Surface.onSurfaceVariant.swiftUIColor)
Expand Down
Loading