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

Fixes in lang for use gettext

Browse source
This commit is contained in:
Antonio de la Rosa 2024-04-03 18:32:05 +02:00
parent 5f9f5a1814
commit ca9d39ca43
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/app.py
View file

@ -2,7 +2,7 @@ from settings import config
from flask import g, url_for, request, session, make_response from flask import g, url_for, request, session, make_response
from paramecio2.libraries.generate_admin_class import GenerateAdminClass from paramecio2.libraries.generate_admin_class import GenerateAdminClass
from paramecio2.libraries.lists import SimpleList from paramecio2.libraries.lists import SimpleList
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.modules.admin import admin_app, t as admin_t
from paramecio2.libraries.db.webmodel import WebModel from paramecio2.libraries.db.webmodel import WebModel
from paramecio2.libraries.lists import AjaxList from paramecio2.libraries.lists import AjaxList
@ -24,6 +24,10 @@ try:
except: except:
import json import json
pgettext=PGetText(__file__+'/../')
_=pgettext.gettext
env=env_theme(__file__) env=env_theme(__file__)
t=PTemplate(env) t=PTemplate(env)
@ -49,7 +53,7 @@ def get_mariadbservers():
count_data=[] count_data=[]
sql_data=[] sql_data=[]
fields=[[I18n.lang('mariadbservers', 'hostname', 'Hostname'), True], ['IP', True], [I18n.lang('mariadbservers', 'options', 'Options'), False]] fields=[[_('Hostname'), True], ['IP', True], [_('Options'), False]]
arr_order_fields=['hostname', 'ip'] arr_order_fields=['hostname', 'ip']
count_query=['select count(dbservermariadb.id) as num_elements from dbservermariadb', count_data] count_query=['select count(dbservermariadb.id) as num_elements from dbservermariadb', count_data]
@ -78,11 +82,11 @@ def options_options(row_id, row):
arr_options=[] arr_options=[]
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', server_id=row_id), I18n.lang('dbservermariadb', 'server_users', 'Server users'))] #arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', server_id=row_id), I18n.lang('dbservermariadb', 'server_users', 'Server users'))]
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'websites', 'Websites'))] #arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))]
# #
#arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports'))) #arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.edit_mariadbserver', mariadbserver_id=row_id), I18n.lang('dbservermariadb', 'edit', 'Edit'))) arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.edit_mariadbserver', mariadbserver_id=row_id), _('Edit')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.delete_mariadbserver', mariadbserver_id=row_id), I18n.lang('dbservermariadb', 'delete', 'Delete'))) arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.delete_mariadbserver', mariadbserver_id=row_id), _('Delete')))
return '<br />'.join(arr_options) return '<br />'.join(arr_options)

15
settings/config_admin.py
View file

@ -1,6 +1,17 @@
from paramecio2.libraries.config_admin import config_admin from paramecio2.libraries.config_admin import config_admin
from paramecio2.libraries.i18n import I18n from paramecio2.libraries.i18n import I18n
config_admin.append([I18n.lang('dbservermariadb', 'dbservermariadb_admin', 'MariaDB')]) from paramecio2.libraries.i18n import I18n, PGetText
config_admin.append([I18n.lang('dbservermariadb', 'dbservermariadb', 'MariaDB Servers'), 'modules.mariadb.admin.app', 'admin_app.mariadbservers', 'fa-database']) #modules_admin=[[I18n.lang('admin', 'users_admin', 'User\'s Admin'), 'paramecio.modules.admin.admin.ausers', 'ausers']]
pgettext=PGetText(__file__+'/../')
_=pgettext.gettext
def mariadb_text():
return _('MariaDB Servers')
config_admin.append(['MariaDB'])
config_admin.append([mariadb_text(), 'modules.mariadb.admin.app', 'admin_app.mariadbservers', 'fa-database'])

1
templates/admin/mariadbservers.phtml
View file

@ -1,5 +1,6 @@
<%inherit file="dashboard.phtml"/> <%inherit file="dashboard.phtml"/>
<%block name="content"> <%block name="content">
<p><a href="${url_for('admin_app.pastafari2_dashboard', task_path='modules/pastafari2/tasks/servers/databases/mysql/standalone_mysql.py')}">${_('Add mariadb server')}</a>
<div id="table_servers"> <div id="table_servers">
</div> </div>
<%block name="jscript_block"> <%block name="jscript_block">