* translation of nearly all exceptions

 * the export of translations per module take only the files of these modules

bzr revid: chs@tinyerp.com-52cb3686b17250df7bc23bf90d18397c7888e6f2

4 files changed, 17 insertions, 15 deletions

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 15c3224e784..0c6bfc7edb1 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -71,7 +71,7 @@ class ir_model(osv.osv):
 	def unlink(self, cr, user, ids, context=None):
 		for model in self.browse(cr, user, ids, context):
 			if model.state <> 'manual':
-				raise except_orm('Error', "You can not remove the model '%s' !" %(field.name,))
+				raise except_orm(_('Error'), _("You can not remove the model '%s' !") %(field.name,))
 		res = super(ir_model, self).unlink(cr, user, ids, context)
 		pooler.restart_pool(cr.dbname)
 		return res
@@ -138,7 +138,7 @@ class ir_model_fields(osv.osv):
 	def unlink(self, cr, user, ids, context=None):
 		for field in self.browse(cr, user, ids, context):
 			if field.state <> 'manual':
-				raise except_orm('Error', "You can not remove the field '%s' !" %(field.name,))
+				raise except_orm(_('Error'), _("You can not remove the field '%s' !") %(field.name,))
 		#
 		# MAY BE ADD A ALTER TABLE DROP ?
 		#
@@ -153,7 +153,7 @@ class ir_model_fields(osv.osv):
 		res = super(ir_model_fields,self).create(cr, user, vals, context)
 		if vals.get('state','base')=='manual':
 			if not vals['name'].startswith('x_'):
-				raise except_orm('Error', "Custom fields must have a name that starts with 'x_' !")
+				raise except_orm(_('Error'), _("Custom fields must have a name that starts with 'x_' !"))
 			if self.pool.get(vals['model']):
 				self.pool.get(vals['model']).__init__(self.pool, cr)
 				self.pool.get(vals['model'])._auto_init(cr,{})
@@ -207,7 +207,7 @@ class ir_model_access(osv.osv):
 				'WHERE a.group_id IS NULL AND m.model = %s', (model_name,))
 			r= cr.fetchall()
 			if r[0][0] == None:
-				return True
+				return False # by default, the user had no access
 
 		if not r[0][0]:
 			if raise_exception:
@@ -282,8 +282,9 @@ class ir_model_data(osv.osv):
 	def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False):
 		warning = True
 		model_obj = self.pool.get(model)
+		context = {}	
 		if xml_id and ('.' in xml_id):
-			assert len(xml_id.split('.'))==2, '"%s" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id' % (xml_id)
+			assert len(xml_id.split('.'))==2, _('"%s" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id') % (xml_id)
 			warning = False
 			module, xml_id = xml_id.split('.')
 		if (not xml_id) and (not self.doinit):
diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py
index b962684035e..af413f54e41 100644
--- a/bin/addons/base/ir/ir_report_custom.py
+++ b/bin/addons/base/ir/ir_report_custom.py
@@ -31,6 +31,7 @@ from osv import fields,osv
 from osv.orm import browse_null
 import ir
 import report.custom
+from tools.translate import _
 
 class report_custom(osv.osv):
 	_name = 'ir.report.custom'
@@ -75,10 +76,10 @@ class report_custom(osv.osv):
 		
 			# required on field0 does not seem to work( cause we use o2m_l ?)
 			if not report.fields_child0:
-				raise osv.except_osv('Invalid operation :', 'Enter at least one field !')
+				raise osv.except_osv(_('Invalid operation'), _('Enter at least one field !'))
 			
 			if report.type in ['pie', 'bar', 'line'] and report.field_parent:
-				raise osv.except_osv('Invalid operation :', 'Tree can only be used in tabular reports')
+				raise osv.except_osv(_('Invalid operation'), _('Tree can only be used in tabular reports'))
 			
 			# Otherwise it won't build a good tree. See level.pop in custom.py.
 			if report.type == 'table' and report.field_parent and report.fields_child0 and not report.fields_child0[0].groupby:
@@ -86,7 +87,7 @@ class report_custom(osv.osv):
 
 			if report.type == 'pie':
 				if len(report.fields_child0) != 2:
-					raise osv.except_osv('Invalid operation :', 'Pie charts need exactly two fields')
+					raise osv.except_osv(_('Invalid operation'), _('Pie charts need exactly two fields'))
 				else:
 					c_f = {}
 					for i in range(2):
@@ -95,11 +96,11 @@ class report_custom(osv.osv):
 						for j in range(3):
 							c_f[i].append((not isinstance(eval('tmp.field_child'+str(j)), browse_null) and eval('tmp.field_child'+str(j)+'.ttype')) or None)
 					if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[1])):
-						raise osv.except_osv('Invalid operation : ','Second field should be figures')
+						raise osv.except_osv(_('Invalid operation'), _('Second field should be figures'))
 					
 			if report.type == 'bar':
 				if len(report.fields_child0) < 2:
-					raise osv.except_osv('Invalid operation : ','Bar charts need at least two fields')
+					raise osv.except_osv(_('Invalid operation'), _('Bar charts need at least two fields'))
 				else:
 					c_f = {}
 					for i in range(len(report.fields_child0)):
@@ -112,7 +113,7 @@ class report_custom(osv.osv):
 							pass
 						else:
 							if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[i])):
-								raise osv.except_osv('Invalid operation : ','Field %d should be a figure' %(i,))
+								raise osv.except_osv(_('Invalid operation'), _('Field %d should be a figure') %(i,))
 
 			if report.state=='subscribed':
 				continue
@@ -193,7 +194,7 @@ class report_custom_fields(osv.osv):
 					}
 				}
 			else:
-				print "Warning: using a relation field which uses an unknown object"
+				print _("Warning: using a relation field which uses an unknown object")	#TODO use the logger
 				return {'required': {next_level_field_name: True}}
 		else:
 			return {'domain': {next_level_field_name: []}}
diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index 20d2b383405..211f9dbaf45 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -121,9 +121,8 @@ class ir_translation(osv.osv, Cacheable):
 			return trans
 
 		if source:
-			source = source.strip().replace('\n',' ')
-			if isinstance(source, unicode):
-				source = source.encode('utf8')
+			#if isinstance(source, unicode):
+			#	source = source.encode('utf8')
 			cr.execute('select value ' \
 					'from ir_translation ' \
 					'where lang=%s ' \
diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 8940cc8521b..84fafefa3f4 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -29,6 +29,7 @@
 
 from osv import osv,fields
 import pickle
+from tools.translate import _
 
 class ir_values(osv.osv):
 	_name = 'ir.values'