odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] don't duplicate en_US lang in create db, remove redundant <t> elements in select templates 

bzr revid: xmo@openerp.com-20110801105838-5arrf4nppsle5akt
This commit is contained in:
Xavier Morel 2011-08-01 12:58:38 +02:00
parent 5ebea36bf9
commit 4aed9098ca
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base/controllers/main.py
View File

@ -253,12 +253,13 @@ class Session(openerpweb.Controller):
@openerpweb.jsonrequest
def get_lang_list(self, req):
lang_list = [('en_US', 'English (US)')]
try:
lang_list = lang_list + (req.session.proxy("db").list_lang() or [])
return {
'lang_list': (req.session.proxy("db").list_lang() or []),
'error': ""
}
except Exception, e:
return {"error": e, "title": "Languages"}
return {"lang_list": lang_list, "error": ""}
@openerpweb.jsonrequest
def modules(self, req):

38
addons/base/static/src/xml/base.xml
View File

@ -94,13 +94,13 @@
<tr>
<td><label for="db_lang">Default language:</label></td>
<td>
<t t-if="lang_list">
<select name="db_lang">
<t t-foreach="lang_list" t-as="lang">
<option t-att-value="lang[0]"><t t-esc="lang[1]"/></option>
</t>
</select>
</t>
<select name="db_lang" t-if="lang_list">
<t t-foreach="lang_list" t-as="lang">
<option t-att-value="lang[0]"
t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined">
<t t-esc="lang[1]"/></option>
</t>
</select>
</td>
</tr>
<tr>
@ -131,13 +131,11 @@
<tr>
<td><label for="drop_db">Database:</label></td>
<td>
<t t-if="db_list">
<select name="drop_db" autofocus="autofocus">
<t t-foreach="db_list" t-as="db">
<option t-att-value="db"><t t-esc="db"/></option>
</t>
</select>
</t>
<select t-if="db_list" name="drop_db" autofocus="autofocus">
<t t-foreach="db_list" t-as="db">
<option t-att-value="db"><t t-esc="db"/></option>
</t>
</select>
</td>
</tr>
<tr>
@ -163,13 +161,11 @@
<tr>
<td><label for="backup_db">Database:</label></td>
<td>
<t t-if="db_list">
<select name="backup_db" autofocus="autofocus">
<t t-foreach="db_list" t-as="db">
<option t-att-value="db"><t t-esc="db"/></option>
</t>
</select>
</t>
<select t-if="db_list" name="backup_db" autofocus="autofocus">
<t t-foreach="db_list" t-as="db">
<option t-att-value="db"><t t-esc="db"/></option>
</t>
</select>
</td>
</tr>
<tr>