Updated text and improved button contrast
This commit is contained in:
parent
e6e7fa328a
commit
b844947cfd
5 changed files with 29 additions and 35 deletions
|
@ -7,7 +7,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 0.0.1\n"
|
"Project-Id-Version: 0.0.1\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2022-12-19 11:17+0100\n"
|
"POT-Creation-Date: 2022-12-19 11:42+0100\n"
|
||||||
"PO-Revision-Date: 2022-05-30 19:00+0200\n"
|
"PO-Revision-Date: 2022-05-30 19:00+0200\n"
|
||||||
"Last-Translator: edpibu <git@edgarpierre.fr>\n"
|
"Last-Translator: edpibu <git@edgarpierre.fr>\n"
|
||||||
"Language-Team: edpibu <git@edgarpierre.fr>\n"
|
"Language-Team: edpibu <git@edgarpierre.fr>\n"
|
||||||
|
@ -17,79 +17,79 @@ msgstr ""
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||||
|
|
||||||
#: .\main\models.py:13 .\main\models.py:22 .\main\models.py:56
|
#: .\main\models.py:12 .\main\models.py:21 .\main\models.py:55
|
||||||
#: .\main\templates\main\tag\transaction_table.html:10
|
#: .\main\templates\main\tag\transaction_table.html:10
|
||||||
msgid "Category"
|
msgid "Category"
|
||||||
msgstr "Catégorie"
|
msgstr "Catégorie"
|
||||||
|
|
||||||
#: .\main\models.py:13 .\main\models.py:37 .\main\models.py:91
|
#: .\main\models.py:12 .\main\models.py:36 .\main\models.py:87
|
||||||
#: .\main\templates\main\tag\transaction_table.html:7
|
#: .\main\templates\main\tag\transaction_table.html:7
|
||||||
msgid "Name"
|
msgid "Name"
|
||||||
msgstr "Nom"
|
msgstr "Nom"
|
||||||
|
|
||||||
#: .\main\models.py:15
|
#: .\main\models.py:14
|
||||||
msgid "Icon"
|
msgid "Icon"
|
||||||
msgstr "Icône"
|
msgstr "Icône"
|
||||||
|
|
||||||
#: .\main\models.py:23 .\main\templates\main\index.html:57
|
#: .\main\models.py:22 .\main\templates\main\index.html:57
|
||||||
#: .\main\templates\main\snapshot.html:33
|
#: .\main\templates\main\snapshot.html:33
|
||||||
msgid "Categories"
|
msgid "Categories"
|
||||||
msgstr "Catégories"
|
msgstr "Catégories"
|
||||||
|
|
||||||
#: .\main\models.py:37 .\main\models.py:67
|
#: .\main\models.py:36 .\main\models.py:63
|
||||||
msgid "Transaction"
|
msgid "Transaction"
|
||||||
msgstr "Transaction"
|
msgstr "Transaction"
|
||||||
|
|
||||||
#: .\main\models.py:39 .\main\templates\main\tag\transaction_table.html:11
|
#: .\main\models.py:38 .\main\templates\main\tag\transaction_table.html:11
|
||||||
msgid "Description"
|
msgid "Description"
|
||||||
msgstr "Description"
|
msgstr "Description"
|
||||||
|
|
||||||
#: .\main\models.py:41 .\main\models.py:125 .\main\templates\main\index.html:23
|
#: .\main\models.py:40 .\main\models.py:121 .\main\templates\main\index.html:23
|
||||||
#: .\main\templates\main\tag\transaction_table.html:8
|
#: .\main\templates\main\tag\transaction_table.html:8
|
||||||
msgid "Value"
|
msgid "Value"
|
||||||
msgstr "Valeur"
|
msgstr "Valeur"
|
||||||
|
|
||||||
#: .\main\models.py:43 .\main\models.py:123 .\main\templates\main\index.html:22
|
#: .\main\models.py:42 .\main\models.py:119 .\main\templates\main\index.html:22
|
||||||
#: .\main\templates\main\tag\transaction_table.html:6
|
#: .\main\templates\main\tag\transaction_table.html:6
|
||||||
msgid "Date"
|
msgid "Date"
|
||||||
msgstr "Date"
|
msgstr "Date"
|
||||||
|
|
||||||
#: .\main\models.py:44
|
#: .\main\models.py:43
|
||||||
msgid "Real date"
|
msgid "Real date"
|
||||||
msgstr "Date réelle"
|
msgstr "Date réelle"
|
||||||
|
|
||||||
#: .\main\models.py:46 .\main\templates\main\tag\transaction_table.html:9
|
#: .\main\models.py:45 .\main\templates\main\tag\transaction_table.html:9
|
||||||
msgid "Trader"
|
msgid "Trader"
|
||||||
msgstr "Commerçant"
|
msgstr "Commerçant"
|
||||||
|
|
||||||
#: .\main\models.py:49
|
#: .\main\models.py:48
|
||||||
msgid "Payment"
|
msgid "Payment"
|
||||||
msgstr "Paiement"
|
msgstr "Paiement"
|
||||||
|
|
||||||
#: .\main\models.py:68 .\main\templates\main\base.html:30
|
#: .\main\models.py:64 .\main\templates\main\base.html:30
|
||||||
#: .\main\templates\main\category.html:22 .\main\templates\main\index.html:14
|
#: .\main\templates\main\category.html:22 .\main\templates\main\index.html:14
|
||||||
#: .\main\templates\main\index.html:25 .\main\templates\main\snapshot.html:87
|
#: .\main\templates\main\index.html:25 .\main\templates\main\snapshot.html:87
|
||||||
#: .\main\templates\main\transactions.html:13
|
#: .\main\templates\main\transactions.html:13
|
||||||
msgid "Transactions"
|
msgid "Transactions"
|
||||||
msgstr "Transactions"
|
msgstr "Transactions"
|
||||||
|
|
||||||
#: .\main\models.py:91 .\main\models.py:108
|
#: .\main\models.py:87 .\main\models.py:104
|
||||||
msgid "Invoice"
|
msgid "Invoice"
|
||||||
msgstr "Facture"
|
msgstr "Facture"
|
||||||
|
|
||||||
#: .\main\models.py:96
|
#: .\main\models.py:92
|
||||||
msgid "File"
|
msgid "File"
|
||||||
msgstr "Fichier"
|
msgstr "Fichier"
|
||||||
|
|
||||||
#: .\main\models.py:109 .\main\templates\main\transaction.html:23
|
#: .\main\models.py:105 .\main\templates\main\transaction.html:23
|
||||||
msgid "Invoices"
|
msgid "Invoices"
|
||||||
msgstr "Factures"
|
msgstr "Factures"
|
||||||
|
|
||||||
#: .\main\models.py:217
|
#: .\main\models.py:211
|
||||||
msgid "Snapshot"
|
msgid "Snapshot"
|
||||||
msgstr "Relevé"
|
msgstr "Relevé"
|
||||||
|
|
||||||
#: .\main\models.py:218 .\main\templates\main\index.html:19
|
#: .\main\models.py:212 .\main\templates\main\index.html:19
|
||||||
msgid "Snapshots"
|
msgid "Snapshots"
|
||||||
msgstr "Relevés"
|
msgstr "Relevés"
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,7 @@ import uuid
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.forms import ModelForm
|
from django.forms import ModelForm
|
||||||
from django.core.validators import FileExtensionValidator
|
from django.core.validators import FileExtensionValidator
|
||||||
from django.utils.text import lazy
|
from django.utils.translation import gettext as _
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
|
|
||||||
class Category(models.Model):
|
class Category(models.Model):
|
||||||
|
@ -15,7 +14,7 @@ class Category(models.Model):
|
||||||
icon = models.CharField(max_length=64, default="folder", verbose_name=_("Icon"))
|
icon = models.CharField(max_length=64, default="folder", verbose_name=_("Icon"))
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return str(self.name)
|
return self.name
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ["name"]
|
ordering = ["name"]
|
||||||
|
@ -57,10 +56,7 @@ class Transaction(models.Model):
|
||||||
)
|
)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
res = f"{self.date} {self.name}: {self.value}€"
|
return f"{self.date} – {self.name}"
|
||||||
if self.category:
|
|
||||||
return f"{res} ({self.category})"
|
|
||||||
return res
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ["-date"]
|
ordering = ["-date"]
|
||||||
|
@ -132,9 +128,7 @@ class Snapshot(models.Model):
|
||||||
)
|
)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.previous is None:
|
return f"{_('Snapshot')} {self.date}"
|
||||||
return f"Snapshot {self.date}: {self.value}€"
|
|
||||||
return f"Snapshot {self.date}: {self.value}€ (Previous: {self.previous.date})"
|
|
||||||
|
|
||||||
def save(self, *args, only_super=False, **kwargs):
|
def save(self, *args, only_super=False, **kwargs):
|
||||||
if not only_super:
|
if not only_super:
|
||||||
|
|
|
@ -21,6 +21,10 @@ form a {
|
||||||
padding: 0 var(--gap);
|
padding: 0 var(--gap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
form input {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
form > label,
|
form > label,
|
||||||
form > input[type="text"],
|
form > input[type="text"],
|
||||||
form > input[type="number"],
|
form > input[type="number"],
|
||||||
|
@ -66,11 +70,7 @@ form > .buttons > *:hover {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
form > .buttons input[type="submit"] {
|
form > .buttons input[type="submit"] {
|
||||||
background: var(--green);
|
background: var(--green-1);
|
||||||
color: var(--text-inv);
|
|
||||||
}
|
|
||||||
form > .buttons input[type="reset"] {
|
|
||||||
color: var(--red);
|
|
||||||
}
|
}
|
||||||
form > .buttons a.del {
|
form > .buttons a.del {
|
||||||
background: var(--red);
|
background: var(--red);
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
--green: var(--theme-0);
|
--green: var(--theme-0);
|
||||||
|
|
||||||
--red-1: var(--theme-4);
|
--red-1: var(--theme-4);
|
||||||
--green-1: var(--theme-1);
|
--green-1: var(--theme);
|
||||||
|
|
||||||
--border: .5em;
|
--border: .5em;
|
||||||
--radius: .25em;
|
--radius: .25em;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
{% translate "Delete" as del %}
|
{% translate "Delete" as del %}
|
||||||
<a
|
<a
|
||||||
class="btn del"
|
class="btn del"
|
||||||
onclick="return confirm('{{ del }} <{{ instance.name}}> ?')"
|
onclick="return confirm('{{ del }} <{{ instance}}> ?')"
|
||||||
href="{% url del_url instance.id %}">
|
href="{% url del_url instance.id %}">
|
||||||
{{ del }}
|
{{ del }}
|
||||||
</a>
|
</a>
|
||||||
|
|
Loading…
Reference in a new issue