diff --git a/Shared/ShowBasedOnVoteLogics.swift b/Shared/ShowBasedOnVoteLogics.swift index 71d1267..48b7637 100644 --- a/Shared/ShowBasedOnVoteLogics.swift +++ b/Shared/ShowBasedOnVoteLogics.swift @@ -71,15 +71,15 @@ class ShowBasedOnVoteLogics { static func getVotingTitle(onboardingData: OnboardingData) -> String { switch ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) { case (false, .Today): - return "how as yesterday" + return String(localized: "add_mood_header_view_title_yesterday") case (true, .Today): - return "how is today" + return String(localized: "add_mood_header_view_title_today") case (false, .Previous): let date = Calendar.current.date(byAdding: .day, value: -2, to: Date())! - return "how was \(Random.weekdayName(fromDate: date))" + return String(format: String(localized: "add_mood_header_view_title"), Random.weekdayName(fromDate: date)) case (true, .Previous): - return "how was yesterday" + return String(localized: "add_mood_header_view_title_yesterday") } } diff --git a/Shared/views/EmptyView.swift b/Shared/views/EmptyView.swift index 6e699da..a4f6cb6 100644 --- a/Shared/views/EmptyView.swift +++ b/Shared/views/EmptyView.swift @@ -18,15 +18,6 @@ struct EmptyHomeView: View { theme.currentTheme.secondaryBGColor VStack { - Text(String(localized: "content_view_empty_title")) - .font(.title) - .foregroundColor(textColor) - .padding() - - Text(String(localized: "content_view_empty_title")) - .font(.body) - .foregroundColor(textColor) - .padding() AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in withAnimation { viewModel.add(mood: mood, forDate: date, entryType: .header) diff --git a/Shared/views/MonthView/MonthView.swift b/Shared/views/MonthView/MonthView.swift index 847defe..3bf093a 100644 --- a/Shared/views/MonthView/MonthView.swift +++ b/Shared/views/MonthView/MonthView.swift @@ -48,8 +48,11 @@ struct MonthView: View { if viewModel.hasNoData { VStack { Spacer() - EmptyHomeView(viewModel: viewModel) + Text(String(localized: "month_view_no_data")) + .font(.title) .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(textColor) Spacer() } } else { diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 96b0128..a8e6ba3 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -29,6 +29,7 @@ "add_mood_header_view_title_today" = "How is today?"; "add_mood_header_view_title_yesterday" = "How was yesterday?"; +"add_mood_header_view_title" = "How was %@?"; "content_view_tab_main" = "Main"; "content_view_tab_month" = "Months"; @@ -39,8 +40,7 @@ "content_view_fill_in_missing_entry_cancel" = "Cancel"; "content_view_delete_entry" = "Delete this entry"; "content_view_header_title" = "Past %d days"; -"content_view_empty_title" = "You aint done shit"; -"content_view_empty_body" = "Fucking vote or something?!?!? How the fuck was yesterday?"; +"content_view_empty_title" = "There are no entries to display."; "filter_view_total" = "Total"; "filter_view_show_filters" = "Show Filters"; @@ -95,3 +95,5 @@ "create_widget_view_mouth_color" = "Mouth"; "create_widget_save" = "Save"; "create_widget_use" = "Use"; + +"month_view_no_data" = "There are no entries to display.";