diff --git a/paramecio/citoplasma/check_i18n.py b/paramecio/citoplasma/check_i18n.py index 0bee488..22e27ec 100644 --- a/paramecio/citoplasma/check_i18n.py +++ b/paramecio/citoplasma/check_i18n.py @@ -7,7 +7,7 @@ pattern=re.compile('^\w+\.py$') ignored=re.compile('^[__|\.].*$') -lang_p=re.compile() +lang_p=re.compile("I18n.lang\('(.*)',\s+'(.*)',\s+'(.*)'\)") def start(): diff --git a/paramecio/citoplasma/i18n.py b/paramecio/citoplasma/i18n.py index 00a7a3e..89978f7 100644 --- a/paramecio/citoplasma/i18n.py +++ b/paramecio/citoplasma/i18n.py @@ -6,21 +6,25 @@ def load_lang(*args): for module in args: - lang_path=module+'.i18n' + lang_path=module+'.i18n.'+I18n.default_lang+'.'+module.split('.')[-1] try: i18n_module=import_module(module) - return True + pass except: - return False + pass # here load the language class I18n: + default_lang='en-US' + + dict_i18n=['en-US', 'es-ES'] + l={} @staticmethod diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index c5bf925..f4300ff 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -22,7 +22,8 @@ from collections import OrderedDict t=ptemplate('admin') -load_lang('admin', 'common') +load_lang('paramecio.admin', 'paramecio.common') + @get('/'+config.admin_folder) @get('/'+config.admin_folder+'/') @post('/'+config.admin_folder+'/')