From 16f16788845187e161a4ee87654da7c7769edf3b Mon Sep 17 00:00:00 2001 From: absurdo Date: Tue, 19 Dec 2023 15:33:12 +0100 Subject: [PATCH] Fixes in language --- paramecio2/libraries/generate_admin_class.py | 22 +++++++++++++++--- paramecio2/modules/admin/__init__.py | 1 - paramecio2/modules/admin/admin/ausers.py | 2 +- .../languages/es-ES/LC_MESSAGES/admin.mo | Bin 2112 -> 2143 bytes .../languages/es-ES/LC_MESSAGES/admin.po | 12 ++++++---- .../modules/admin/settings/config_admin.py | 5 +++- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/paramecio2/libraries/generate_admin_class.py b/paramecio2/libraries/generate_admin_class.py index 03a9bd3..114458a 100644 --- a/paramecio2/libraries/generate_admin_class.py +++ b/paramecio2/libraries/generate_admin_class.py @@ -3,17 +3,22 @@ from flask import request, redirect, flash from paramecio2.libraries.urls import add_get_parameters #from paramecio.citoplasma.mtemplates import set_flash_message from paramecio2.libraries.formsutils import show_form +from paramecio2.libraries.mtemplates import env_theme, PTemplate from paramecio2.libraries.i18n import I18n, PGetText from collections import OrderedDict pgettext=PGetText(__file__) _=pgettext.gettext +#env=env_theme(__file__) + +#t=PTemplate(env) + class GenerateAdminClass: """Class for insert, update and list items of a model """ - def __init__(self, model, url, t): + def __init__(self, model, url, t=None): """A class for generate forms, insert and update items from a database model For an easy and fast access to database data, you can use this class for get a simple database model of paramecio and get list of items, add forms, edit forms and more. @@ -41,9 +46,20 @@ class GenerateAdminClass: self.model=model - self.t=t + if t: + + self.t=t + else: + + env=env_theme(__file__) - self.list=SimpleList(model, url, t) + self.t=PTemplate(env) + + #self.t.l=pgettext + + #self.t.add_filter(self.t._) + + self.list=SimpleList(model, url, self.t) self.arr_fields_edit=list(model.fields.keys()) diff --git a/paramecio2/modules/admin/__init__.py b/paramecio2/modules/admin/__init__.py index 0341fa8..bf4f1e8 100644 --- a/paramecio2/modules/admin/__init__.py +++ b/paramecio2/modules/admin/__init__.py @@ -4,7 +4,6 @@ try: admin_app=Blueprint('admin_app', __name__, static_folder='static') - env=env_theme(__file__) t=PTemplate(env) diff --git a/paramecio2/modules/admin/admin/ausers.py b/paramecio2/modules/admin/admin/ausers.py index 702cb15..ac42887 100644 --- a/paramecio2/modules/admin/admin/ausers.py +++ b/paramecio2/modules/admin/admin/ausers.py @@ -48,7 +48,7 @@ def ausers(): url=url_for('admin_app.ausers') - admin=GenerateAdminClass(user_admin, url, t) + admin=GenerateAdminClass(user_admin, url) admin.list.fields_showed=['username'] diff --git a/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.mo b/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.mo index 4a227a740926b1fa61c905e0375f719606ac5656..f5bf787093acf2feba61bac6e18a05f22424ca9f 100644 GIT binary patch delta 585 zcmXZZKP&@b9LDkY>Z*;lR8cJ*R71lcK|~0XNCcClOFNmwR5W6&L}C$xoQ@I(dy~ds zA`HSv8UtZy3=*+OSP0*z`X+au_ujkv{dwQ>;Bzql6tWA35vyI_*u(W`abv8wjA_JG zbmJxla2x%&kMnqhHojv!eqaOo>WrDfFt%bE@sKk?~!e+1o3#fQSB!s!dFY=o!CT%R7@wWn$xhe1iD)1|2 z@Dn|_Q2)PMX`}oW%<2_y%~X^*L0B8LXXRwQy~}c0$dmFb(I;^1F3j5$DHBSTQH=N(Pi% oLsfT{Qm%W;>9ub?V_kzIExST7PIK`s`P#AGmV z%nZ8K)QGJlW*Z@~`2MsndGGV?<=*f8e($}y4{q4bS*Jqt>BIC-`Z&F5FwknINI%vw ziQDMlE~arGSMdZbY~vulV=w;V5~dO&16ajT+`vAOQ1+Pcj~rqKk1>nqn8TaydIQJ! ze#SihpeB;$R87P~JupB`sEi(lsBzAaEpmn5c#Q?lmrKgh%I+C7U;{N^3)k@tZLFj^ zH?)joE_GbNEi7V;0Y0H7@`YNMZq~vQsEOop2q!RGW3s@cglnjQc2FxkLKiPk1KeU2 zA5otw)6-d>M6IlX-B