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

Fixes in language for use gettext

Browse source
This commit is contained in:
Antonio de la Rosa 2024-04-03 18:31:28 +02:00
parent 6ac7e7598a
commit 283d5249dc
7 changed files with 158 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

82
admin/dashboard.py
View file

@ -1,7 +1,7 @@
from settings import config
from flask import g, url_for, request, session, make_response
from paramecio2.libraries.generate_admin_class import GenerateAdminClass
from paramecio2.libraries.i18n import I18n
from paramecio2.libraries.i18n import I18n, PGetText
from paramecio2.modules.admin import admin_app, t as admin_t
from paramecio2.libraries.db.coreforms import SelectForm, SelectModelForm, HiddenForm
from paramecio2.libraries.mtemplates import PTemplate, env_theme
@ -33,6 +33,10 @@ try:
except:
import json
pgettext=PGetText(__file__+'/../')
_=pgettext.gettext
env=env_theme(__file__)
t=PTemplate(env)
@ -108,7 +112,7 @@ def pastafari2_dashboard():
#print(module)
return t.load_template('dash_pastafari.phtml', title=I18n.lang('pastafari2', 'servers_dashboard', 'Servers Dashboard')+title_task, path_module=path_module, select_task=select_task, task_path=task_path, links=links, description_task=description_task, details_task=details_task)
return t.load_template('dash_pastafari.phtml', title=_('Servers Dashboard')+title_task, path_module=path_module, select_task=select_task, task_path=task_path, links=links, description_task=description_task, details_task=details_task)
@admin_app.route('/pastafari2/settings/')
def pastafari2_settings():
@ -118,11 +122,11 @@ def pastafari2_settings():
forms['ssh_key_priv']=FileForm('ssh_key_priv', '', '')
forms['ssh_key_pub']=FileForm('ssh_key_pub', '', '')
forms['ssh_key_priv'].help=I18n.lang('pastafari2', 'ssh_key_priv_file_help', 'Global private SSH key used for enter in servers')
forms['ssh_key_pub'].help=I18n.lang('pastafari2', 'ssh_key_pub_file_help', 'Global public SSH key used for enter in servers')
forms['ssh_key_priv'].help=_('Global private SSH key used for enter in servers')
forms['ssh_key_pub'].help=_('Global public SSH key used for enter in servers')
forms['ssh_key_priv'].label=I18n.lang('pastafari2', 'ssh_key_priv_file', 'Global private SSH')
forms['ssh_key_pub'].label=I18n.lang('pastafari2', 'ssh_key_pub_file', 'Global public SSH')
forms['ssh_key_priv'].label=_('Global private SSH')
forms['ssh_key_pub'].label=_('Global public SSH')
forms['ssh_key_priv'].required=True
forms['ssh_key_pub'].required=True
@ -153,7 +157,7 @@ def pastafari2_settings():
regenerate=False
pass
return t.load_template('settings.phtml', title=I18n.lang('pastafari2', 'settings', 'Settings'), path_module='admin_app.pastafari2_settings', txt_error=txt_error, txt_generate_key=txt_generate_key, txt_generate_key_button=txt_generate_key_button, regenerate=regenerate)
return t.load_template('settings.phtml', title=_('Settings'), path_module='admin_app.pastafari2_settings', txt_error=txt_error, txt_generate_key=txt_generate_key, txt_generate_key_button=txt_generate_key_button, regenerate=regenerate)
@admin_app.route('/pastafari2/edit_global_ssh_keys/', methods=['POST'])
def pastafari2_edit_global_ssh_keys():
@ -228,7 +232,7 @@ def pastafari2_add_server():
group_form=SelectModelForm('group_id', '', ServerGroup(db), 'group', 'id', field_parent=None)
return t.load_template('add_server.phtml', title=I18n.lang('pastafari2', 'add_server', 'Add server'), path_module='admin_app.pastafari2_dashboard', group_form=group_form)
return t.load_template('add_server.phtml', title=_('Add server'), path_module='admin_app.pastafari2_dashboard', group_form=group_form)
@admin_app.route('/pastafari2/add_server_task/', methods=['POST'])
@ -276,11 +280,11 @@ def pastafari2_add_server_task():
if server_host=='':
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_hostname', 'Error: you need enter a valid hostname')
error_form['#server_host_error']=_('Error: you need enter a valid hostname')
if server_username=='':
error=1
error_form['#server_username_error']=I18n.lang('pastafari2', 'error_username', 'Error: you need enter a valid username for the server')
error_form['#server_username_error']=_('Error: you need enter a valid username for the server')
txt_error=''
@ -290,7 +294,7 @@ def pastafari2_add_server_task():
pass
except socket.error as err_msg:
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_getting_ip_host', 'Error: '+err_msg.__str__())
error_form['#server_host_error']=_('Error: ')+err_msg.__str__()
if not error:
@ -308,8 +312,8 @@ def pastafari2_add_server_task():
with SSHTask(server_host, db, remote_user=server_username, remote_password=server_password, private_key=private_key, remote_path=remote_path, task_id=task_id, data=data, port=ssh_port) as ssh_task:
if not ssh_task.prepare_connection():
error=1
txt_error=ssh_task.txt_error #I18n.lang('pastafari2', 'error_connection', 'Error: cannot connect to server')
error_form['#server_host_error']=txt_error #I18n.lang('pastafari2', 'error_connection', 'Error: cannot connect to server')
txt_error=ssh_task.txt_error #_('Error: cannot connect to server')
error_form['#server_host_error']=txt_error #_('Error: cannot connect to server')
else:
# Prepare task for install monit
pass
@ -323,8 +327,8 @@ def pastafari2_add_server_task():
if not task.run_task(ip, path_task, 'Add new server', 'add_new_server', 'Task for add a new server', user=server_username, password=server_password, where_sql_server='', url='', data=data, send_task=True, ssh_port=ssh_port):
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task '+task.txt_error)
txt_error=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task '+task.txt_error)
error_form['#server_host_error']=_('Error: cannot execute the task ')+task.txt_error
txt_error=_('Error: cannot execute the task ')+task.txt_error
task_id=task.task_id
@ -351,7 +355,7 @@ def pastafari2_progress():
#print(arr_task)
if arr_task:
return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=url_return)
return t.load_template('progress.phtml', title=_('Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=url_return)
else:
return ""
@ -466,7 +470,7 @@ def get_servers_task():
fields=[[I18n.lang('pastafari2', 'hostname', 'Hostname'), True], ['IP', True], [I18n.lang('pastafari2', 'selected', 'Selected'), False], [I18n.lang('pastafari2', 'options', 'Options'), False]]
fields=[[_('Hostname'), True], ['IP', True], [_('Selected'), False], [_('Options'), False]]
arr_order_fields=['hostname', 'ip']
count_query=['select count(serverdbtask.id) as num_elements from serverdbtask'+group_sql_count, count_data]
@ -492,11 +496,11 @@ def get_servers_task():
"""
def options_server(row_id, row):
#'<a href="{}">{}</a>'.format(url_for('.services', server_id=row_id), I18n.lang('monit', 'services', 'Services'))
#'<a href="{}">{}</a>'.format(url_for('.services', server_id=row_id), _('Services'))
arr_options=['<a href="{}">{}</a>'.format("", I18n.lang('pastafari2', 'edit', 'Edit'))]
arr_options.append('<a href="{}">{}</a>'.format("", I18n.lang('pastafari2', 'make_task', 'Make task')))
arr_options.append('<a href="{}">{}</a>'.format("", I18n.lang('pastafari2', 'delete', 'Delete')))
arr_options=['<a href="{}">{}</a>'.format("", _('Edit'))]
arr_options.append('<a href="{}">{}</a>'.format("", _('Make task')))
arr_options.append('<a href="{}">{}</a>'.format("", _('Delete')))
"""
def options_selected(row_id, row):
@ -505,11 +509,11 @@ def options_selected(row_id, row):
def options_options(row_id, row):
arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_edit_server', id=row_id, op_admin=1), I18n.lang('pastafari2', 'edit', 'Edit'))]
#arr_options.append('<a href="{}">{}</a>'.format("", I18n.lang('pastafari2', 'make_task', 'Make task')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_delete_server', server_id=row_id), I18n.lang('pastafari2', 'delete', 'Delete')))
arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_edit_server', id=row_id, op_admin=1), _('Edit'))]
#arr_options.append('<a href="{}">{}</a>'.format("", _('Make task')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_delete_server', server_id=row_id), _('Delete')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_edit_update', server_id=row_id), I18n.lang('pastafari2', 'edit_update', 'Edit update task')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.pastafari2_edit_update', server_id=row_id), _('Edit update task')))
return '<br />'.join(arr_options)
@ -565,7 +569,7 @@ def pastafari2_update_task():
if not task.run_task(server_host, path_task, 'Update server', 'update_server', 'Task for update servers', user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True):
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task')
error_form['#server_host_error']=_('Error: cannot execute the task')
task_id=task.task_id
@ -617,7 +621,7 @@ def pastafari2_make_task():
url_exec=url_for('.pastafari2_make_task', send_task=1, **request.args)
links='<a href="'+url_for('admin_app.pastafari2_dashboard')+'">'+I18n.lang('pastafari2', 'servers', 'Servers')+'</a>'
links='<a href="'+url_for('admin_app.pastafari2_dashboard')+'">'+_('Servers')+'</a>'
path_module='admin_app.pastafari2_dashboard'
@ -627,7 +631,7 @@ def pastafari2_make_task():
if hasattr(task_first, 'path_module'):
path_module=task_first.path_module
return t.load_template('maketask.phtml', title=I18n.lang('pastafari2', 'make_task', 'Make task'), form=task_first.form(t, yes_error=False, pass_values=False), url_exec=url_exec, ids=json_ids, task_file=task_path, links=links, path_module=path_module)
return t.load_template('maketask.phtml', title=_('Make task'), form=task_first.form(t, yes_error=False, pass_values=False), url_exec=url_exec, ids=json_ids, task_file=task_path, links=links, path_module=path_module)
elif send_task!='':
@ -638,7 +642,7 @@ def pastafari2_make_task():
if not task_first.check_form(request.form):
error=1
txt_error=I18n.lang('pastafari2', 'error_fields_required', 'Errors: fields required')
txt_error=_('Errors: fields required')
for k,v in task_first.arr_form.items():
if task_first.arr_form[k].error:
@ -672,7 +676,7 @@ def pastafari2_make_task():
if not task.run_task(server_host, path_task, task_first.name_task, task_first.codename_task, task_first.description_task, user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url=task_first.url_return, data=data, send_task=True):
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task')
error_form['#server_host_error']=_('Error: cannot execute the task')
txt_error=task.txt_error
task_id=task.task_id
@ -704,7 +708,7 @@ def pastafari2_multiprogress():
if arr_task:
return t.load_template('multiprogress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module=path_module, name_task=arr_task['name_task'], description_task=arr_task['description_task'], task_id=task_id, server=arr_task['server'], num_servers=num_servers, links=links)
return t.load_template('multiprogress.phtml', title=_('Task progress'), path_module=path_module, name_task=arr_task['name_task'], description_task=arr_task['description_task'], task_id=task_id, server=arr_task['server'], num_servers=num_servers, links=links)
else:
@ -772,7 +776,7 @@ def pastafari2_delete_server():
if arr_server:
return t.load_template('delete_server.phtml', title=I18n.lang('pastafari2', 'delete_server', 'Delete server'), path_module='admin_app.pastafari2_dashboard', server_id=server_id, server=arr_server)
return t.load_template('delete_server.phtml', title=_('Delete server'), path_module='admin_app.pastafari2_dashboard', server_id=server_id, server=arr_server)
else:
@ -819,7 +823,7 @@ def pastafari2_edit_server():
if type(form_admin).__name__=='str':
return t.load_template('edit_server.phtml', title=I18n.lang('pastafari2', 'edit_server', 'Edit server'), path_module='admin_app.pastafari2_dashboard', edit_server=form_admin)
return t.load_template('edit_server.phtml', title=_('Edit server'), path_module='admin_app.pastafari2_dashboard', edit_server=form_admin)
else:
return form_admin
@ -845,8 +849,8 @@ def pre_update_server(admin):
admin.model.fields['ssh_port'].error=True
return False
#txt_error=ssh_task.txt_error #I18n.lang('pastafari2', 'error_connection', 'Error: cannot connect to server')
#error_form['#server_host_error']=txt_error #I18n.lang('pastafari2', 'error_connection', 'Error: cannot connect to server')
#txt_error=ssh_task.txt_error #_('Error: cannot connect to server')
#error_form['#server_host_error']=txt_error #_('Error: cannot connect to server')
return True
@ -890,19 +894,19 @@ def pastafari2_edit_update():
admin.list.order_field='position'
"""
self.arr_extra_fields=[I18n.lang('common', 'options', 'Options')]
self.arr_extra_fields=[_('Options')]
self.arr_extra_options=[SimpleList.standard_options]
"""
#admin.list.arr_extra_fields.insert(0, I18n.lang('pastafari2', 'position', 'Position'))
#admin.list.arr_extra_fields.insert(0, _('Position'))
#admin.list.arr_extra_options.insert(0, field_position)
form_admin=admin.show()
if type(form_admin).__name__=='str':
return t.load_template('edit_update.phtml', title=I18n.lang('pastafari2', 'edit_update', 'Edit update'), path_module='admin_app.pastafari2_edit_update', server_data=arr_server, edit_update=form_admin)
return t.load_template('edit_update.phtml', title=_('Edit update'), path_module='admin_app.pastafari2_edit_update', server_data=arr_server, edit_update=form_admin)
else:
return form_admin
@ -924,7 +928,7 @@ def pastafari2_change_order_scripts():
arr_update_server=update_server.select_to_array()
return t.load_template('change_order_scripts.phtml', title=I18n.lang('pastafari2', 'edit_update', 'Edit update'), path_module='admin_app.pastafari2_change_order_scripts', server_data=arr_server, scripts=arr_update_server)
return t.load_template('change_order_scripts.phtml', title=_('Edit update'), path_module='admin_app.pastafari2_change_order_scripts', server_data=arr_server, scripts=arr_update_server)
@admin_app.route('/pastafari2/save_positions' , methods=['POST'])
def pastafari2_save_positions():