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

[FIX] translatability of addition button label in listview 

* Original label is evaluated very early (before translation database is loaded), defer its execution
* Replacement 'add' label in m2m list views wasn't marked for translation
* Also mark a few strings in form view

lp bug: https://launchpad.net/bugs/903963 fixed

bzr revid: xmo@openerp.com-20111215100652-8iujastl6bvi7feu
This commit is contained in:
Xavier Morel 2011-12-15 11:06:52 +01:00
parent 3ffb9b8134
commit fd96386cd4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/static/src/js/view_form.js
View File

@ -140,7 +140,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
on_record_loaded: function(record) {
var self = this, set_values = [];
if (!record) {
throw("Form: No record received");
throw new Error("Form: No record received");
}
this.datarecord = record;
@ -629,7 +629,7 @@ openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({
on_attachment_delete: function(e) {
var self = this, $e = $(e.currentTarget);
var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text());
if (confirm("Do you really want to delete the attachment " + name + " ?")) {
if (confirm(_.sprintf(_t("Do you really want to delete the attachment %s?"), name))) {
this.rpc('/web/dataset/unlink', {
model: 'ir.attachment',
ids: [parseInt($e.attr('data-id'))]
@ -1051,7 +1051,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
if (self.node.attrs.confirm) {
var def = $.Deferred();
var dialog = $('<div>' + self.node.attrs.confirm + '</div>').dialog({
title: 'Confirm',
title: _t('Confirm'),
modal: true,
buttons: {
Ok: function() {
@ -2374,7 +2374,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
load_view: function() {
var self = this;
this.list_view = new openerp.web.form.Many2ManyListView(this, this.dataset, false, {
'addable': self.is_readonly() ? null : 'Add',
'addable': self.is_readonly() ? null : _t("Add"),
'deletable': self.is_readonly() ? false : true,
'selectable': self.multi_selection
});

2
addons/web/static/src/js/view_list.js
View File

@ -12,7 +12,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
// whether the column headers should be displayed
'header': true,
// display addition button, with that label
'addable': _t("Create"),
'addable': {toString: function () { return _t("Create"); }},
// whether the list view can be sorted, note that once a view has been
// sorted it can not be reordered anymore
'sortable': true,