diff --git a/paramecio/citoplasma/check_i18n.py b/paramecio/citoplasma/check_i18n.py
index d800c86..3e7b7fa 100644
--- a/paramecio/citoplasma/check_i18n.py
+++ b/paramecio/citoplasma/check_i18n.py
@@ -140,22 +140,24 @@ def scandir(path, module_search=''):
for line in f:
- match_p=lang_p.search(line)
- match_t=lang_t.search(line)
+ #[('pokermind', 'performance_questions_default', 'Performance questions default'), ('pokermind', 'performance_questions_defasult', 'Performance questions defaufflt')]
+
+ match_p=lang_p.findall(line)
+ match_t=lang_t.findall(line)
if match_p!=None:
- #print(match_p.group(1))
-
- module=match_p.group(1)
- symbol=match_p.group(2)
- text_default=match_p.group(3)
-
- tmp_lang[module]=tmp_lang.get(module, {})
- tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default)
+ for m in match_p:
+ module=m[0]
+ symbol=m[1]
+ text_default=m[2]
+
+ tmp_lang[module]=tmp_lang.get(module, {})
+
+ tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default)
if match_t!=None:
-
+ """
module=match_t.group(1)
symbol=match_t.group(2)
text_default=match_t.group(3)
@@ -163,7 +165,18 @@ def scandir(path, module_search=''):
tmp_lang[module]=tmp_lang.get(module, {})
tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default)
-
+ """
+
+ for m in match_t:
+ module=m[0]
+ symbol=m[1]
+ text_default=m[2]
+
+ tmp_lang[module]=tmp_lang.get(module, {})
+
+ tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default)
+
+
f.close()
#print('archivo->'+path+'/'+name)
diff --git a/paramecio/citoplasma/i18n.py b/paramecio/citoplasma/i18n.py
index 7e49449..a0bcaad 100644
--- a/paramecio/citoplasma/i18n.py
+++ b/paramecio/citoplasma/i18n.py
@@ -71,7 +71,11 @@ class I18n:
lang=I18n.get_default_lang()
- return value[lang]
+ if value[lang]!='':
+
+ return value[lang]
+
+ return value[I18n.default_lang]
@staticmethod
def get_browser_lang():
diff --git a/paramecio/citoplasma/templates/forms/i18nform.phtml b/paramecio/citoplasma/templates/forms/i18nform.phtml
index a568069..ca7c705 100644
--- a/paramecio/citoplasma/templates/forms/i18nform.phtml
+++ b/paramecio/citoplasma/templates/forms/i18nform.phtml
@@ -21,7 +21,7 @@ choose=''
style="display:none;"
% endif
%def>
-
+
% if lang_selected!=None:
% for i18n in arr_i18n:
@@ -47,8 +47,8 @@ $(".${name_form}_i18n_flag").click(function () {
name_id=$(this).attr('id').replace('_element', '');
- name_form=name_id.split('_')[0];
-
+ name_form="${name_form}";
+
$('.'+name_form+'_i18n_form').hide();
$('#'+name_id+'_switch').show();
@@ -72,8 +72,6 @@ $(".${name_form}_i18n_flag").closest('form').submit( function () {
arr_i18n[lang]=child_input.val();
});
- //$("#${name_form}_i18n_value").val(JSON.stringify(arr_i18n));
- //$("#${name_form}_i18n_value").attr('value', JSON.stringify(arr_i18n));
document.getElementById("${name_form}_i18n_value").value=JSON.stringify(arr_i18n);
diff --git a/paramecio/cromosoma/extrafields/i18nfield.py b/paramecio/cromosoma/extrafields/i18nfield.py
index 3366497..12dd286 100644
--- a/paramecio/cromosoma/extrafields/i18nfield.py
+++ b/paramecio/cromosoma/extrafields/i18nfield.py
@@ -80,7 +80,12 @@ class I18nField(PhangoField):
lang=I18n.get_default_lang()
- return value[lang]
+ if value[lang]!='':
+
+ return value[lang]
+
+ return value[I18n.default_lang]
+
@staticmethod
def get_value(value):
@@ -89,7 +94,11 @@ class I18nField(PhangoField):
lang=I18n.get_default_lang()
- return value[lang]
+ if value[lang]!='':
+
+ return value[lang]
+
+ return value[I18n.default_lang]
class I18nHTMLField(I18nField):
diff --git a/paramecio/cromosoma/extraforms/i18nform.py b/paramecio/cromosoma/extraforms/i18nform.py
index 200744f..be7c985 100644
--- a/paramecio/cromosoma/extraforms/i18nform.py
+++ b/paramecio/cromosoma/extraforms/i18nform.py
@@ -32,4 +32,4 @@ class I18nForm(BaseForm):
for lang in I18n.dict_i18n:
self.default_value[lang]=self.default_value.get(lang, '')
- return t.load_template('forms/i18nform.phtml', name_form=self.name, form=self.form_child, arr_i18n=I18n.dict_i18n, lang_selected=lang_selected, default_value=self.default_value)
+ return t.load_template('forms/i18nform.phtml', name_form=self.name_field_id, real_name_form=self.name, form=self.form_child, arr_i18n=I18n.dict_i18n, lang_selected=lang_selected, default_value=self.default_value)