From ad45bcf2cf83188e7e40961ac28424782f529758 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Dec 2022 10:48:56 +0100 Subject: [PATCH] Changes for #796 --- dev/Settings/User/General.js | 4 +- dev/Stores/User/Settings.js | 4 +- dev/Styles/User/MessageList.less | 2 +- dev/View/User/MailBox/MessageList.js | 74 +++++++++++-------- .../0.0.0/app/libraries/RainLoop/Actions.php | 4 +- .../app/libraries/RainLoop/Actions/User.php | 2 +- .../v/0.0.0/app/localization/ar-SA/user.json | 2 +- .../v/0.0.0/app/localization/bg-BG/user.json | 2 +- .../v/0.0.0/app/localization/cs-CZ/user.json | 2 +- .../v/0.0.0/app/localization/da-DK/user.json | 2 +- .../v/0.0.0/app/localization/de-DE/user.json | 2 +- .../v/0.0.0/app/localization/el-GR/user.json | 2 +- .../v/0.0.0/app/localization/en-GB/user.json | 2 +- .../v/0.0.0/app/localization/en/user.json | 2 +- .../v/0.0.0/app/localization/es-ES/user.json | 2 +- .../v/0.0.0/app/localization/et-EE/user.json | 2 +- .../v/0.0.0/app/localization/eu/user.json | 2 +- .../v/0.0.0/app/localization/fa-IR/user.json | 2 +- .../v/0.0.0/app/localization/fi-FI/user.json | 2 +- .../v/0.0.0/app/localization/fr-FR/user.json | 2 +- .../v/0.0.0/app/localization/hu-HU/user.json | 2 +- .../v/0.0.0/app/localization/id-ID/user.json | 2 +- .../v/0.0.0/app/localization/is-IS/user.json | 2 +- .../v/0.0.0/app/localization/it-IT/user.json | 2 +- .../v/0.0.0/app/localization/ja-JP/user.json | 2 +- .../v/0.0.0/app/localization/ko-KR/user.json | 2 +- .../v/0.0.0/app/localization/lt-LT/user.json | 2 +- .../v/0.0.0/app/localization/lv-LV/user.json | 2 +- .../v/0.0.0/app/localization/nb-NO/user.json | 2 +- .../v/0.0.0/app/localization/nl-NL/user.json | 2 +- .../v/0.0.0/app/localization/pl-PL/user.json | 2 +- .../v/0.0.0/app/localization/pt-BR/user.json | 2 +- .../v/0.0.0/app/localization/pt-PT/user.json | 2 +- .../v/0.0.0/app/localization/pt/user.json | 2 +- .../v/0.0.0/app/localization/ro-RO/user.json | 2 +- .../v/0.0.0/app/localization/ru-RU/user.json | 2 +- .../v/0.0.0/app/localization/sk-SK/user.json | 2 +- .../v/0.0.0/app/localization/sl-SI/user.json | 2 +- .../v/0.0.0/app/localization/sv-SE/user.json | 2 +- .../v/0.0.0/app/localization/tr-TR/user.json | 2 +- .../v/0.0.0/app/localization/uk-UA/user.json | 2 +- .../v/0.0.0/app/localization/vi-VN/user.json | 2 +- .../v/0.0.0/app/localization/zh-CN/user.json | 2 +- .../v/0.0.0/app/localization/zh-TW/user.json | 2 +- .../templates/Views/User/MailMessageList.html | 8 +- .../templates/Views/User/SettingsGeneral.html | 4 +- 46 files changed, 97 insertions(+), 81 deletions(-) diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index 564db3c94..c9b5fcde0 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -44,7 +44,7 @@ export class UserSettingsGeneral extends AbstractViewSettings { ['layout', 'messageReadDelay', 'messagesPerPage', 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt', 'viewHTML', 'showImages', 'removeColors', 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', - 'useCheckboxesInList', 'listPerDay', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck' + 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck' ].forEach(name => this[name] = SettingsUserStore[name]); this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings'); @@ -99,7 +99,7 @@ export class UserSettingsGeneral extends AbstractViewSettings { this.addSetting('Layout'); this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'ListInlineAttachments', 'simpleAttachmentsList', - 'UseCheckboxesInList', 'listPerDay', 'ReplySameFolder', + 'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder', 'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt', 'allowSpellcheck', 'DesktopNotifications', 'SoundNotification']); diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js index 3c811e810..c1c041c9b 100644 --- a/dev/Stores/User/Settings.js +++ b/dev/Stores/User/Settings.js @@ -21,7 +21,7 @@ export const SettingsUserStore = new class { listInlineAttachments: 0, simpleAttachmentsList: 0, useCheckboxesInList: 1, - listPerDay: 0, + listGrouped: 0, allowDraftAutosave: 1, useThreads: 0, replySameFolder: 0, @@ -85,7 +85,7 @@ export const SettingsUserStore = new class { self.listInlineAttachments(SettingsGet('ListInlineAttachments')); self.simpleAttachmentsList(SettingsGet('simpleAttachmentsList')); self.useCheckboxesInList(SettingsGet('UseCheckboxesInList')); - self.listPerDay(SettingsGet('listPerDay')); + self.listGrouped(SettingsGet('listGrouped')); self.allowDraftAutosave(SettingsGet('AllowDraftAutosave')); self.useThreads(SettingsGet('UseThreads')); self.replySameFolder(SettingsGet('ReplySameFolder')); diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less index 2c79c81af..57b79f9f4 100644 --- a/dev/Styles/User/MessageList.less +++ b/dev/Styles/User/MessageList.less @@ -29,7 +29,7 @@ html.rl-no-preview-pane { display: flex; flex-direction: column; - .day { + .groupLabel { background:rgba(128,128,128,0.2); font-size: 12px; line-height: 2; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 83626d26f..aaee34af5 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -146,40 +146,56 @@ export class MailMessageList extends AbstractViewRight { mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.hasChecked() : 1, - listPerDay: () => { + listGrouped: () => { let uid = MessagelistUserStore.threadUid(), sort = FolderUserStore.sortMode() || 'DATE'; - return SettingsUserStore.listPerDay() && 'DATE' == sort && !uid; + return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid; }, - listByDay: () => { - let list = [], current, today = Ymd(new Date()), - rtf = Intl.RelativeTimeFormat - ? new Intl.RelativeTimeFormat(doc.documentElement.lang, { numeric: "auto" }) : 0; - MessagelistUserStore.forEach(msg => { - let date = (new Date(msg.dateTimeStampInUTC() * 1000)), - ymd = Ymd(date); - if (!current || ymd != current.ymd) { - if (rtf && today == ymd) { - date = rtf.format(0, 'day'); - } else if (rtf && today - 1 == ymd) { - date = rtf.format(-1, 'day'); -// } else if (today - 7 < ymd) { -// date = date.format({weekday: 'long'}); -// date = date.format({dateStyle: 'full'},0,LanguageStore.hourCycle()); - } else { -// date = date.format({dateStyle: 'medium'},0,LanguageStore.hourCycle()); - date = date.format({dateStyle: 'full'},0,LanguageStore.hourCycle()); + groupedList: () => { + let list = [], current, sort = FolderUserStore.sortMode() || 'DATE'; + if (sort.includes('DATE')) { + let today = Ymd(new Date()), + rtf = Intl.RelativeTimeFormat + ? new Intl.RelativeTimeFormat(doc.documentElement.lang, { numeric: "auto" }) : 0; + MessagelistUserStore.forEach(msg => { + let date = (new Date(msg.dateTimeStampInUTC() * 1000)), + ymd = Ymd(date); + if (!current || ymd != current.id) { + if (rtf && today == ymd) { + date = rtf.format(0, 'day'); + } else if (rtf && today - 1 == ymd) { + date = rtf.format(-1, 'day'); +// } else if (today - 7 < ymd) { +// date = date.format({weekday: 'long'}); +// date = date.format({dateStyle: 'full'},0,LanguageStore.hourCycle()); + } else { +// date = date.format({dateStyle: 'medium'},0,LanguageStore.hourCycle()); + date = date.format({dateStyle: 'full'},0,LanguageStore.hourCycle()); + } + current = { + id: ymd, + label: date, + messages: [] + }; + list.push(current); } - current = { - ymd: ymd, - day: date, - messages: [] - }; - list.push(current); - } - current.messages.push(msg); - }); + current.messages.push(msg); + }); + } else if (sort.includes('FROM')) { + MessagelistUserStore.forEach(msg => { + let email = msg.from[0].email; + if (!current || email != current.id) { + current = { + id: email, + label: msg.from[0].toLine(), + messages: [] + }; + list.push(current); + } + current.messages.push(msg); + }); + } return list; }, diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 2d810b16e..a7c6ed6bb 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -693,7 +693,7 @@ class Actions 'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false), 'ListInlineAttachments' => false, 'simpleAttachmentsList' => false, - 'listPerDay' => false, + 'listGrouped' => false, 'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25), 'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5), 'MsgDefaultAction' => 1, @@ -799,7 +799,7 @@ class Actions $aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']); $aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']); $aResult['simpleAttachmentsList'] = (bool)$oSettings->GetConf('simpleAttachmentsList', $aResult['simpleAttachmentsList']); - $aResult['listPerDay'] = (bool)$oSettings->GetConf('listPerDay', $aResult['listPerDay']); + $aResult['listGrouped'] = (bool)$oSettings->GetConf('listGrouped', $aResult['listGrouped']); $aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']); $aResult['MessagesPerPage'] = (int)$oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']); $aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php index 9d717d6c7..f9f28ed1a 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php @@ -181,7 +181,7 @@ trait User $this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool'); $this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool'); $this->setSettingsFromParams($oSettings, 'simpleAttachmentsList', 'bool'); - $this->setSettingsFromParams($oSettings, 'listPerDay', 'bool'); + $this->setSettingsFromParams($oSettings, 'listGrouped', 'bool'); $this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool'); $this->setSettingsFromParams($oSettings, 'DesktopNotifications', 'bool'); $this->setSettingsFromParams($oSettings, 'SoundNotification', 'bool'); diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json index 10969a282..e994fceaa 100644 --- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json +++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "قم باضافة المستلمين تلقائيا الى دفتر العناوين", diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json index 326c184fe..c20072587 100644 --- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json +++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Автоматично добавяне на получателите към адресната ви книга", diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json index 720dbc676..53a4b571d 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automaticky přidávat adresy příjemců do Adresáře", diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json index bdb8df2cf..837d0ef00 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/user.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Tilføj automatisk modtager til adressebog", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json index 500c03807..a3872a1a5 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/user.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)", "LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Empfänger automatisch zu Ihrem Adressbuch hinzuzufügen", diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json index 436ab09ed..464e8f753 100644 --- a/snappymail/v/0.0.0/app/localization/el-GR/user.json +++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Αυτόματη προσθήκη επαφών στον κατάλογο διευθύνσεων", diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json index 50c563605..543843d32 100644 --- a/snappymail/v/0.0.0/app/localization/en-GB/user.json +++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book", diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json index 5a7f5b5ac..f055aab13 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json index cae419897..b49fc04f7 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/user.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Agregar automáticamente destinatarios a la libreta de direcciones", diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json index 4fb2bcdb0..2b26ac6af 100644 --- a/snappymail/v/0.0.0/app/localization/et-EE/user.json +++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Lisa saajad automaatselt aadressiraamatusse", diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json index 49b7759e7..2ad2e4e37 100644 --- a/snappymail/v/0.0.0/app/localization/eu/user.json +++ b/snappymail/v/0.0.0/app/localization/eu/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Nabigatzaileak blokeatuta)", "LIST_INLINE_ATTACHMENTS": "Erakutsi sareko eranskinak zerrendan", "LIST_SIMPLE_ATTACHMENTS": "Eranskinen zerrenda arrunta", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatikoki gehitu hartzaileak helbide-liburura", diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json index d936fe45d..49039ce39 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "اطلاعات تماس گیرندگان را بصورت خودکار در آدرسبوک ذخیره کن", diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json index 5e0895614..158d1b555 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Lisää yhetystieto automaattisesti osoitekirjaan", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json index d66836a45..c3db75b8e 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Ajouter automatiquement les destinataires à votre carnet d'adresses", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json index 2f44d8398..ec3fc8f19 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Címzettek automatikus hozzáadása a címtárhoz", diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json index fd3d6da7d..d20041952 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/user.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Tambah penerima ke daftar alamat secara otomatis", diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json index 54eda1270..9ac15e013 100644 --- a/snappymail/v/0.0.0/app/localization/is-IS/user.json +++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Bæta viðtakendum sjálfkrafa í nafnaskrá", diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json index 055d0feaf..935ead537 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/user.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Aggiungi automaticamente le persone che ti inviano mail alla rubrica", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json index 10eb8bbe0..28a1388d6 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する", diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json index 27c208996..67770dd37 100644 --- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json +++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "수신인을 주소록에 자동으로 추가", diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json index ad0b13b5b..659b68536 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatiškai pridėti gavėjus į adresų knygą", diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json index 3f6bbe726..d874388b6 100644 --- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json +++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book", diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json index d8471158a..168216cbe 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Legg til mottakere i adresseboka automatisk", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json index 2f39c84cc..30f28e780 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)", "LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst", "LIST_SIMPLE_ATTACHMENTS": "Simpele bijlagen lijst", - "LIST_MESSAGES_PER_DAY": "Toon berichten per dag" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatisch ontvangers toevoegen aan uw adresboek", diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json index 110d31ba7..8a09ce473 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej", diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json index 177a8532d..f966c07d8 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente os destinatários na lista de endereços", diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json index accdf4f10..e681c29f3 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços", diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json index accdf4f10..e681c29f3 100644 --- a/snappymail/v/0.0.0/app/localization/pt/user.json +++ b/snappymail/v/0.0.0/app/localization/pt/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços", diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json index 8143f28c8..949add42f 100644 --- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json +++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Adaugă automat destinatarii la agenda de scrisori", diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json index 94a4508c4..9cec34a81 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу", diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json index 0cbf183c5..fa232e1db 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Automaticky pridávať príjemcov správ do Adresára", diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json index 5b90aee40..4429bdc29 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Samodejno dodaj prejemnike v imenik", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json index 182834485..3067bad50 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Lägg till mottagare automatiskt i din adressbok", diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json index 12fe42dbc..af7449bcf 100644 --- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json +++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Otomatik olarak adres defterinize alıcıyı ekle", diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json index 193d2d8ef..7bca3a07d 100644 --- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json +++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу", diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json index 3cfc9c139..8091ae77c 100644 --- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json +++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "Tự động thêm người nhận thư vào sổ địa chỉ của bạn", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json index e0387efde..0a64c81f5 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)", "LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件", "LIST_SIMPLE_ATTACHMENTS": "简洁附件列表", - "LIST_MESSAGES_PER_DAY": "按日显示消息列表" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿", diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json index d2a33fde8..0e52360eb 100644 --- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json @@ -414,7 +414,7 @@ "CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)", "LIST_INLINE_ATTACHMENTS": "Show inline attachments in list", "LIST_SIMPLE_ATTACHMENTS": "Simple attachments list", - "LIST_MESSAGES_PER_DAY": "List messages per day" + "LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)" }, "SETTINGS_CONTACTS": { "LABEL_CONTACTS_AUTOSAVE": "自動添加到你的位址簿", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 649c57c34..16c721901 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -129,9 +129,9 @@ - -