diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index 4d5fc623..f8ef8c9f 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -298,9 +298,9 @@
"NewAccountDialog_AccountNameDefaultValue": "Personal",
"NewAccountDialog_AccountNamePlaceholder": "eg. Personal Mail",
"NewAccountDialog_Title": "Add New Account",
- "NoMailSelected": "no message selected",
- "NoMessageCrieteria": "no messages match your search criteria.",
- "NoMessageEmptyFolder": "this folder is empty.",
+ "NoMailSelected": "No message selected",
+ "NoMessageCrieteria": "Mo messages match your search criteria",
+ "NoMessageEmptyFolder": "This folder is empty",
"Notifications_MultipleNotificationsMessage": "You have {0} new mails",
"Notifications_MultipleNotificationsTitle": "New Mails",
"Notifications_WinoUpdatedMessage": "Checkout new version {0}",
@@ -321,8 +321,8 @@
"Right": "Right",
"SynchronizationFolderReport_Success": "up to date",
"SynchronizationFolderReport_Failed": "synchronization is failed",
- "SearchBarPlaceholder": "search",
- "SearchingIn": "searching in",
+ "SearchBarPlaceholder": "Search",
+ "SearchingIn": "Searching in",
"SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
"SettingsAboutGithub_Title": "GitHub",
"SettingsAccountManagementAppendMessage_Title": "Append messages to Sent folder",
diff --git a/Wino.Core.Domain/Translator.Designer.cs b/Wino.Core.Domain/Translator.Designer.cs
index 6f905ef8..473b8321 100644
--- a/Wino.Core.Domain/Translator.Designer.cs
+++ b/Wino.Core.Domain/Translator.Designer.cs
@@ -424,7 +424,7 @@ namespace Wino.Core.Domain
public static string DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton => Resources.GetTranslatedString(@"DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton");
///
- /// Do you want to stop getting messages from {0}? WinoMail will unsubscribe for you by sending an email from your email account to {1}.
+ /// Do you want to stop getting messages from {0}? Wino will unsubscribe for you by sending an email from your email account to {1}.
///
public static string DialogMessage_UnsubscribeConfirmationMailtoMessage => Resources.GetTranslatedString(@"DialogMessage_UnsubscribeConfirmationMailtoMessage");
@@ -1514,17 +1514,17 @@ namespace Wino.Core.Domain
public static string NewAccountDialog_Title => Resources.GetTranslatedString(@"NewAccountDialog_Title");
///
- /// no message selected
+ /// No message selected
///
public static string NoMailSelected => Resources.GetTranslatedString(@"NoMailSelected");
///
- /// no messages match your search criteria.
+ /// Mo messages match your search criteria
///
public static string NoMessageCrieteria => Resources.GetTranslatedString(@"NoMessageCrieteria");
///
- /// this folder is empty.
+ /// This folder is empty
///
public static string NoMessageEmptyFolder => Resources.GetTranslatedString(@"NoMessageEmptyFolder");
@@ -1629,12 +1629,12 @@ namespace Wino.Core.Domain
public static string SynchronizationFolderReport_Failed => Resources.GetTranslatedString(@"SynchronizationFolderReport_Failed");
///
- /// search
+ /// Search
///
public static string SearchBarPlaceholder => Resources.GetTranslatedString(@"SearchBarPlaceholder");
///
- /// searching in
+ /// Searching in
///
public static string SearchingIn => Resources.GetTranslatedString(@"SearchingIn");
diff --git a/Wino.Mail.ViewModels/MailListPageViewModel.cs b/Wino.Mail.ViewModels/MailListPageViewModel.cs
index bdd2a9d7..45df9049 100644
--- a/Wino.Mail.ViewModels/MailListPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MailListPageViewModel.cs
@@ -839,9 +839,11 @@ namespace Wino.Mail.ViewModels
void ResetFilters()
{
+ // Expected that FilterOptions and SortingOptions have default value in 0 index.
SelectedFilterOption = FilterOptions[0];
SelectedSortingOption = SortingOptions[0];
SearchQuery = string.Empty;
+ IsInSearchMode = false;
}
}
diff --git a/Wino.Mail/Views/MailListPage.xaml.cs b/Wino.Mail/Views/MailListPage.xaml.cs
index d0b038de..33cea63a 100644
--- a/Wino.Mail/Views/MailListPage.xaml.cs
+++ b/Wino.Mail/Views/MailListPage.xaml.cs
@@ -16,6 +16,7 @@ using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Navigation;
using Wino.Controls;
using Wino.Controls.Advanced;
+using Wino.Core.Domain;
using Wino.Core.Domain.Enums;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Domain.Models.MailItem;
@@ -420,7 +421,7 @@ namespace Wino.Views
private void SearchBarUnfocused(object sender, RoutedEventArgs e)
{
- SearchBar.PlaceholderText = "search";
+ SearchBar.PlaceholderText = Translator.SearchBarPlaceholder;
}
private void MailListPageLoaded(object sender, RoutedEventArgs e)