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

Fixes in language

Browse source
This commit is contained in:
Antonio de la Rosa 2017-05-18 05:09:08 +02:00
parent d6831da5b6
commit 5a7f49fe9e
5 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
paramecio/citoplasma/check_i18n.py
View file

@ -140,22 +140,24 @@ def scandir(path, module_search=''):
for line in f: for line in f:
match_p=lang_p.search(line) #[('pokermind', 'performance_questions_default', 'Performance questions default'), ('pokermind', 'performance_questions_defasult', 'Performance questions defaufflt')]
match_t=lang_t.search(line)
match_p=lang_p.findall(line)
match_t=lang_t.findall(line)
if match_p!=None: if match_p!=None:
#print(match_p.group(1))
module=match_p.group(1) for m in match_p:
symbol=match_p.group(2) module=m[0]
text_default=match_p.group(3) symbol=m[1]
text_default=m[2]
tmp_lang[module]=tmp_lang.get(module, {}) tmp_lang[module]=tmp_lang.get(module, {})
tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default) tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default)
if match_t!=None: if match_t!=None:
"""
module=match_t.group(1) module=match_t.group(1)
symbol=match_t.group(2) symbol=match_t.group(2)
text_default=match_t.group(3) text_default=match_t.group(3)
@ -163,6 +165,17 @@ def scandir(path, module_search=''):
tmp_lang[module]=tmp_lang.get(module, {}) tmp_lang[module]=tmp_lang.get(module, {})
tmp_lang[module][symbol]=tmp_lang[module].get(symbol, text_default) 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() f.close()

4
paramecio/citoplasma/i18n.py
View file

@ -71,8 +71,12 @@ class I18n:
lang=I18n.get_default_lang() lang=I18n.get_default_lang()
if value[lang]!='':
return value[lang] return value[lang]
return value[I18n.default_lang]
@staticmethod @staticmethod
def get_browser_lang(): def get_browser_lang():

6
paramecio/citoplasma/templates/forms/i18nform.phtml
View file

@ -21,7 +21,7 @@ choose=''
style="display:none;" style="display:none;"
% endif % endif
</%def> </%def>
<input type="hidden" name="${name_form}" id="${name_form}_i18n_value" value="" /> <input type="hidden" name="${real_name_form}" id="${name_form}_i18n_value" value="" />
% if lang_selected!=None: % if lang_selected!=None:
% for i18n in arr_i18n: % for i18n in arr_i18n:
@ -47,7 +47,7 @@ $(".${name_form}_i18n_flag").click(function () {
name_id=$(this).attr('id').replace('_element', ''); name_id=$(this).attr('id').replace('_element', '');
name_form=name_id.split('_')[0]; name_form="${name_form}";
$('.'+name_form+'_i18n_form').hide(); $('.'+name_form+'_i18n_form').hide();
@ -72,8 +72,6 @@ $(".${name_form}_i18n_flag").closest('form').submit( function () {
arr_i18n[lang]=child_input.val(); 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); document.getElementById("${name_form}_i18n_value").value=JSON.stringify(arr_i18n);

9
paramecio/cromosoma/extrafields/i18nfield.py
View file

@ -80,8 +80,13 @@ class I18nField(PhangoField):
lang=I18n.get_default_lang() lang=I18n.get_default_lang()
if value[lang]!='':
return value[lang] return value[lang]
return value[I18n.default_lang]
@staticmethod @staticmethod
def get_value(value): def get_value(value):
@ -89,8 +94,12 @@ class I18nField(PhangoField):
lang=I18n.get_default_lang() lang=I18n.get_default_lang()
if value[lang]!='':
return value[lang] return value[lang]
return value[I18n.default_lang]
class I18nHTMLField(I18nField): class I18nHTMLField(I18nField):
def check_value(self, value): def check_value(self, value):

2
paramecio/cromosoma/extraforms/i18nform.py
View file

@ -32,4 +32,4 @@ class I18nForm(BaseForm):
for lang in I18n.dict_i18n: for lang in I18n.dict_i18n:
self.default_value[lang]=self.default_value.get(lang, '') 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)