Fixes in language for use gettext
This commit is contained in:
parent
6ac7e7598a
commit
283d5249dc
7 changed files with 158 additions and 64 deletions
|
|
@ -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
|
||||
from paramecio2.libraries.mtemplates import PTemplate, env_theme
|
||||
|
|
@ -18,7 +18,11 @@ from modules.pastafari2.models.pastafari2 import NameServerScripts, ServerScript
|
|||
from modules.pastafari2.models.pastafari2 import ServerGroup
|
||||
from paramecio2.libraries.lists import SimpleList
|
||||
from paramecio2.libraries.db.coreforms import SelectForm, SelectModelForm, HiddenForm
|
||||
|
||||
|
||||
pgettext=PGetText(__file__+'/../')
|
||||
|
||||
_=pgettext.gettext
|
||||
|
||||
@admin_app.route('/pastafari2/tasks_edit/', methods=['GET', 'POST'])
|
||||
def pastafari2_tasks_edit():
|
||||
|
||||
|
|
@ -49,7 +53,7 @@ def pastafari2_tasks_edit():
|
|||
|
||||
if type(form_admin).__name__=='str':
|
||||
|
||||
return t.load_template('content.phtml', title=I18n.lang('admin', 'tasks_edit', 'Tasks edit'), contents=form_admin, path_module='admin_app.pastafari2_tasks_edit')
|
||||
return t.load_template('content.phtml', title=_('Tasks edit'), contents=form_admin, path_module='admin_app.pastafari2_tasks_edit')
|
||||
else:
|
||||
|
||||
return form_admin
|
||||
|
|
@ -60,17 +64,17 @@ def scripts_options(url, row_id, row):
|
|||
"""
|
||||
if row['is_parent']:
|
||||
|
||||
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_multiprogress', task_id=row_id)+'">'+I18n.lang('pastafari2', 'view_task_log', 'View task log')+'</a>']
|
||||
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_multiprogress', task_id=row_id)+'">'+_('View task log')+'</a>']
|
||||
|
||||
else:
|
||||
|
||||
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_progress', task_id=row_id)+'">'+I18n.lang('pastafari2', 'view_task_log', 'View task log')+'</a>']
|
||||
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_progress', task_id=row_id)+'">'+_('View task log')+'</a>']
|
||||
"""
|
||||
#return ['<a href="">'+I18n.lang('pastafari2', 'edit_scripts', 'Edit scripts')+'</a>']
|
||||
#return ['<a href="">'+_('Edit scripts')+'</a>']
|
||||
|
||||
arr_options=SimpleList.standard_options(url, row_id, row)
|
||||
|
||||
arr_options.append('<a href="'+url_for('admin_app.pastafari2_scripts_edit', scripts_id=row_id)+'">'+I18n.lang('pastafari2', 'edit_scripts', 'Edit scripts')+'</a>')
|
||||
arr_options.append('<a href="'+url_for('admin_app.pastafari2_scripts_edit', scripts_id=row_id)+'">'+_('Edit scripts')+'</a>')
|
||||
|
||||
return arr_options
|
||||
|
||||
|
|
@ -121,7 +125,7 @@ def pastafari2_scripts_edit():
|
|||
|
||||
if type(form_admin).__name__=='str':
|
||||
|
||||
return t.load_template('edit_scripts.phtml', title=I18n.lang('pastafari2', 'edit_script', 'Edit scripts'), path_module='admin_app.pastafari2_edit_scripts', server_scripts=arr_server, edit_update=form_admin)
|
||||
return t.load_template('edit_scripts.phtml', title=_('Edit scripts'), path_module='admin_app.pastafari2_edit_scripts', server_scripts=arr_server, edit_update=form_admin)
|
||||
|
||||
else:
|
||||
return form_admin
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue