Skip to content

Commit

Permalink
Add multiple selection (#60)
Browse files Browse the repository at this point in the history
* Add multiple selection

* Fix wrong messages issues

* Update translations

* Mix colors for unread/cc in inbox with selected green

* Fix duplicates when clicking on select all with already one selected, and add the number of selected items

* Fixes

* Remove old translations files

* Fix filter priority
  • Loading branch information
Athozus authored Apr 12, 2023
1 parent 67bda9a commit 191e511
Show file tree
Hide file tree
Showing 10 changed files with 293 additions and 148 deletions.
4 changes: 3 additions & 1 deletion init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ mail = {
bcc = {},
boxtab = {},
sortfield = {},
sortdirection = {}
sortdirection = {},
filter = {},
multipleselection = {}
},

message_drafts = {}
Expand Down
33 changes: 18 additions & 15 deletions locale/mail.de.tr
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ BCC=BCC
Cancel=Abbrechen
Save draft=Entwurf Speichern
Send=Senden
CC=CC
Edit=Bearbeiten
Note=Notiz
Delete=Löschen
New=Neu
Name=Name
No drafts=Keine Entwürfe
Edit=Bearbeiten
Subject=Betreff
Player name=Spielername
your contacts.=ihre Kontakte.
The contact=Der Kontakt
Maillist name=Verteilerlistenname
Desc=Beschreibung
Players=Spieler
your maillists.=ihre Verteilerlisten.
The maillist=Die Verteilerliste
Back=Zurück
Save=Speichern
That name=Der Name
is already in=ist bereits in
name cannot=Name kann nicht
be empty.=leer sein.
Back=Zurück
Note=Notiz
Maillist name=Verteilerlistenname
Desc=Beschreibung
Players=Spieler
your maillists.=ihre Verteilerlisten.
The maillist=Die Verteilerliste
Mark Read=Als gelesen makieren
Mark Unread=Als ungelesen makieren
From=Von
(No description)=(Keine Beschreibung)
No maillist=Keine Verteilerliste
CC=CC
Read=Lesen
Ascending=
Descending=
Filter=
Allow multiple selection=
selected=
(Un)select all=
No mail=Keine Nachrichten
Inbox=Posteingang
Sent messages=Nachrichten senden
Expand All @@ -43,10 +49,7 @@ Date=Datum
Reply=Antworten
Reply all=Allen antworten
Forward=Weiter
(No description)=(Keine Beschreibung)
No maillist=Keine Verteilerliste
Subject=Betreff
To=An
Delete=Löschen
Add=Hinzufügen
Remove=Entfernen
Name=Name
To=An
33 changes: 18 additions & 15 deletions locale/mail.fr.tr
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ BCC=Cci
Cancel=Annuler
Save draft=Enregistrer le brouillon
Send=Envoyer
CC=Cc
Edit=Modifier
Note=Note
Delete=Supprimer
New=Nouveau
Name=Nom
No drafts=Pas de brouillons
Edit=Modifier
Subject=Objet
Player name=Nom du joueur
your contacts.=vos contacts.
The contact=Ce contact
Maillist name=Nom de la liste de diffusion
Desc=Desc
Players=Joueurs
your maillists.=vos listes de diffusion.
The maillist=Cette liste de diffusion
Back=Retour
Save=Sauvegarder
That name=Ce nom
is already in=existe déjà
name cannot=nom ne peut pas
be empty.=être vide.
Back=Retour
Note=Note
Maillist name=Nom de la liste de diffusion
Desc=Desc
Players=Joueurs
your maillists.=vos listes de diffusion.
The maillist=Cette liste de diffusion
Mark Read=Marquer comme lu
Mark Unread=Marquer non lu
From=De
(No description)=Sans description
No maillist=Aucune liste de diffusion
CC=Cc
Read=Lire
Ascending=Croissant
Descending=Décroissant
Filter=Filtre
Allow multiple selection=Autoriser la sélection multiple
selected=sélectionnés
(Un)select all=Tout (dé)selectionner
No mail=Aucun mail
Inbox=Boîte de réception
Sent messages=Messages envoyés
Expand All @@ -43,10 +49,7 @@ Date=Date
Reply=Répondre
Reply all=Répondre à tous
Forward=Transférer
(No description)=Sans description
No maillist=Aucune liste de diffusion
Subject=Objet
To=À
Delete=Supprimer
Add=Ajouter
Remove=Enlever
Name=Nom
To=À
33 changes: 18 additions & 15 deletions locale/mail.zh_TW.tr
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ BCC=密件副本
Cancel=取消
Save draft=儲存草稿
Send=發送
CC=副本
Edit=編輯
Note=備註
Delete=刪除
New=新建
Name=名稱
No drafts=沒有草稿
Edit=編輯
Subject=主旨
Player name=玩家名稱
your contacts.=
The contact=
Maillist name=郵件列表名稱
Desc=描述
Players=玩家
your maillists.=
The maillist=
Back=返回
Save=儲存
That name=
is already in=
name cannot=
be empty.=
Back=返回
Note=備註
Maillist name=郵件列表名稱
Desc=描述
Players=玩家
your maillists.=
The maillist=
Mark Read=標記已讀
Mark Unread=標記未讀
From=寄件者
(No description)=(沒有描述)
No maillist=沒有郵件列表
CC=副本
Read=閱讀
Ascending=
Descending=
Filter=
Allow multiple selection=
selected=
(Un)select all=
No mail=沒有郵件
Inbox=收件箱
Sent messages=寄件備份
Expand All @@ -43,10 +49,7 @@ Date=日期
Reply=回覆
Reply all=回覆所有人
Forward=轉寄
(No description)=(沒有描述)
No maillist=沒有郵件列表
Subject=主旨
To=收件人
Delete=刪除
Add=加入
Remove=移除
Name=名稱
To=收件人
33 changes: 18 additions & 15 deletions locale/template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ BCC=
Cancel=
Save draft=
Send=
CC=
Edit=
Note=
Delete=
New=
Name=
No drafts=
Edit=
Subject=
Player name=
your contacts.=
The contact=
Maillist name=
Desc=
Players=
your maillists.=
The maillist=
Back=
Save=
That name=
is already in=
name cannot=
be empty.=
Back=
Note=
Maillist name=
Desc=
Players=
your maillists.=
The maillist=
Mark Read=
Mark Unread=
From=
(No description)=
No maillist=
CC=
Read=
Ascending=
Descending=
Filter=
Allow multiple selection=
selected=
(Un)select all=
No mail=
Inbox=
Sent messages=
Expand All @@ -43,10 +49,7 @@ Date=
Reply=
Reply all=
Forward=
(No description)=
No maillist=
Subject=
To=
Delete=
Add=
Remove=
Name=
To=
4 changes: 2 additions & 2 deletions ui/drafts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ function mail.show_drafts(name)
formspec[#formspec + 1] = S("(No subject)")
end
end
if mail.selected_idxs.sent[name] then
if mail.selected_idxs.drafts[name] then
formspec[#formspec + 1] = ";"
formspec[#formspec + 1] = tostring(mail.selected_idxs.sent[name] + 1)
formspec[#formspec + 1] = tostring(mail.selected_idxs.drafts[name] + 1)
end
formspec[#formspec + 1] = "]"
else
Expand Down
Loading

0 comments on commit 191e511

Please sign in to comment.