From 92e87f7e6fa762af05b03a6a82d1e135f78172cb Mon Sep 17 00:00:00 2001 From: tsabi <> Date: Thu, 29 Nov 2012 01:22:00 +0100 Subject: [PATCH] Mark strings to be translated. Maybe some missed, but most of them marked. bzr revid: tsabi-20121129002200-20tppzvh0ap5tfwe --- addons/web/controllers/main.py | 23 +++++++------ addons/web/static/src/js/chrome.js | 34 +++++++++---------- addons/web/static/src/js/dates.js | 13 +++---- addons/web/static/src/js/formats.js | 14 ++++---- addons/web/static/src/js/view_form.js | 24 ++++++------- addons/web/static/src/js/view_list.js | 14 ++++---- .../web/static/src/js/view_list_editable.js | 6 ++-- addons/web/static/src/js/views.js | 12 +++---- addons/web_calendar/static/src/js/calendar.js | 4 +-- addons/web_kanban/static/src/js/kanban.js | 2 +- .../static/src/js/view_editor.js | 10 +++--- 11 files changed, 80 insertions(+), 76 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e36b46ed51a..def93c16ea4 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -28,6 +28,7 @@ except ImportError: xlwt = None import openerp +from openerp.tools.translate import _ from .. import http from .. import nonliterals @@ -821,7 +822,7 @@ class Database(openerpweb.Controller): except xmlrpclib.Fault, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': return {'error': e.faultCode, 'title': 'Drop Database'} - return {'error': 'Could not drop database !', 'title': 'Drop Database'} + return {'error': _('Could not drop database !'), 'title': _('Drop Database')} @openerpweb.httprequest def backup(self, req, backup_db, backup_pwd, token): @@ -839,7 +840,7 @@ class Database(openerpweb.Controller): {'fileToken': int(token)} ) except xmlrpclib.Fault, e: - return simplejson.dumps([[],[{'error': e.faultCode, 'title': 'backup Database'}]]) + return simplejson.dumps([[],[{'error': e.faultCode, 'title': _('Backup Database')}]]) @openerpweb.httprequest def restore(self, req, db_file, restore_pwd, new_db): @@ -860,8 +861,8 @@ class Database(openerpweb.Controller): return req.session.proxy("db").change_admin_password(old_password, new_password) except xmlrpclib.Fault, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': e.faultCode, 'title': 'Change Password'} - return {'error': 'Error, password not changed !', 'title': 'Change Password'} + return {'error': e.faultCode, 'title': _('Change Password')} + return {'error': _('Error, password not changed !'), 'title': _('Change Password')} class Session(openerpweb.Controller): _cp_path = "/web/session" @@ -897,16 +898,16 @@ class Session(openerpweb.Controller): old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')( dict(map(operator.itemgetter('name', 'value'), fields))) if not (old_password.strip() and new_password.strip() and confirm_password.strip()): - return {'error':'You cannot leave any password empty.','title': 'Change Password'} + return {'error':_('You cannot leave any password empty.'),'title': _('Change Password')} if new_password != confirm_password: - return {'error': 'The new password and its confirmation must be identical.','title': 'Change Password'} + return {'error': _('The new password and its confirmation must be identical.'),'title': _('Change Password')} try: if req.session.model('res.users').change_password( old_password, new_password): return {'new_password':new_password} except Exception: - return {'error': 'The old password you provided is incorrect, your password was not changed.', 'title': 'Change Password'} - return {'error': 'Error, password not changed !', 'title': 'Change Password'} + return {'error': _('The old password you provided is incorrect, your password was not changed.'), 'title': _('Change Password')} + return {'error': _('Error, password not changed !'), 'title': _('Change Password')} @openerpweb.jsonrequest def sc_list(self, req): @@ -918,7 +919,7 @@ class Session(openerpweb.Controller): try: return req.session.proxy("db").list_lang() or [] except Exception, e: - return {"error": e, "title": "Languages"} + return {"error": e, "title": _("Languages")} @openerpweb.jsonrequest def modules(self, req): @@ -1450,7 +1451,7 @@ class SearchView(View): if not isinstance(parsed_domain, nonliterals.BaseDomain) else req.session.eval_domain(parsed_domain)) except Exception: - logger.exception("Failed to parse custom filter %s in %s", + logger.exception(_("Failed to parse custom filter %s in %s"), filter['name'], model) filter['disabled'] = True del filter['context'] @@ -1571,7 +1572,7 @@ class Binary(openerpweb.Controller): res = Model.default_get(fields, context) filecontent = base64.b64decode(res.get(field, '')) if not filecontent: - raise ValueError("No content found for field '%s' on '%s:%s'" % + raise ValueError(_("No content found for field '%s' on '%s:%s'") % (field, model, id)) else: filename = '%s_%s' % (model.replace('.', '_'), id) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 940bf800851..91cca8468d1 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -289,7 +289,7 @@ instance.web.CrashManager = instance.web.Class.extend({ }); instance.web.Loading = instance.web.Widget.extend({ - template: 'Loading', + template: _t("Loading"), init: function(parent) { this._super(parent); this.count = 0; @@ -390,11 +390,11 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); self.$el.find("form[name=change_pwd_form]").validate({ messages: { - old_pwd: "Please enter your previous password", - new_pwd: "Please enter your new password", + old_pwd: _t("Please enter your previous password"), + new_pwd: _t("Please enter your new password"), confirm_pwd: { - required: "Please confirm your new password", - equalTo: "The confirmation does not match the password" + required: _t("Please confirm your new password"), + equalTo: _t("The confirmation does not match the password") } }, submitHandler: self.do_change_password @@ -478,7 +478,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.display_error(result); return; } - self.do_notify("Duplicating database", "The database has been duplicated."); + self.do_notify(_t("Duplicating database"), _t("The database has been duplicated.")); self.start(); }); }, @@ -488,7 +488,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ fields = $form.serializeArray(), $db_list = $form.find('[name=drop_db]'), db = $db_list.val(); - if (!db || !confirm("Do you really want to delete the database: " + db + " ?")) { + if (!db || !confirm(_.str.sprintf(_t("Do you really want to delete the database: %s ?"), db))) { return; } self.rpc("/web/database/drop", {'fields': fields}).done(function(result) { @@ -496,7 +496,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.display_error(result); return; } - self.do_notify("Dropping database", "The database '" + db + "' has been dropped"); + self.do_notify(_t("Dropping database"), _.str.sprintf(_t("The database %s has been dropped"), db)); self.start(); }); }, @@ -511,7 +511,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ error: function(error){ if(error){ self.display_error({ - title: 'Backup Database', + title: _t("Backup Database"), error: 'AccessDenied' }); } @@ -534,13 +534,13 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ if (body.indexOf('403 Forbidden') !== -1) { self.display_error({ - title: 'Access Denied', - error: 'Incorrect super-administrator password' + title: _t("Access Denied"), + error: _t("Incorrect super-administrator password") }); } else { self.display_error({ - title: 'Restore Database', - error: 'Could not restore the database' + title: _t("Restore Database"), + error: _t("Could not restore the database") }); } }, @@ -560,7 +560,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ return; } self.unblockUI(); - self.do_notify("Changed Password", "Password has been changed successfully"); + self.do_notify(_t("Changed Password"), _t("Password has been changed successfully")); }); }, do_exit: function () { @@ -642,7 +642,7 @@ instance.web.Login = instance.web.Widget.extend({ } var db = this.$("form [name=db]").val(); if (!db) { - this.do_warn("Login", "No database selected !"); + this.do_warn(_t("Login"), _t("No database selected !")); return false; } var login = this.$("form input[name=login]").val(); @@ -678,7 +678,7 @@ instance.web.Login = instance.web.Widget.extend({ self.trigger('login_successful'); }, function () { self.$(".oe_login_pane").fadeIn("fast", function() { - self.show_error("Invalid username or password"); + self.show_error(_t("Invalid username or password")); }); }); }, @@ -765,7 +765,7 @@ instance.web.ChangePassword = instance.web.Widget.extend({ template: "ChangePassword", start: function() { var self = this; - this.getParent().dialog_title = "Change Password"; + this.getParent().dialog_title = _t("Change Password"); var $button = self.$el.find('.oe_form_button'); $button.appendTo(this.getParent().$buttons); $button.eq(2).click(function(){ diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js index 3db48c8412a..1a48463df2c 100644 --- a/addons/web/static/src/js/dates.js +++ b/addons/web/static/src/js/dates.js @@ -1,5 +1,6 @@ openerp.web.dates = function(instance) { +var _t = instance.web._t; /** * Converts a string to a Date javascript object using OpenERP's @@ -18,11 +19,11 @@ instance.web.str_to_datetime = function(str) { var regex = /^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(?:\.\d+)?$/; var res = regex.exec(str); if ( !res ) { - throw new Error("'" + str + "' is not a valid datetime"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str)); } var obj = Date.parseExact(res[1] + " UTC", 'yyyy-MM-dd HH:mm:ss zzz'); if (! obj) { - throw new Error("'" + str + "' is not a valid datetime"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str)); } return obj; }; @@ -45,11 +46,11 @@ instance.web.str_to_date = function(str) { var regex = /^\d\d\d\d-\d\d-\d\d$/; var res = regex.exec(str); if ( !res ) { - throw new Error("'" + str + "' is not a valid date"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str)); } var obj = Date.parseExact(str, 'yyyy-MM-dd'); if (! obj) { - throw new Error("'" + str + "' is not a valid date"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str)); } return obj; }; @@ -72,11 +73,11 @@ instance.web.str_to_time = function(str) { var regex = /^(\d\d:\d\d:\d\d)(?:\.\d+)?$/; var res = regex.exec(str); if ( !res ) { - throw new Error("'" + str + "' is not a valid time"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str)); } var obj = Date.parseExact("1970-01-01 " + res[1], 'yyyy-MM-dd HH:mm:ss'); if (! obj) { - throw new Error("'" + str + "' is not a valid time"); + throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str)); } return obj; }; diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index e586b94db6b..9432b02826f 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -224,7 +224,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { } while(tmp !== value); tmp = Number(value); if (isNaN(tmp)) - throw new Error(value + " is not a correct integer"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct integer"), value)); return tmp; case 'float': var tmp = Number(value); @@ -239,7 +239,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { var reformatted_value = tmp.replace(instance.web._t.database.parameters.decimal_point, "."); var parsed = Number(reformatted_value); if (isNaN(parsed)) - throw new Error(value + " is not a correct float"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct float"), value)); return parsed; case 'float_time': var factor = 1; @@ -263,7 +263,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { datetime = Date.parse(value); if (datetime !== null) return instance.web.datetime_to_str(datetime); - throw new Error(value + " is not a valid datetime"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value)); case 'date': var date = Date.parseExact(value, date_pattern); if (date !== null) @@ -271,7 +271,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { date = Date.parse(value); if (date !== null) return instance.web.date_to_str(date); - throw new Error(value + " is not a valid date"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct date"), value)); case 'time': var time = Date.parseExact(value, time_pattern); if (time !== null) @@ -279,7 +279,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { time = Date.parse(value); if (time !== null) return instance.web.time_to_str(time); - throw new Error(value + " is not a valid time"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct time"), value)); } return value; }; @@ -294,7 +294,7 @@ instance.web.auto_str_to_date = function(value, type) { try { return instance.web.str_to_time(value); } catch(e) {} - throw new Error("'" + value + "' is not a valid date, datetime nor time"); + throw new Error(_.str.sprintf(_t("'%s' is not a correct date, datetime nor time"), value)); }; instance.web.auto_date_to_str = function(value, type) { @@ -306,7 +306,7 @@ instance.web.auto_date_to_str = function(value, type) { case 'time': return instance.web.time_to_str(value); default: - throw new Error(type + " is not convertible to date, datetime nor time"); + throw new Error(_.str.sprintf(_t("'%s' is not convertible to date, datetime nor time"), type)); } }; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 927d585a5be..dd9b2be5fb0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -148,7 +148,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM load_form: function(data) { var self = this; if (!data) { - throw new Error("No data provided."); + throw new Error(_t("No data provided.")); } if (this.arch) { throw "Form view does not support multiple calls to load_form"; @@ -316,12 +316,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var self = this, set_values = []; if (!record) { this.set({ 'title' : undefined }); - 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; this._actualize_mode(); - this.set({ 'title' : record.id ? record.display_name : "New" }); + this.set({ 'title' : record.id ? record.display_name : _t("New") }); _(this.fields).each(function (field, f) { field._dirty_flag = false; @@ -431,7 +431,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var onchange = _.str.trim(on_change); var call = onchange.match(/^\s?(.*?)\((.*?)\)\s?$/); if (!call) { - throw new Error("Wrong on change format: " + onchange); + throw new Error(_.str.sprintf( _t("Wrong on change format: %s"), onchange )); } var method = call[1]; @@ -872,7 +872,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }).value(); warnings.unshift('