feat(mail): Add sort by recipient instead of from in sent folder. Cha…

…nge subject_or_to in sent folder for search instead of subject_or_from. Closes #6030.
Alinto · Nov 25, 2024 · e4c98fd · e4c98fd
1 parent ea427ea
commit e4c98fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
@@ -171,6 +171,7 @@
 /* MailListView */
 "Sender" = "Sender";
 "Subject or Sender" = "Subject or Sender";
+"Subject or Recipient" = "Subject or Recipient";
 "To or Cc" = "To or Cc";
 "Entire Message" = "Entire Message";
 "Date"          = "Date";

diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
@@ -171,6 +171,7 @@
 /* MailListView */
 "Sender" = "Expéditeur";
 "Subject or Sender" = "Sujet ou expéditeur";
+"Subject or Recipient" = "Sujet ou destinataire";
 "To or Cc" = "Pour ou Copie à";
 "Entire Message" = "Message Complet";
 "Date"          = "Date";
@@ -514,18 +515,3 @@
 
 /* Hotkey to forward to a message */
 "hotkey_forward" = "f";
-
-/* Email deletion */
-"Clean folder" = "Nettoyer le dossier";
-"Clean mailbox" = "Nettoyer la boite mail";
-"Delete permanently (do not use trash)" = "Supprimer définitivement (ne pas utiliser la corbeille)";
-"Apply to subfolders" = "Appliquer aux sous-dossiers";
-"Delete e-mails older than" = "Supprimer les e-mails plus vieux de";
-"3 months" = "3 mois";
-"6 months" = "6 mois";
-"9 months" = "9 mois";
-"1 year" = "1 an";
-"Custom" = "Personnalisé";
-"You are about to permanently delete some messages. Are you sure you want to proceed with this action?" = "Vous êtes sur le point de supprimer définitivement certains messages. Êtes-vous certain de vouloir effectuer cette action ?";
-"Apply" = "Appliquer";
-"%{0} message(s) deleted" = "%{0} message(s) supprimés";
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -87,11 +87,16 @@
                 <md-icon label:aria-label="Subject">{{ mailbox.sortedBy('subject') ? 'check' : null }}</md-icon> <var:string label:value="Subject"/>
               </md-button>
             </md-menu-item>
-            <md-menu-item>
+            <md-menu-item ng-if="!mailbox.selectedFolder.isSentFolder">
               <md-button ng-click="mailbox.sort('from')">
                 <md-icon label:aria-label="From">{{ mailbox.sortedBy('from') ? 'check' : null }}</md-icon> <var:string label:value="From"/>
               </md-button>
             </md-menu-item>
+            <md-menu-item ng-if="mailbox.selectedFolder.isSentFolder">
+              <md-button ng-click="mailbox.sort('to')">
+                <md-icon label:aria-label="To">{{ mailbox.sortedBy('to') ? 'check' : null }}</md-icon> <var:string label:value="To"/>
+              </md-button>
+            </md-menu-item>
             <md-menu-item>
               <md-button ng-click="mailbox.sort('date')">
                 <md-icon label:aria-label="Date">{{ mailbox.sortedBy('date') ? 'check' : null }}</md-icon> <var:string label:value="Date"/>
@@ -143,7 +148,8 @@
         </md-input-container>
         <md-input-container flex="25">
           <md-select label:aria-label="Search scope">
-            <md-option value="subject_or_from" selected="selected"><var:string label:value="Subject or Sender"/></md-option>
+            <md-option value="subject_or_from" selected="selected" ng-if="!mailbox.selectedFolder.isSentFolder"><var:string label:value="Subject or Sender"/></md-option>
+            <md-option value="subject_or_to" selected="selected" ng-if="mailbox.selectedFolder.isSentFolder"><var:string label:value="Subject or Recipient"/></md-option>
             <md-option value="subject"><var:string label:value="Subject"/></md-option>
             <md-option value="from"><var:string label:value="Sender"/></md-option>
             <md-option value="to_or_cc"><var:string label:value="To or Cc"/></md-option>

diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -405,6 +405,7 @@
       this.$highlightWords = [];
       filters.forEach(filter => {
         if ("subject_or_from" == filter.searchBy
+          || "subject_or_to" == filter.searchBy
           || "contains" == filter.searchBy
           || "body" == filter.searchBy
           || "from" == filter.searchBy