pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] missing translation marks in form and view editor

Browse Source 
bzr revid: xmo@openerp.com-20120713124828-4840se673yvubgkp
This commit is contained in:
Xavier Morel
2012-07-13 14:48:28 +02:00
parent ab0078c549 fd1675406c
commit dfcf75602d
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_editor.js
+13 -13
View File
@@ -146,7 +146,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
}
});
msg += "</ul>";
this.do_warn("The following fields are invalid :", msg);
this.do_warn(_t("The following fields are invalid :"), msg);
},
add_node_name : function(node) {
if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
@@ -245,7 +245,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
"arch": view_arch_list});
});
} else {
self.do_warn("Please select view in list :");
self.do_warn(_t("Please select view in list :"));
}
});
},
@@ -372,10 +372,10 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
self.inherited_view(selected_row);
}
}else{
alert("Can't Update View");
alert(_t("Can't Update View"));
}
}else{
alert("Select an element");
alert(_t("Select an element"));
}
}},
{text: _t("Preview"), click: function() {
@@ -454,7 +454,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
var clone = this.create_clone(selected_row.clone(),obj);
if (selected_row.find("img[id^='parentimg-']").length == 0) {
($(selected_row.find('a').parent()).siblings('td'))
.append($('<img width="16" height="16"></img>').attr('src', '/web/static/src/img/collapse.gif').
.append($('<img width="16" height="16">').attr('src', '/web/static/src/img/collapse.gif').
attr('id','parentimg-'+ row_id).click(function(){
self.do_parent_img_hide_show(this);
}));
@@ -719,7 +719,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
case "Inside":
if (tr_click.find("img[id^='parentimg-']").length == 0) {
($(tr_click.find('a').parent()).siblings('td'))
.append($('<img width="16" height="16"></img>').attr('src', '/web/static/src/img/collapse.gif').
.append($('<img width="16" height="16">').attr('src', '/web/static/src/img/collapse.gif').
attr('id','parentimg-'+ self.one_object.clicked_tr_id).click(function(){
self.do_parent_img_hide_show(this);
}));
@@ -736,8 +736,8 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
} else if (move_direct == "remove_node") {
parent = $(arch1).parents();
if (parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")) {
self.one_object.clicked_tr_id = self.one_object.clicked_tr_id -1;
self.one_object.clicked_tr_level = self.one_object.clicked_tr_level - 1;
self.one_object.clicked_tr_id -= 1;
self.one_object.clicked_tr_level -= 1;
(parent.length == 0)?parent.push("remove_view"):false;
}
$(arch1).remove();
@@ -931,9 +931,9 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
},
on_add_node: function(properties, fields){
var self = this;
var render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'},
var render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': _t("Node Type"),'type': 'selection'},
{'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
{'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
{'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': _t("Position"),'type': 'selection'}];
this.add_widget = [];
this.add_node_dialog = new openerp.web.Dialog(this,{
title: _t("Properties"),
@@ -948,7 +948,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
check_add_node =(_.include(_CHILDREN[properties[0]],values.node_type))?true:false:
check_add_node =(_.include(_CHILDREN[properties[1]],values.node_type))?true:false;
if(values.node_type == "field" && check_add_node )
{check_add_node = (values.field_value != " ")?true:false;
{check_add_node = (values.field_value != " ");
}
if(check_add_node){
var tag = (values.node_type == "field")?
@@ -956,7 +956,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
_.str.sprintf("<%s> </%s>",values.node_type,values.node_type);
self.do_save_update_arch("add_node", [tag, values.position]);
} else {
alert("Can't Update View");
alert(_t("Can't Update View"));
}
}},
{text: _t("Cancel"), click: function() { self.add_node_dialog.close(); }}
@@ -971,7 +971,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({
} else {
table_selector.append('<td align="right">' + node.string + '</td>' + type_widget.render() );
if (node.name == "field_value") {
table_selector.append('<td id="new_field" align="right" width="100px"> <button>New Field</button></td>');
table_selector.append('<td id="new_field" align="right" width="100px"> <button>' + _t("New Field") + '</button></td>');
}
}
type_widget.start();
addons/web/static/src/js/view_form.js
+10 -8
View File
@@ -207,7 +207,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
on_record_loaded: function(record) {
var self = this, set_values = [];
if (!record) {
this.do_warn("Form", "The record could not be found in the database.", true);
this.do_warn(_t("Form"), _t("The record could not be found in the database."), true);
return $.Deferred().reject();
}
this.datarecord = record;
@@ -574,7 +574,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
}
});
msg += "</ul>";
this.do_warn("The following fields are invalid :", msg);
this.do_warn(_t("The following fields are invalid :"), msg);
},
on_saved: function(r, success) {
if (!r.result) {
@@ -779,7 +779,7 @@ openerp.web.FormDialog = openerp.web.Dialog.extend({
if (this.form.dataset.select_id(id)) {
return this.form.do_show();
} else {
this.do_warn("Could not find id in dataset");
this.do_warn(_t("Could not find id in dataset"));
return $.Deferred().reject();
}
},
@@ -837,8 +837,10 @@ openerp.web.form.SidebarAttachments = openerp.web.OldWidget.extend({
ids: [parseInt($e.attr('data-id'))]
}, function(r) {
$e.parent().remove();
self.do_update()
self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
self.do_update();
self.do_notify(
_t("Delete an attachment"),
_.str.sprintf(_t("The attachment '%s' has been deleted"), name));
});
}
}
@@ -1558,7 +1560,7 @@ openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
},
on_button_clicked: function() {
if (!this.value || !this.is_valid()) {
this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
this.do_warn(_t("E-mail error"), _t("Can't send email to invalid e-mail address"));
} else {
location.href = 'mailto:' + this.value;
}
@@ -1575,7 +1577,7 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
},
on_button_clicked: function() {
if (!this.value) {
this.do_warn("Resource error", "This resource is empty");
this.do_warn(_t("Resource error"), _t("This resource is empty"));
} else {
window.open(this.value);
}
@@ -3428,7 +3430,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
on_file_uploaded: function(size, name, content_type, file_base64) {
delete(window[this.iframe]);
if (size === false) {
this.do_warn("File Upload", "There was a problem while uploading your file");
this.do_warn(_t("File Upload"), _t("There was a problem while uploading your file"));
// TODO: use openerp web crashmanager
console.warn("Error while uploading file : ", name);
} else {