diff --git a/admin/app.py b/admin/app.py index 9d98cba..59308d9 100644 --- a/admin/app.py +++ b/admin/app.py @@ -2,7 +2,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.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.libraries.db.webmodel import WebModel from paramecio2.libraries.lists import AjaxList @@ -24,6 +24,10 @@ try: except: import json +pgettext=PGetText(__file__+'/../') + +_=pgettext.gettext + env=env_theme(__file__) t=PTemplate(env) @@ -49,7 +53,7 @@ def get_mariadbservers(): count_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'] 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=['{}'.format(url_for('admin_app.virtualhost', server_id=row_id), I18n.lang('dbservermariadb', 'server_users', 'Server users'))] - #arr_options=['{}'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'websites', 'Websites'))] + #arr_options=['{}'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))] # #arr_options.append('{}'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports'))) - arr_options.append('{}'.format(url_for('admin_app.edit_mariadbserver', mariadbserver_id=row_id), I18n.lang('dbservermariadb', 'edit', 'Edit'))) - arr_options.append('{}'.format(url_for('admin_app.delete_mariadbserver', mariadbserver_id=row_id), I18n.lang('dbservermariadb', 'delete', 'Delete'))) + arr_options.append('{}'.format(url_for('admin_app.edit_mariadbserver', mariadbserver_id=row_id), _('Edit'))) + arr_options.append('{}'.format(url_for('admin_app.delete_mariadbserver', mariadbserver_id=row_id), _('Delete'))) return '
'.join(arr_options) diff --git a/settings/config_admin.py b/settings/config_admin.py index 8b8723b..bcee9be 100644 --- a/settings/config_admin.py +++ b/settings/config_admin.py @@ -1,6 +1,17 @@ from paramecio2.libraries.config_admin import config_admin 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']) diff --git a/templates/admin/mariadbservers.phtml b/templates/admin/mariadbservers.phtml index f19ced3..0b132e1 100644 --- a/templates/admin/mariadbservers.phtml +++ b/templates/admin/mariadbservers.phtml @@ -1,5 +1,6 @@ <%inherit file="dashboard.phtml"/> <%block name="content"> +

${_('Add mariadb server')}

<%block name="jscript_block">