From d3dbbcb2422661c010e247d7e89284fc8df33564 Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Sun, 29 Jun 2025 18:50:33 +0300 Subject: [PATCH] Features: 1) Update Russian translation for "balances" in `payments/locale/ru_RU/LC_MESSAGES/django.po`; 2) Enable UI builder in Jazzmin settings; 3) Add "uuid" to `readonly_fields` in both `blog/admin.py` and `core/admin.py`; Fixes: 1) Correct Russian translation for "balances" in locale files; 2) Fix mismatch in Jazzmin `site_brand` configuration to use project name; Extra: Refactor locale files, add missing translation updates, and adjust formatting; --- blog/admin.py | 2 +- core/admin.py | 2 +- core/locale/ru_RU/LC_MESSAGES/django.mo | Bin 63526 -> 63501 bytes core/locale/ru_RU/LC_MESSAGES/django.po | 14 +++++++------- evibes/settings/jazzmin.py | 4 ++-- payments/locale/ru_RU/LC_MESSAGES/django.mo | Bin 2795 -> 2801 bytes payments/locale/ru_RU/LC_MESSAGES/django.po | 2 +- vibes_auth/locale/ru_RU/LC_MESSAGES/django.mo | Bin 10519 -> 10519 bytes vibes_auth/locale/ru_RU/LC_MESSAGES/django.po | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blog/admin.py b/blog/admin.py index 62ba02e5..d9dab0b1 100644 --- a/blog/admin.py +++ b/blog/admin.py @@ -14,7 +14,7 @@ class PostAdmin(SummernoteModelAdminMixin, FieldsetsMixin, BasicModelAdmin): filter_horizontal = ("tags",) date_hierarchy = "created" autocomplete_fields = ("author", "tags") - readonly_fields = ("slug",) + readonly_fields = ("uuid", "slug",) summernote_fields = ("content",) general_fields = [ diff --git a/core/admin.py b/core/admin.py index 2cf69f34..e87715d7 100644 --- a/core/admin.py +++ b/core/admin.py @@ -217,7 +217,7 @@ class BrandAdmin(FieldsetsMixin, BasicModelAdmin): list_display = ("name",) list_filter = ("categories", "is_active") search_fields = ("uuid", "name", "categories__name") - readonly_fields = ("uuid", "modified", "created") + readonly_fields = ("uuid", "slug", "modified", "created") general_fields = ["is_active", "name", "description"] relation_fields = ["small_logo", "big_logo", "categories"] diff --git a/core/locale/ru_RU/LC_MESSAGES/django.mo b/core/locale/ru_RU/LC_MESSAGES/django.mo index 2bc8cb1b1ae799bc9eebcb751341334fcffcdb92..c667aa90f5bd91a25fcc6841f4a47bd972d38d23 100644 GIT binary patch delta 3069 zcmYM#dsNPM9Ki8Uhnlc@jWpJv{h zm?pOW66;A!;K4PViUZO`nqx6)N2*X8erCm9876Lz+JSd1ldb$N3@2Y<#qMiG8W6X_ zy4V8;Va!^aX&{@#I1)wJ1pP8af-xN3Fu{taVIc83jKWgX5!U(Ayzh$|&qM9lN?e48 zus24n6L}MtV+0w43X*HAmq8G~>z>e76QBXAMU!7JFoMP$?l)8NXDW(l(J zGoDwXj&#^2k*%131?Z6_G6YLe+p&3lCDMmN2h_Ehjgznh7hv0L(~*1(CBA^V#vYq_ z2iss<9D`xF0!y$Awc%x3MChY*`dXwBR-*2eTR4mMr75)nNTj1yD6-;8Odx)SF*y1g zk%qVnTjNn&fDch;W_FH9f2>4pz;~NSJPyLQ(2nd^d4Re^3%{jPv@dBCwBm7$##Y-! zPT_2H#poR(V=)%%;Xdq%WvEl=@tsI}492PWKDN^5sC(oo>SpWxy?HOq@-&9izIg34 z4~F7M;xsFMVA;XW4kw?4o_HAbG*n_2tVZ44!Mk)sY%E-kN$7_)b2;J|fI8C=*aF9+ z?R5$%R$>Q65Lcisg=e0*4+7Ag_#M;^4o8+%@^CuF<+D6khQqN9JFPCx$3RR&?Qk*b zjGedQrv=Qv4~d4m&2bCGuEZly8(f8xag&wz_`$4wUz|%m5nEz4>d3tJn3;&cF2qBy zBQC}d@gVB|2JbbeuJc~zzd4EiBvNn^_QyvUhduV0O|}*@hz_qF!XymADjbgP$IZ839O?j$qUJ-(%*-rAjh#4!_9f_qNn}{w z#Z2;j%FXVt!ga(0D@0Q9re%`D#4qp@@~KW!-{qva>p#XE@&T11teTW#7A`ww4E=@q z*Mx(DR-AU)jIi+;E+yhb)RCs5?ukmIirhmVJo2mgHe5ozm};FhdRqo!Ecwouh0D+l zL(iF|>~@a%*IgP(A`;^;2(!=!kD*>rSFsMdo;T;;84)ck%@R4M`7$GGx7q|7yrTT7D1L$3fs0l=_ptfMxhsl$*417N1cHZoQbzE6vzH9!iP&%VPg!x zZZ=&kW)siHu^9M=`M#&(7~+dK413-%$1fedi7Rjt+HO#2Phr?i^I{4PB0i7Wu{O8N zR8B?h;8pa(M_3=-Z=26;GYlXejN0K@s14=dcr3vN*z!*mt2!6wZ7Y86QhSp#nd(LS?0H)b%=D?XfqyS_>~W^#g`K_a`!C2Ye$D^@ delta 3080 zcmY+`dtA;}9Ki9D_EIw-lgVBw z<&v&cYxF{I3_@2NiN2VCgE1Z5@jQCqpBRF!UnfO-N8B%Q%USaH|(6HR5yG9TVb3L&qP1s3>=CUlo>v`Mt|M~CH@d)V9RkS zmg4{%xR%aw8HVFw6O9fuTCCFp>4Y+X5cJ1kD5ZH1V=)!y;{|-qMyavcy2It`bqUsB z3eRg$W*W6YsXUCsJ!qGsR18{B`Y}0fWK=W)QEHQn3Ai5@p?|I($PNr9K8sRgyG;xL z{V)h8U?2PxE3pct^0&Vj3>T}(KvpK zQXR1XyJICT!doaSlf0FBVhu_MF58rvghTNq%t!XCx`|Svh51VLq<>|mAuk@m;pkJK z)M-pcdyM>AsVO)D9dS2CU=_*|+HF@V6umJCM`M6IN7*CID4VU{4*fZ^p%wemzj7?p z4~FAJVzUw7Gz=`Fj^q>30V_~WLk;%AMwH#{y;EkSR2Z5u5k2v5bU}|@dZoj#3-Kg0 z`Oru)5_uR-T#Zr+`(k|`cwlSd0Vo5EM#`$TV=|81%?86N9D{!Bw05`v{m_gu;C(17 zR%gV`dsu&05^eYD5@oV@z zF2Xml4CQ;hOZBM>DP{e=NW4N~3C80Pyp7|qcbVQ~U*IZYm;HJsMHoVS0%eap#`b7m zu1n;GGUEW06^O)cn1o@t2BqIqCK@vG`$odeqL-*2b|fE*@&)gpbg&A8F(0Ld^(X^* zgmD;Dp^v8-r38f-ga=VRf5))J0li609cjpe2<(J0=!S0@F2+{GxhThRJN7}RgZkcx z#!TW&l$ixq>J^N~^~5_d7NZa8=lLj`^$Jotllp^31PPDBx~6d`OMMAv;M{MN`dDI= z+D$#8uh1lvf#;*Fh{f<0O3mG?bbh2^s^Kn7;CTav%lVJ`RxjB~lw-347hw2NeU(}; zgSdY+*DcmzBnE!RD&ZV_7BAx%bU3De3#Ow?pc*9~dR(u}Qk3`sWtD zoTMQyCZEwWeEO_X&cw4(X1W4pPt+l=sAhD8W#iGj~RbBXBH6VGeG= zRv1~YOBqwo`pYhjBQY3fp+Ak59P!F*!dY#wjKNM#ZzmD(XNxX;yFX)N*{HXIa zIE#D)4~O9{jK;?}9-}X@{^MvATvBQ#KJgP@ib*IlKY{W==gZvRI1NW(F3JEN7;!>_ zeyrn)Kt0Yy+n@C={s6ZT7hq=` zeNAt=B+Mnw#wi$aUH`ss!pX!Ba5To=(8sS3U5IaB0-9`o(Z61a7(*flN8mk_ferdq zFXb|n0X{@$Y}2TZUsvow9EM$SCI;i@C>>SeG^|G_?0=JII0`9+NnN8MCFpgFjfQFH zhVHlZ715JzC{==aD5v3#CZ#^XGbry(Xx5vt6yu2ZHn7?wobMywC=85XssyrO@HX$W`i_Id~7YNO-=7!KFPs);D4#~^5*nI zTiZMS_r=B5l3H_dw&gDyo3!HG19M$HH(JZA`>jQMQ3|aR>mE-U6}2g~sr)rtEyZ2V HH9qqXM(2ZH diff --git a/core/locale/ru_RU/LC_MESSAGES/django.po b/core/locale/ru_RU/LC_MESSAGES/django.po index e496d6da..586b7591 100644 --- a/core/locale/ru_RU/LC_MESSAGES/django.po +++ b/core/locale/ru_RU/LC_MESSAGES/django.po @@ -134,7 +134,7 @@ msgstr "Конфигурация" #: core/apps.py:8 msgid "core" -msgstr "Ядро" +msgstr "Главное" #: core/choices.py:4 core/choices.py:20 msgid "finished" @@ -1125,7 +1125,7 @@ msgstr "URL-адрес изображения" #: core/graphene/object_types.py:356 msgid "product's images" -msgstr "Изображения продукта" +msgstr "Изображения товара" #: core/graphene/object_types.py:363 core/models.py:256 core/models.py:331 msgid "category" @@ -1165,7 +1165,7 @@ msgstr "Количество отзывов" #: core/graphene/object_types.py:388 core/models.py:393 msgid "products" -msgstr "Продукция" +msgstr "Товары" #: core/graphene/object_types.py:436 msgid "promocodes" @@ -1177,7 +1177,7 @@ msgstr "Продукты в продаже" #: core/graphene/object_types.py:453 core/models.py:591 msgid "promotions" -msgstr "Акции" +msgstr "Промоакции" #: core/graphene/object_types.py:457 core/models.py:119 msgid "vendor" @@ -1189,7 +1189,7 @@ msgstr "Поставщик" #: core/templates/shipped_order_created_email.html:107 #: core/templates/shipped_order_delivered_email.html:107 msgid "product" -msgstr "Продукт" +msgstr "Товар" #: core/graphene/object_types.py:469 core/models.py:661 msgid "wishlisted products" @@ -1590,7 +1590,7 @@ msgstr "Продукт, который представлен на этом из #: core/models.py:559 msgid "product images" -msgstr "Изображения продуктов" +msgstr "Изображения товаров" #: core/models.py:567 msgid "percentage discount for the selected products" @@ -1678,7 +1678,7 @@ msgstr "Цифровой файл" #: core/models.py:651 msgid "stock entries" -msgstr "Складские состояния" +msgstr "Наличия" #: core/models.py:660 msgid "products that the user has marked as wanted" diff --git a/evibes/settings/jazzmin.py b/evibes/settings/jazzmin.py index d3f59279..3304d483 100644 --- a/evibes/settings/jazzmin.py +++ b/evibes/settings/jazzmin.py @@ -6,7 +6,7 @@ from evibes.settings.constance import CONSTANCE_CONFIG JAZZMIN_SETTINGS = { "site_title": f"{CONSTANCE_CONFIG.get('PROJECT_NAME')[0]} Admin", # type: ignore "site_header": str(CONSTANCE_CONFIG.get("PROJECT_NAME")[0]), # type: ignore - "site_brand": str(CONSTANCE_CONFIG.get("COMPANY_NAME")[0]), # type: ignore + "site_brand": str(CONSTANCE_CONFIG.get("PROJECT_NAME")[0]), # type: ignore "site_logo": "logo.png", "login_logo": "logo.png", "login_logo_dark": "logo.png", @@ -41,7 +41,7 @@ JAZZMIN_SETTINGS = { "default_icon_children": "fas fa-circle", "related_modal_active": False, "use_google_fonts_cdn": True, - "show_ui_builder": False, + "show_ui_builder": True, "changeform_format": "horizontal_tabs", "language_chooser": True, } diff --git a/payments/locale/ru_RU/LC_MESSAGES/django.mo b/payments/locale/ru_RU/LC_MESSAGES/django.mo index 19bd0d569905d92851203b0f61a76456a8b7472d..43da9bb11bf89662366c70cdeb5a00470fdebdfb 100644 GIT binary patch delta 169 zcmaDY`cZVkpL#w928MTR3=F|Q`Y({S1JZ%)3=AOg2|(HkNY4k-3PAc6kX8iJzk&2l zAT7%QQFk3kgVa5P@)bE5803L`10XE|qyvC-2aryM^4|gJ6+k{S7tk7zMQgYi7)*im Z?#-QyX{?+RFKoE58;JLA{>1i^832+r9ufcm delta 163 zcmew;`dW0tpLz}k28MTR3=F|Q`a6)e1Jd5?3=Digx(i5K0qL1QS^-F30n&;<`YVv$ z38ck=nnCI=0%?%C2T;B=Cj)~#kgo-#MS!#yknRA|@lgH?AiV;}|H}!~4l-aF7XyPS WklwnvlQE5zdD4Zgn}4wVWCj4P5^cW3gG|% delta 21 dcmbOpG(BiTs65AoZ5Os)Y`U;-bFBO>P5^d}3f%wz diff --git a/vibes_auth/locale/ru_RU/LC_MESSAGES/django.po b/vibes_auth/locale/ru_RU/LC_MESSAGES/django.po index b5400313..b2c7d8a3 100644 --- a/vibes_auth/locale/ru_RU/LC_MESSAGES/django.po +++ b/vibes_auth/locale/ru_RU/LC_MESSAGES/django.po @@ -274,7 +274,7 @@ msgstr "Выдающийся жетон" #: vibes_auth/models.py:124 msgid "outstanding tokens" -msgstr "Выпущенные жетоны" +msgstr "Выпущенные токены" #: vibes_auth/models.py:130 msgid "blacklisted token"