paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I18n based in gettext #3

Merged
absurdo merged 4 commits from i18n into master 2025-03-20 23:59:10 +00:00
Conversation 0 Commits 4 Files changed 22 +21 -14
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 921022cf98 - Show all commits

14
paramecio/libraries/generate_admin_class.py
View file

@ -84,13 +84,13 @@ class GenerateAdminClass:
post=None post=None
title_edit=I18n.lang('common', 'add_new_item', 'Add new item') title_edit=_('Add new item')
pass_value=False pass_value=False
if getpostfiles.get['id']!='0': if getpostfiles.get['id']!='0':
post=self.model.select_a_row(getpostfiles.get['id'], [], True) post=self.model.select_a_row(getpostfiles.get['id'], [], True)
title_edit=I18n.lang('common', 'edit_new_item', 'Edit item') title_edit=_('Edit item')
pass_value=True pass_value=True
if post==None or post==False: if post==None or post==False:
@ -124,19 +124,19 @@ class GenerateAdminClass:
getpostfiles.get['id']='0' getpostfiles.get['id']='0'
title_edit=I18n.lang('common', 'add_new_item', 'Add new item') title_edit=_('Add new item')
if getpostfiles.get['id']!='0': if getpostfiles.get['id']!='0':
insert_row=self.model.update insert_row=self.model.update
title_edit=I18n.lang('common', 'edit_new_item', 'Edit item') title_edit=_('Edit item')
self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]] self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]]
if self.pre_update: if self.pre_update:
getpostfiles.post=self.pre_update(self, getpostfiles.post) getpostfiles.post=self.pre_update(self, getpostfiles.post)
if insert_row(getpostfiles.post): if insert_row(getpostfiles.post):
set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) set_flash_message(_('Task successful'))
if self.post_update: if self.post_update:
if getpostfiles.get['id']=='0': if getpostfiles.get['id']=='0':
@ -162,7 +162,7 @@ class GenerateAdminClass:
if getpostfiles.get['id']!='0': if getpostfiles.get['id']!='0':
self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]] self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]]
self.model.delete() self.model.delete()
set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) set_flash_message(_('Task successful'))
redirect(self.url_redirect) redirect(self.url_redirect)
else: else:
@ -261,7 +261,7 @@ class GenerateConfigClass:
insert_model=self.model.update insert_model=self.model.update
if insert_model(getpostfiles.post): if insert_model(getpostfiles.post):
set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) set_flash_message(_('Task successful'))
self.model.yes_reset_conditions=True self.model.yes_reset_conditions=True
if self.post_update: if self.post_update:

2
paramecio/libraries/mtemplates.py
View file

@ -462,7 +462,7 @@ def set_flash_message(message):
s['flash']=message s['flash']=message
#s.save() s.save()
def qf(text): def qf(text):

8
paramecio/modules/admin2/app.py
View file

@ -189,15 +189,15 @@ def check_login_admin(session={}):
with db.query('select module from privilegesmodule2 WHERE user_id=%s', [result['id']]) as cursor: with db.query('select module from privilegesmodule2 WHERE user_id=%s', [result['id']]) as cursor:
modules_priv=[v['module'] for v in cursor.fetchall()] modules_priv=[v['module'] for v in cursor.fetchall()]
for v in modules_admin: for k, v in modules_admin.items():
if v[0] in modules_priv: if k in modules_priv:
if len(v)>2: if len(v)>2:
modules_priv+=v[2] modules_priv+=v[2]
else: else:
modules_priv=[] modules_priv=[]
for v in modules_admin: for k, v in modules_admin.items():
modules_priv.append(v[0]) modules_priv.append(k)
if len(v)==3: if len(v)==3:
modules_priv+=v[2] modules_priv+=v[2]

9
paramecio/modules/admin2/ausers.py
View file

@ -113,7 +113,14 @@ def admin_permissions(user_id, session={}):
priv.fields['module'].name_form=SelectForm priv.fields['module'].name_form=SelectForm
arr_modules={k:v[0] for k, v in modules_admin.items()} #arr_modules={k:v[0] for k, v in modules_admin.items()}
arr_modules={}
for k, v in modules_admin.items():
if type(v[0]).__name__=='function':
arr_modules[k]=v[0]()
else:
arr_modules[k]=v[0]
priv.fields['user_id'].name_form=HiddenForm priv.fields['user_id'].name_form=HiddenForm

2
paramecio/modules/admin2/templates/layout.phtml
View file

@ -118,7 +118,7 @@ lang_selected=session['lang']
</div> </div>
</div> </div>
<div class="content"> <div class="content">
${show_flash_message()|n}
<%block name="content"> <%block name="content">
</%block> </%block>
</div> </div>