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 4a227a7..f5bf787 100644 Binary files a/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.mo and b/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.mo differ diff --git a/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.po b/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.po index 36e622c..ba10a09 100644 --- a/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.po +++ b/paramecio2/modules/admin/languages/es-ES/LC_MESSAGES/admin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-18 20:47+0100\n" -"PO-Revision-Date: 2023-12-18 20:53+0100\n" +"POT-Creation-Date: 2023-12-19 15:30+0100\n" +"PO-Revision-Date: 2023-12-19 15:32+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: es\n" @@ -57,11 +57,11 @@ msgstr "Sí" msgid "Light theme" msgstr "Tema claro" -#: admin/ausers.py:44 +#: admin/ausers.py:44 templates/dashboard.phtml:110 msgid "Dark theme" msgstr "Tema oscuro" -#: admin/ausers.py:63 +#: admin/ausers.py:63 settings/config_admin.py:11 msgid "Users edit" msgstr "Editar usuarios" @@ -79,6 +79,10 @@ msgid "" msgstr "" "Te enviaremos un código para activr tu cuenta usando doble autenticación" +#: settings/config_admin.py:9 +msgid "Users" +msgstr "Usuarios" + #: templates/modules.phtml:3 msgid "Add new module" msgstr "Añadir nuevo módulo" diff --git a/paramecio2/modules/admin/settings/config_admin.py b/paramecio2/modules/admin/settings/config_admin.py index 6e942be..6262003 100644 --- a/paramecio2/modules/admin/settings/config_admin.py +++ b/paramecio2/modules/admin/settings/config_admin.py @@ -1,8 +1,11 @@ from paramecio2.libraries.config_admin import config_admin -from paramecio2.libraries.i18n import I18n +#from paramecio2.libraries.i18n import I18n, PGetText #modules_admin=[[I18n.lang('admin', 'users_admin', 'User\'s Admin'), 'paramecio.modules.admin.admin.ausers', 'ausers']] +#pgettext=PGetText(__file__+'/../') +#_=pgettext.gettext + config_admin.append([_('Users')]) config_admin.append([_('Users edit'), 'paramecio2.modules.admin.admin.ausers', 'admin_app.ausers', 'fa-user'])