From 464754f5d359ace8cf54249b0a9cc9e048971bc8 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Thu, 20 Mar 2025 15:29:38 +0100 Subject: [PATCH] FIxes in i18n for use gettext --- paramecio/libraries/check_i18n.py | 7 +- paramecio/modules/admin2/app.py | 6 +- paramecio/modules/admin2/ausers.py | 13 +- paramecio/modules/admin2/libraries/config.py | 4 +- .../modules/admin2/templates/layout.phtml | 18 +-- .../modules/admin2/templates/layout_bs.phtml | 123 ------------------ 6 files changed, 30 insertions(+), 141 deletions(-) delete mode 100644 paramecio/modules/admin2/templates/layout_bs.phtml diff --git a/paramecio/libraries/check_i18n.py b/paramecio/libraries/check_i18n.py index 0f64e66..22ba1d8 100644 --- a/paramecio/libraries/check_i18n.py +++ b/paramecio/libraries/check_i18n.py @@ -42,11 +42,14 @@ def start(): path_save=args.module+'/i18n' + if args.module.endswith('/'): + args.module=args.module[:-1] + module_base=os.path.basename(args.module) - lang_p=re.compile(r"I18n\.lang\('("+module_base+"?)',\s+'(.*?)',\s+'(.*?)'\)") + lang_p=re.compile(r"I18n\.lang\('({}?)',\s+'(.*?)',\s+'(.*?)'\)".format(module_base)) #lang_t=re.compile("\${lang\('("+module_base+"?)',\s+'(.*?)',\s+'(.*?)'\)\}") - lang_t=re.compile(r"lang\('("+module_base+"?)',\s+'(.*?)',\s+'(.*?)'\)") + lang_t=re.compile(r"lang\('({}?)',\s+'(.*?)',\s+'(.*?)'\)".format(module_base)) lang_s=re.compile(r"slang\('(.*?)',\s+'(.*?)'\)") diff --git a/paramecio/modules/admin2/app.py b/paramecio/modules/admin2/app.py index 0c4a5b2..9e3c3de 100644 --- a/paramecio/modules/admin2/app.py +++ b/paramecio/modules/admin2/app.py @@ -1,6 +1,6 @@ #from paramecio import wsgi_app -from paramecio.libraries.i18n import I18n +from paramecio.libraries.i18n import I18n, PGetText from paramecio.libraries.mtemplates import env_theme, PTemplate from paramecio.modules.admin2.models.admin import UserAdmin2, LoginTries2, PrivilegesModule2 from paramecio.libraries.db.webmodel import WebModel @@ -28,6 +28,10 @@ admin_app.install(check_login) env=env_theme(__file__) t=PTemplate(env) +gtext=PGetText(__file__) + +_=gtext.gettext + usermodel=UserAdmin2() usermodel.create_forms() diff --git a/paramecio/modules/admin2/ausers.py b/paramecio/modules/admin2/ausers.py index 708becc..ebe8d00 100644 --- a/paramecio/modules/admin2/ausers.py +++ b/paramecio/modules/admin2/ausers.py @@ -2,7 +2,7 @@ from paramecio.modules.admin2.models.admin import UserAdmin2 from paramecio.modules.admin2.app import admin_app from paramecio.modules.admin2.libraries.config import modules_admin, modules_admin_icons from paramecio.libraries.mtemplates import PTemplate, env_theme -from paramecio.libraries.i18n import I18n +from paramecio.libraries.i18n import I18n, PGetText import paramecio.modules.admin2.libraries.i18n as i18n_lang import os #from paramecio.libraries.lists import SimpleList @@ -23,6 +23,11 @@ t=PTemplate(env) i18n=I18n('admin2') +gtext=PGetText(__file__) + +_=gtext.gettext + + #t.env.directories=admin_t.env.directories """ tpl_path=os.path.dirname(__file__).replace('/admin', '')+'/templates/admin' @@ -32,9 +37,9 @@ if t.env.directories[1]!=tpl_path: """ #modules_admin.append(['menu_users', 'people-circle', True]) -modules_admin.append(['admin_app.admin_users', 'people-circle', ['admin_app.admin_permissions']]) +modules_admin['admin_app.admin_users']=[_('Admin users'), 'people-circle', ['admin_app.admin_permissions']] -modules_admin_icons.append('') +modules_admin_icons['admin_app.admin_users']='' @admin_app.get('/ausers', name="admin_app.admin_users") @admin_app.post('/ausers', name="admin_app.admin_users") @@ -104,7 +109,7 @@ def admin_permissions(user_id, session={}): priv.fields['module'].name_form=SelectForm - arr_modules={v[0]:i18n.clang('admin2', v[0], v[0]) for v in modules_admin} + arr_modules={k:v[0] for k, v in modules_admin.items()} priv.fields['user_id'].name_form=HiddenForm diff --git a/paramecio/modules/admin2/libraries/config.py b/paramecio/modules/admin2/libraries/config.py index b362ec3..6876eac 100644 --- a/paramecio/modules/admin2/libraries/config.py +++ b/paramecio/modules/admin2/libraries/config.py @@ -4,7 +4,7 @@ # ['Name of module admin', 'name_function_for_url_for', 'xml-icon'] -modules_admin=[] +modules_admin={} -modules_admin_icons=[] +modules_admin_icons={} diff --git a/paramecio/modules/admin2/templates/layout.phtml b/paramecio/modules/admin2/templates/layout.phtml index 6be8e40..9a42750 100644 --- a/paramecio/modules/admin2/templates/layout.phtml +++ b/paramecio/modules/admin2/templates/layout.phtml @@ -44,7 +44,7 @@ lang_selected=session['lang'] - %for module_icon in modules_admin_icons: + %for module_icon in modules_admin_icons.values(): ${module_icon|n} @@ -77,18 +77,18 @@ lang_selected=session['lang']