From 6b2d75997effdf67247b470724b5fe10bccca920 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Fri, 22 Jun 2007 10:18:03 +0000
Subject: [PATCH] SERVER: improve categories and fix some language mistake

bzr revid: ced-0e6eacc79c03250f2d5fd8172cb5db6cdd6551e3
---
 bin/addons/base/base_data.xml | 2 +-
 bin/service/web_services.py   | 2 +-
 bin/tools/translate.py        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 5c23ed47b44..35e40925095 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -32,7 +32,7 @@
 	</record>
 
 	<record model="res.lang" id="lang_en">
-		<field name="code">en_GB</field>
+		<field name="code">en_US</field>
 		<field name="name">English</field>
 	</record>
 
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 49f028293d0..80ca88b03ff 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -88,7 +88,7 @@ class db(netsvc.Service):
 						cr.close()
 						pool = pooler.get_pool(db_name, demo,serv.actions[id], update_module=True)
 						#tools.init_db(cr)
-						if lang and lang != 'en_EN':
+						if lang and lang != 'en_US':
 							filename = tools.config["root_path"] + "/i18n/" + lang + ".csv"
 							tools.trans_load(db_name, filename, lang) 
 
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 73eb1e8a0c6..82766d8cf54 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -110,6 +110,7 @@ def in_modules(object_name, modules):
 	return module in modules
 
 def trans_generate(lang, modules, dbname=None):
+	logger = netsvc.Logger()
 	if not dbname:
 		dbname=tools.config['db_name']
 	pool = pooler.get_pool(dbname)
@@ -171,7 +172,7 @@ def trans_generate(lang, modules, dbname=None):
 				to_translate.append([report_type, name, parse_func(d.documentElement)])
 			except IOError:
 				if fname:
-					print "Warning: couldn't export translation for report %s" % name, report_type, fname
+					logger.notifyChannel("init", netsvc.LOG_WARNING, "couldn't export translation for report %s %s %s" % name, report_type, fname)
 
 	# views
 	obj = pool.get("ir.ui.view")