From ca985ba5c057aa2806da8c67353bb6775e62cd1f Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Mon, 8 Jan 2024 16:46:01 +0100 Subject: [PATCH 1/8] feat: Allow changing foreground/background colors --- admin_interface/admin.py | 12 ++++ ...heme_css_body_background_color_and_more.py | 65 +++++++++++++++++++ admin_interface/models.py | 29 +++++++++ .../admin_interface/css/admin-interface.css | 12 ++++ .../templates/admin/base_site.html | 4 ++ 5 files changed, 122 insertions(+) create mode 100644 admin_interface/migrations/0031_theme_css_body_background_color_and_more.py diff --git a/admin_interface/admin.py b/admin_interface/admin.py index 504fe43b..9f9da4da 100644 --- a/admin_interface/admin.py +++ b/admin_interface/admin.py @@ -73,6 +73,18 @@ class ThemeAdmin(admin.ModelAdmin): ), }, ), + ( + _("Body"), + { + "classes": ("wide",), + "fields": ( + "css_body_foreground_color", + "css_body_background_color", + "css_body_quiet_color", + "css_body_loud_color", + ), + }, + ), ( _("Header"), { diff --git a/admin_interface/migrations/0031_theme_css_body_background_color_and_more.py b/admin_interface/migrations/0031_theme_css_body_background_color_and_more.py new file mode 100644 index 00000000..ccea5507 --- /dev/null +++ b/admin_interface/migrations/0031_theme_css_body_background_color_and_more.py @@ -0,0 +1,65 @@ +# Generated by Django 5.0.1 on 2024-01-08 15:37 + +import colorfield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("admin_interface", "0030_theme_collapsible_stacked_inlines_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="theme", + name="css_body_background_color", + field=colorfield.fields.ColorField( + blank=True, + default="#fff", + help_text="#fff", + image_field=None, + max_length=10, + samples=None, + verbose_name="background color", + ), + ), + migrations.AddField( + model_name="theme", + name="css_body_foreground_color", + field=colorfield.fields.ColorField( + blank=True, + default="#333", + help_text="#333", + image_field=None, + max_length=10, + samples=None, + verbose_name="foreground color", + ), + ), + migrations.AddField( + model_name="theme", + name="css_body_loud_color", + field=colorfield.fields.ColorField( + blank=True, + default="#000", + help_text="#000", + image_field=None, + max_length=10, + samples=None, + verbose_name="loud color", + ), + ), + migrations.AddField( + model_name="theme", + name="css_body_quiet_color", + field=colorfield.fields.ColorField( + blank=True, + default="#666", + help_text="#666", + image_field=None, + max_length=10, + samples=None, + verbose_name="quiet color", + ), + ), + ] diff --git a/admin_interface/models.py b/admin_interface/models.py index a29f5238..36dc98d6 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -156,6 +156,35 @@ class Theme(models.Model): verbose_name=_("display"), ) + css_body_foreground_color = ColorField( + blank=True, + default="#333", + help_text="#333", + max_length=10, + verbose_name=_("foreground color"), + ) + css_body_background_color = ColorField( + blank=True, + default="#fff", + help_text="#fff", + max_length=10, + verbose_name=_("background color"), + ) + css_body_quiet_color = ColorField( + blank=True, + default="#666", + help_text="#666", + max_length=10, + verbose_name=_("quiet color"), + ) + css_body_loud_color = ColorField( + blank=True, + default="#000", + help_text="#000", + max_length=10, + verbose_name=_("loud color"), + ) + css_header_background_color = ColorField( blank=True, default="#0C4B33", diff --git a/admin_interface/static/admin_interface/css/admin-interface.css b/admin_interface/static/admin_interface/css/admin-interface.css index c0768ae2..2aa67e6b 100644 --- a/admin_interface/static/admin_interface/css/admin-interface.css +++ b/admin_interface/static/admin_interface/css/admin-interface.css @@ -43,6 +43,18 @@ } } +:root .admin-interface { + --body-fg: var(--admin-interface-body-foreground-color); + --body-bg: var(--admin-interface-body-background-color); + --body-quiet-color: var(--admin-interface-body-quiet-color); + --body-loud-color: var(--admin-interface-body-loud-color); +} + +body.admin-interface { + color: var(--admin-interface-body-foreground-color); + background: var(--admin-interface-body-background-color); +} + .admin-interface { overflow-x: hidden; } diff --git a/admin_interface/templates/admin/base_site.html b/admin_interface/templates/admin/base_site.html index 9df49110..31447f07 100644 --- a/admin_interface/templates/admin/base_site.html +++ b/admin_interface/templates/admin/base_site.html @@ -16,6 +16,10 @@ --admin-interface-logo-color: {{ theme.logo_color }}; --admin-interface-logo-default-background-image: url("data:image/svg+xml;utf8,"); --admin-interface-env-color: {{ theme.env_color }}; + --admin-interface-body-foreground-color: {{ theme.css_body_foreground_color }}; + --admin-interface-body-background-color: {{ theme.css_body_background_color }}; + --admin-interface-body-quiet-color: {{ theme.css_body_quiet_color }}; + --admin-interface-body-loud-color: {{ theme.css_body_loud_color }}; --admin-interface-header-background-color: {{ theme.css_header_background_color }}; --admin-interface-header-text-color: {{ theme.css_header_text_color }}; --admin-interface-header-link-color: {{ theme.css_header_link_color }}; From 07253e99846d79d7f4782a468d81fe9cb98e1fb0 Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Tue, 9 Jan 2024 12:01:47 +0100 Subject: [PATCH 2/8] feat: Extend french translation --- .../locale/fr/LC_MESSAGES/django.mo | Bin 3731 -> 3998 bytes .../locale/fr/LC_MESSAGES/django.po | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.mo b/admin_interface/locale/fr/LC_MESSAGES/django.mo index 1f2544609a30e7d070d83926d1de0f3376857834..40e9d7b993db401a218fc113c726d025522ed1d3 100644 GIT binary patch delta 1586 zcmZA1OKeP09LMp~&h#}}s?`=%u2P+9y&v_e77>pHp|Oxinr7yzGM!s@W;`|~LfAAR zhMh+utzaRdVk05Jt`QMz1&Ja6tJs^BF< zTTjd&$_tI@#-9N`Xj_YnsljbH8+&jkp2SJ`5`*|2_53(a#6WTGxhkAMKa3@~968K7 zJ}Qh!n@zbBv&-J-!AiccALrvy)Bx8}iSD2hjH15x#P(ky1DX$5j$e?um|w_Y0%TV| zgz8sfCHYMqC$(G%V-E{teVb9-zj1hMM>bRAt^E zxy=Vm*K_iTlQ~#SwhaZ89aWJSPixIjq1Jo^mGC>NB1O!i5ksg6EI{p*PSgbUpb|w; zB|n6!tdFYn&;;tQH@wCLmHHO0z(=S=-%yEyOuHJ(Py;le61Lm^HhVvUN^}&J_ylH` z%sPa1T)%)C=XN>uR|TGNVJ5yqy}@r(;u>B<15HOww9(pTudhT+bUk+A4%GAKtRwdR zLsY^sRAoP+#{Ze-gu@iDrFmI1$y$&41vcY$Y{k`h1UbxIJ~ZLSsGr?ioQgkCn{NuU z(wjG-Ua%GQB3n>Pwi8=1?Q_DC|7{vfZ51((XeLa+{h^5)H+y|A-uJwX{u4zeB)_j|m z`5wFy@S?{@&lf!}sNC=QZlCX^;!!8!#XLW=uVim1=B4u8`z76>!>N8ZnY}$)RC=l~ zxKU4^4Q(#$ig>A*oARA#${FxAt<-e9udi^tuV#`fY#H=c5$ NjF-FJk{Pb}{0Dl^s^}m@f+6S95&$3 zs=irv6CSgTOf+FPW>E_qMPi%dr~sp=?~S?fWz>RqupTFoCCyXh&rG>-*^OVLo_~ie z#%G6IG;?Df*W+JYgDJMHz&)r1^Qe;)oQItQs0|FE7Cwnhcn&?h;_lzZ)r=pa)_tjY z;+rxTb@cq$o0vxJbO!a{XXkf!e+d;RMmm(rENbB*vNvLseLeM|j(bt1>Bnt&1}SM!-y-g(D-&vZhdSs~#cZLw zU$oi5wVE~>)L$oDX?ZRbP)+|6cvsABy2_%BsvIj#86XkCJE6L3V`{3oHs3|prd2w% ztyN49rs=#BevtM(ZlV=C-L+6^l@&E*7_YB1Hec?Q(;RGlwcE2{U`? zJL%hlt!4Ty+Vft)UW=S6%|$-d*!R&9+YuWsU5`zKN?yD_WbZbN+hpRbeU(`F2Z}Ri AhyVZp diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.po b/admin_interface/locale/fr/LC_MESSAGES/django.po index 5b5f1464..521d5e1f 100644 --- a/admin_interface/locale/fr/LC_MESSAGES/django.po +++ b/admin_interface/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-09 15:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,6 +38,10 @@ msgstr "Favicon" msgid "Title" msgstr "Titre" +#: admin_interface/admin.py +msgid "Body" +msgstr "Body" + #: admin_interface/admin.py msgid "Header" msgstr "Bannière" @@ -174,10 +178,22 @@ msgstr "code" msgid "display" msgstr "affichage" +#: admin_interface/models.py +msgid "foreground color" +msgstr "couleur du premier plan (gras, champs requis, messages d'erreur)" + #: admin_interface/models.py msgid "background color" msgstr "couleur d'arrière-plan" +#: admin_interface/models.py +msgid "quiet color" +msgstr "couleur discrète (champs optionnels, contenu des champs)" + +#: admin_interface/models.py +msgid "loud color" +msgstr "couleur forte" + #: admin_interface/models.py msgid "text color" msgstr "couleur du texte" From a3604865dc8fbeec1e983fa69aefecf48072bf78 Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Tue, 9 Jan 2024 15:09:54 +0100 Subject: [PATCH 3/8] docs: Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 6bad3014..cd035515 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,12 @@ You can add a theme you've created through the admin to this repository by [send ### Add theme support to third-party libraries You can add **theme support to existing third-party libraries** using the following **CSS variables**: +### Body colors +- `--admin-interface-body-background-color` +- `--admin-interface-body-foreground-color` +- `--admin-interface-body-quiet-color` +- `--admin-interface-body-loud-color` + #### Header - `--admin-interface-header-background-color` From 777e1e54855be2c6ee77830cb520c10242a224db Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Wed, 10 Jan 2024 11:09:45 +0100 Subject: [PATCH 4/8] feat: Extend help text for unclear css variables --- ...heme_css_body_foreground_color_and_more.py | 39 +++++++++++++++++++ admin_interface/models.py | 4 +- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py diff --git a/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py b/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py new file mode 100644 index 00000000..5fdf7b52 --- /dev/null +++ b/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py @@ -0,0 +1,39 @@ +# Generated by Django 5.0.1 on 2024-01-10 10:09 + +import colorfield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("admin_interface", "0031_theme_css_body_background_color_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="theme", + name="css_body_foreground_color", + field=colorfield.fields.ColorField( + blank=True, + default="#333", + help_text="Default: #333 (required fields, error messages)", + image_field=None, + max_length=10, + samples=None, + verbose_name="foreground color", + ), + ), + migrations.AlterField( + model_name="theme", + name="css_body_quiet_color", + field=colorfield.fields.ColorField( + blank=True, + default="#666", + help_text="Default: #666 (optional fields, help text, field content)", + image_field=None, + max_length=10, + samples=None, + verbose_name="quiet color", + ), + ), + ] diff --git a/admin_interface/models.py b/admin_interface/models.py index 36dc98d6..06e8e69d 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -159,7 +159,7 @@ class Theme(models.Model): css_body_foreground_color = ColorField( blank=True, default="#333", - help_text="#333", + help_text=_("Default: #333 (required fields, error messages)"), max_length=10, verbose_name=_("foreground color"), ) @@ -173,7 +173,7 @@ class Theme(models.Model): css_body_quiet_color = ColorField( blank=True, default="#666", - help_text="#666", + help_text=_("Default: #666 (optional fields, help text, field content)"), max_length=10, verbose_name=_("quiet color"), ) From bb5e8c0f7d9c4ce8af8fa1d21151377fd9a333e8 Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Wed, 10 Jan 2024 11:11:08 +0100 Subject: [PATCH 5/8] feat: Add help text translations --- .../locale/de/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/es/LC_MESSAGES/django.po | 35 +++++++++++++++++- .../locale/fa/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/fr/LC_MESSAGES/django.mo | Bin 3998 -> 4196 bytes .../locale/fr/LC_MESSAGES/django.po | 14 +++++-- .../locale/it/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/pl/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/pt_BR/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/ru/LC_MESSAGES/django.po | 32 +++++++++++++++- .../locale/tr/LC_MESSAGES/django.po | 32 +++++++++++++++- 10 files changed, 261 insertions(+), 12 deletions(-) diff --git a/admin_interface/locale/de/LC_MESSAGES/django.po b/admin_interface/locale/de/LC_MESSAGES/django.po index 73683d94..80f2750c 100644 --- a/admin_interface/locale/de/LC_MESSAGES/django.po +++ b/admin_interface/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,6 +38,10 @@ msgstr "Favicon" msgid "Title" msgstr "Titel" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Header" @@ -173,10 +177,36 @@ msgstr "Code" msgid "display" msgstr "Anzeige" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "Hintergrundfarbe" + #: admin_interface/models.py msgid "background color" msgstr "Hintergrundfarbe" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "Textfarbe" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "Linkfarbe" + #: admin_interface/models.py msgid "text color" msgstr "Textfarbe" diff --git a/admin_interface/locale/es/LC_MESSAGES/django.po b/admin_interface/locale/es/LC_MESSAGES/django.po index b74e44c9..26f34e7a 100644 --- a/admin_interface/locale/es/LC_MESSAGES/django.po +++ b/admin_interface/locale/es/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: django-admin-interface\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: 2023-08-04 11:52-0300\n" "Last-Translator: Santiago Muñoz \n" "Language-Team: Spanish \n" @@ -40,6 +40,10 @@ msgstr "Favicon" msgid "Title" msgstr "Título" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Encabezado" @@ -174,10 +178,36 @@ msgstr "código" msgid "display" msgstr "mostrar" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "color de fondo" + #: admin_interface/models.py msgid "background color" msgstr "color de fondo" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "color de texto" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "color de enlace" + #: admin_interface/models.py msgid "text color" msgstr "color de texto" @@ -236,7 +266,8 @@ msgstr "anclar posición" #: admin_interface/models.py msgid "quick remove links for active filters at top of sidebar" -msgstr "remover enlaces para filtros activos en la parte superior de la barra lateral" +msgstr "" +"remover enlaces para filtros activos en la parte superior de la barra lateral" #: admin_interface/models.py msgid "foldable apps" diff --git a/admin_interface/locale/fa/LC_MESSAGES/django.po b/admin_interface/locale/fa/LC_MESSAGES/django.po index 90d098f9..8c312ca5 100644 --- a/admin_interface/locale/fa/LC_MESSAGES/django.po +++ b/admin_interface/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django-admin-interface\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Amir Ajorloo \n" "Language-Team: Farsi \n" @@ -37,6 +37,10 @@ msgstr "آیکون تب" msgid "Title" msgstr "عنوان" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "هدر" @@ -172,10 +176,36 @@ msgstr "کد" msgid "display" msgstr "نمایش" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "رنگ پسزمینه" + #: admin_interface/models.py msgid "background color" msgstr "رنگ پسزمینه" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "رنگ متن" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "رنگ لینک" + #: admin_interface/models.py msgid "text color" msgstr "رنگ متن" diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.mo b/admin_interface/locale/fr/LC_MESSAGES/django.mo index 40e9d7b993db401a218fc113c726d025522ed1d3..3e512d4280530b04056dce94e19d99d8e8c2dc3a 100644 GIT binary patch delta 1670 zcmYM!O>B%o9LMn~EvmLCEv>hqsx7NUS?Zl`5Q&!q!p+7`DcjxJeb!qd>op+}2ODw1 zL4_s~2_kxs5El`NgK!|45H1`ZlJ34qM@v$ zPE;La%nn(~g>tOSm})$ZQ}GgR!hRfyu@yB2XHv? z%^Ck9k7Ic5MXl_CI^aX^Q!MBCrGNhp7xMf8m61ALYD;FI0z~}tI@CnAqsHq*O?*G* zl$wLwXa%Qm0-nQqyoswyjCqdANF`Bp1{zRjU@a=(CDep(;5592bMOUrpz^N?MNwy9 z8)`y{5$wMLAE7~easrj=v#8WxLt>lzsMJ5g1^5aTxPnm>cmgVO7WMo2sDK;&^G^T% z2rABbRNRXp@~>1}ra@lAaoC3%=rJlIZ*emIM6IBP6Q{so)If7l6K(f)`1TE`iEc%W z>rlTx>dohThdxxmepISoq5^zIVw$f=HqCEuIin8dxf<7FEo#Maq>DL#n(%4VXW5J6 z@iFQ!zCkTG_k|m+@Ed9+A>L{at8o@CLXJS8M7U}dbS?B%<6LSpRcY1d$yqFvvk8XNuxa_YIR!DV|MjqP9>~w6F6Dcg2hLZxL1LR_3%#I+TsnWmJ_`Y6DfN zUrbfer>deaOPN)vQ7W}x+8bk6AI|p-Uzk5xb|Tjq%O--ww!W>c%{Hao{%lv;#cgMo zOT;r_>(c2|+IG84CbrvUnoZRG?H`FmY*VTy=t?DHiGTg~xI~W)+@T;`Y_hvj$-pH8 z{W9SKXIE!~AeGFR=-yazcgn`@)(sg`HZuC8k8%G^Bi|jG*73is5Ng++Sa(mx79%EI mg2^e4v+>4QSKNhtq^ym*j4gIKQl}|(az@KCwKO#f$`(mQYmuQBnaWIP8ylo(B?OJ_ zq9C%UMMOfIAfw#1h^V$wQZ8CVK|zpF-`|}x5gqRTe(t$<=KRn7pEL6ze7!Ec81P&* zv>sv|;d2>t1XtXgX#2g!lw&`x$3YyxDfHtj^x%8c_m{B*-TB$?1+bWY6jxyza+q#T ztBpyUJ=qI$$UYdvQa*4Tn{Wa(z)e)5`=|tSsLwsK{nyBVW(j@x1(}Qag&f9BcJ+%; z{ZcF?zp3P+f*Vl`U@unTVJyR8RN^Vr0GE)%Oj~EH*H9CvLQ~{|y%5vc3Nm zgXA}^f^32c)CWS=1}voCYM*yu2mL-&Mb4p?;36u)jP2h>P2>@3yam+6U!p4W7Rhav zFdgFJ6BipWpKQDHC_Abm!+cw7egU=Sv#5mMQ5EqriwG8>CeV!9E4`=*97QEcph|uk zRoNt}($mG%UvGGW8!Gi(+>TFBiN2u{d6;$(3sD2qpb~c2e!qR5KqZ<$B|eYNl3Ay* zlKWRs#TkL7?tn^ zsKK=YKSka#NIM%Z_fRF?Mzj)|WjCR9)}Bz?MCdKI5OoBrWV(nbp\n" "Language-Team: LANGUAGE \n" @@ -178,17 +178,25 @@ msgstr "code" msgid "display" msgstr "affichage" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "Défaut: #333 (champs requis, messages d'erreur)" + #: admin_interface/models.py msgid "foreground color" -msgstr "couleur du premier plan (gras, champs requis, messages d'erreur)" +msgstr "couleur du premier plan" #: admin_interface/models.py msgid "background color" msgstr "couleur d'arrière-plan" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "Défaut: #666 (champs optionnels, texte d'aide, contenu des champs)" + #: admin_interface/models.py msgid "quiet color" -msgstr "couleur discrète (champs optionnels, contenu des champs)" +msgstr "couleur discrète" #: admin_interface/models.py msgid "loud color" diff --git a/admin_interface/locale/it/LC_MESSAGES/django.po b/admin_interface/locale/it/LC_MESSAGES/django.po index 580ab43d..37fb3d44 100644 --- a/admin_interface/locale/it/LC_MESSAGES/django.po +++ b/admin_interface/locale/it/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: django-admin-interface\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: 2018-12-30 19:13-0500\n" "Last-Translator: Fabio Caccamo \n" "Language-Team: Italian \n" @@ -39,6 +39,10 @@ msgstr "Favicon" msgid "Title" msgstr "Titolo" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Header" @@ -175,10 +179,36 @@ msgstr "codice" msgid "display" msgstr "visualizzazione" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "colore di sfondo" + #: admin_interface/models.py msgid "background color" msgstr "colore di sfondo" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "colore del testo" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "colore dei link" + #: admin_interface/models.py msgid "text color" msgstr "colore del testo" diff --git a/admin_interface/locale/pl/LC_MESSAGES/django.po b/admin_interface/locale/pl/LC_MESSAGES/django.po index 127fd7b1..7750a15c 100644 --- a/admin_interface/locale/pl/LC_MESSAGES/django.po +++ b/admin_interface/locale/pl/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: django-admin-interface\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: 2022-02-04 19:13-0500\n" "Last-Translator: Kamil Paduszyński \n" "Language-Team: Polish \n" @@ -39,6 +39,10 @@ msgstr "Ikonka" msgid "Title" msgstr "Tytuł" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Nagłówek" @@ -175,10 +179,36 @@ msgstr "kod" msgid "display" msgstr "wyświetlaj" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "kolor tła" + #: admin_interface/models.py msgid "background color" msgstr "kolor tła" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "kolor tekstu" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "kolor linku" + #: admin_interface/models.py msgid "text color" msgstr "kolor tekstu" diff --git a/admin_interface/locale/pt_BR/LC_MESSAGES/django.po b/admin_interface/locale/pt_BR/LC_MESSAGES/django.po index 78169b0b..ad2c72fd 100644 --- a/admin_interface/locale/pt_BR/LC_MESSAGES/django.po +++ b/admin_interface/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,6 +38,10 @@ msgstr "Favicon" msgid "Title" msgstr "Título" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Cabeçalho" @@ -176,10 +180,36 @@ msgstr "código" msgid "display" msgstr "exibição" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "cor de fundo" + #: admin_interface/models.py msgid "background color" msgstr "cor de fundo" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "cor do texto" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "cor do link" + #: admin_interface/models.py msgid "text color" msgstr "cor do texto" diff --git a/admin_interface/locale/ru/LC_MESSAGES/django.po b/admin_interface/locale/ru/LC_MESSAGES/django.po index 03a31a31..1c2d438f 100644 --- a/admin_interface/locale/ru/LC_MESSAGES/django.po +++ b/admin_interface/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-23 16:28-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,6 +40,10 @@ msgstr "Иконка адресной строки" msgid "Title" msgstr "Заголовок" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Шапка" @@ -176,10 +180,36 @@ msgstr "код" msgid "display" msgstr "отображение" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "цвет заднего фона" + #: admin_interface/models.py msgid "background color" msgstr "цвет заднего фона" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "цвет текста" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "цвет ссылки" + #: admin_interface/models.py msgid "text color" msgstr "цвет текста" diff --git a/admin_interface/locale/tr/LC_MESSAGES/django.po b/admin_interface/locale/tr/LC_MESSAGES/django.po index 8ae3bba9..91b2766e 100644 --- a/admin_interface/locale/tr/LC_MESSAGES/django.po +++ b/admin_interface/locale/tr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django-admin-interface\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-10 18:20-0500\n" +"POT-Creation-Date: 2024-01-10 04:13-0600\n" "PO-Revision-Date: 2020-01-29 04:53+0300\n" "Last-Translator: Ishak Okutan \n" "Language-Team: \n" @@ -39,6 +39,10 @@ msgstr "Favicon" msgid "Title" msgstr "Başlık" +#: admin_interface/admin.py +msgid "Body" +msgstr "" + #: admin_interface/admin.py msgid "Header" msgstr "Üst Kısım" @@ -177,10 +181,36 @@ msgstr "kod" msgid "display" msgstr "görüntüle" +#: admin_interface/models.py +msgid "Default: #333 (required fields, error messages)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "background color" +msgid "foreground color" +msgstr "arka plan rengi" + #: admin_interface/models.py msgid "background color" msgstr "arka plan rengi" +#: admin_interface/models.py +msgid "Default: #666 (optional fields, help text, field content)" +msgstr "" + +#: admin_interface/models.py +#, fuzzy +#| msgid "text color" +msgid "quiet color" +msgstr "metin rengi" + +#: admin_interface/models.py +#, fuzzy +#| msgid "link color" +msgid "loud color" +msgstr "bağlantı rengi" + #: admin_interface/models.py msgid "text color" msgstr "metin rengi" From dd4c68700fad46d6ef06773fecfd32feb2f40ed1 Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Mon, 19 Aug 2024 11:53:18 +0200 Subject: [PATCH 6/8] fixup! feat: Extend help text for unclear css variables Removing the default values from help text --- .../0032_alter_theme_css_body_foreground_color_and_more.py | 4 ++-- admin_interface/models.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py b/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py index 5fdf7b52..0a3293fd 100644 --- a/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py +++ b/admin_interface/migrations/0032_alter_theme_css_body_foreground_color_and_more.py @@ -16,7 +16,7 @@ class Migration(migrations.Migration): field=colorfield.fields.ColorField( blank=True, default="#333", - help_text="Default: #333 (required fields, error messages)", + help_text="Required fields, error messages", image_field=None, max_length=10, samples=None, @@ -29,7 +29,7 @@ class Migration(migrations.Migration): field=colorfield.fields.ColorField( blank=True, default="#666", - help_text="Default: #666 (optional fields, help text, field content)", + help_text="Optional fields, help text, field content", image_field=None, max_length=10, samples=None, diff --git a/admin_interface/models.py b/admin_interface/models.py index 06e8e69d..bf8f6a8b 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -159,7 +159,7 @@ class Theme(models.Model): css_body_foreground_color = ColorField( blank=True, default="#333", - help_text=_("Default: #333 (required fields, error messages)"), + help_text=_("Required fields, error messages"), max_length=10, verbose_name=_("foreground color"), ) @@ -173,7 +173,7 @@ class Theme(models.Model): css_body_quiet_color = ColorField( blank=True, default="#666", - help_text=_("Default: #666 (optional fields, help text, field content)"), + help_text=_("Optional fields, help text, field content"), max_length=10, verbose_name=_("quiet color"), ) From 845e533b2bc94b0c2bc87ca8f441ee5333dd68dd Mon Sep 17 00:00:00 2001 From: Benjamin Mourgues Date: Mon, 19 Aug 2024 11:56:24 +0200 Subject: [PATCH 7/8] fixup! feat: Add help text translations --- .../locale/de/LC_MESSAGES/django.po | 4 ++-- .../locale/es/LC_MESSAGES/django.po | 4 ++-- .../locale/fa/LC_MESSAGES/django.po | 4 ++-- .../locale/fr/LC_MESSAGES/django.mo | Bin 4196 -> 4164 bytes .../locale/fr/LC_MESSAGES/django.po | 4 ++-- .../locale/it/LC_MESSAGES/django.po | 4 ++-- .../locale/pl/LC_MESSAGES/django.po | 4 ++-- .../locale/pt_BR/LC_MESSAGES/django.po | 4 ++-- .../locale/ru/LC_MESSAGES/django.po | 4 ++-- .../locale/tr/LC_MESSAGES/django.po | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin_interface/locale/de/LC_MESSAGES/django.po b/admin_interface/locale/de/LC_MESSAGES/django.po index 80f2750c..4628f077 100644 --- a/admin_interface/locale/de/LC_MESSAGES/django.po +++ b/admin_interface/locale/de/LC_MESSAGES/django.po @@ -178,7 +178,7 @@ msgid "display" msgstr "Anzeige" #: admin_interface/models.py -msgid "Default: #333 (required fields, error messages)" +msgid "Required fields, error messages" msgstr "" #: admin_interface/models.py @@ -192,7 +192,7 @@ msgid "background color" msgstr "Hintergrundfarbe" #: admin_interface/models.py -msgid "Default: #666 (optional fields, help text, field content)" +msgid "Optional fields, help text, field content" msgstr "" #: admin_interface/models.py diff --git a/admin_interface/locale/es/LC_MESSAGES/django.po b/admin_interface/locale/es/LC_MESSAGES/django.po index 26f34e7a..7c618e7b 100644 --- a/admin_interface/locale/es/LC_MESSAGES/django.po +++ b/admin_interface/locale/es/LC_MESSAGES/django.po @@ -179,7 +179,7 @@ msgid "display" msgstr "mostrar" #: admin_interface/models.py -msgid "Default: #333 (required fields, error messages)" +msgid "Required fields, error messages" msgstr "" #: admin_interface/models.py @@ -193,7 +193,7 @@ msgid "background color" msgstr "color de fondo" #: admin_interface/models.py -msgid "Default: #666 (optional fields, help text, field content)" +msgid "Optional fields, help text, field content" msgstr "" #: admin_interface/models.py diff --git a/admin_interface/locale/fa/LC_MESSAGES/django.po b/admin_interface/locale/fa/LC_MESSAGES/django.po index 8c312ca5..76ab28b1 100644 --- a/admin_interface/locale/fa/LC_MESSAGES/django.po +++ b/admin_interface/locale/fa/LC_MESSAGES/django.po @@ -177,7 +177,7 @@ msgid "display" msgstr "نمایش" #: admin_interface/models.py -msgid "Default: #333 (required fields, error messages)" +msgid "Required fields, error messages" msgstr "" #: admin_interface/models.py @@ -191,7 +191,7 @@ msgid "background color" msgstr "رنگ پسزمینه" #: admin_interface/models.py -msgid "Default: #666 (optional fields, help text, field content)" +msgid "Optional fields, help text, field content" msgstr "" #: admin_interface/models.py diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.mo b/admin_interface/locale/fr/LC_MESSAGES/django.mo index 3e512d4280530b04056dce94e19d99d8e8c2dc3a..adf1ac92984dc3872b95a151851148a05bbfe977 100644 GIT binary patch delta 1238 zcmXxiOGs2v9LMov&cnydm_24jjA_i!F)=H(6iJe1T-ZXAFbV>pf)>&udq5(0kv)c7 zlxI;cEL;^4xR_lbWVEV<1cDH>>H!raEiy<5`u^^mE_3hap8uVD{{Qp8=X3f^`rZjI zW{l|#8M7S+u^LA)jAO{pT;>wR31{BLAK+%pqjo&d<|Jwb=dd2fuo3TIf0;4QQ5{+1eP6 zH_eR-SU~N8B~$^cs6<~-pP-0p?JrcTV^l*f(|~GqD|X=#RHCb>M7L0#x{F8gF>0Pq zNM6tUb%7eP?&CoV>V?y~P8TtRhW(s=_DjPs}o=TRMbi78w~E$BC@kO(_Y^VFgW zuk+>mH@XLHsLH!g6X#G9oNVV@K%$50Oa~`B)Iao1bo7+)KmPv-(=OJ8hix&C=vQakI5V7k zIdy0a2mHIzMPIj@ld}EwsCn8tYU)9o3$|BkL$NJP!cGQX*(agJvLQPW%Gk5v_OfAn eER-tT5BCLZHu7^OlC_=D0lQqizi>VJebYaEk8G*{ delta 1296 zcmXxkOGs2v9LMovjgIEbn3a#oh+Fm;%V$%Q4-~}7BIvQus8$Md4apE^(m;@bFer$K zF40O{sFWZC8Ig-Xp+!j0LTXVI^x7CvQP3iSzQ38%#dAOBap(Nc`JaPNolnlqu5_I- zrX|mqCOnTJoWT-&h=sU}etd=enRmQ`_}Ti?_UG`?diwKm4~9{{kE0JyqUP^LeV6c? zbf#mN4ox_Y0lbB|IEe~4W7~7K{Qxz=0+!-3Zou~##$UJzL;2ajm8kh5$dIYE#`4qI zjy5{9fKJrJT~-&1X^-GKylVSB+(>&GwX?@|{E77$7SO+9$KT>X+8()Gy)ze2EHN$Rr9}fy$hN z{61~=Q&GU<*$&fVKNv*?x`7IO8lBvJo<%KW36+sIxD|h+Hc-lqQ{ZaUJPoLY zHf7}eJM6$Q)JnTi6T7Gh#;l$lpG5^+K&5&G6<`&KX}%%JG=HrHOuCkK2_D5TYQqT( z^-vk1q7`4kEjW$kxP-cluTeYyg4*E^)J}p7>I_S8FE%1qAoIj{YZFCYjjy7ZTbFs- ztYPnrFIud{w%8sK@Fsj^O^O($==SNU&yx8Ep@Y`p>HzgPnK##1dS88I?b>(^B|@pC z=ux)!Wop@%lG;d760{#BPgi9(rPVu>TUU^|!L-V~vE0SBzTV-1i_K1DG#YgxNq1 Date: Fri, 27 Sep 2024 15:23:08 +0200 Subject: [PATCH 8/8] fixup! feat: Add help text translations --- .../locale/fr/LC_MESSAGES/django.mo | Bin 4164 -> 4149 bytes .../locale/fr/LC_MESSAGES/django.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.mo b/admin_interface/locale/fr/LC_MESSAGES/django.mo index adf1ac92984dc3872b95a151851148a05bbfe977..32aa1a9d78ccc0fe8ee575e0e8c32a6c4b84faa6 100644 GIT binary patch delta 507 zcmXZZEl2}#7{~Ev=jNE(ZBysVQ0B2Kxj68p%q|9-hQVRd zAj4oXi@_u(DAagp5Jr#;N5ub1t&?!sId)P;~gdb}xG*KC8ZFW!ZGCM}G}^@y1fg_s5{*kgfQaBAzKnIy3J#J%QHtH1T$GMZ z3c*Du(Mbn!>f|I2BHgUuAov`c>34H4_x#Vfxpp7iD?c6>B65@z8OIuC@Dls+4lQh8 z0^hLV+lL z;4*3>73{>l$bB5-yNY_hjzf5hBiKM4=o_^W({9(v*g?B56`#v9bh zpHL@!L4A=X>Mv}ehuP3E$_Zn3b8R=QCC_4M|NdfQrLsNk<_d*^JF$A=S);LhSh7Cj Ee=b8gP5=M^ diff --git a/admin_interface/locale/fr/LC_MESSAGES/django.po b/admin_interface/locale/fr/LC_MESSAGES/django.po index 442d0bde..faec81f4 100644 --- a/admin_interface/locale/fr/LC_MESSAGES/django.po +++ b/admin_interface/locale/fr/LC_MESSAGES/django.po @@ -40,7 +40,7 @@ msgstr "Titre" #: admin_interface/admin.py msgid "Body" -msgstr "Body" +msgstr "Corps" #: admin_interface/admin.py msgid "Header" @@ -180,7 +180,7 @@ msgstr "affichage" #: admin_interface/models.py msgid "Required fields, error messages" -msgstr "Défaut: #333 (champs requis, messages d'erreur)" +msgstr "Champs requis, messages d'erreur" #: admin_interface/models.py msgid "foreground color"