Merge commit 'origin/master' into mdv-gpl3-py26

bzr revid: p_christ@hol.gr-20090330173719-27jcy2nyw1v4w3bq
bzr revid: p_christ@hol.gr-20090330173755-o3pxayaintefn150
bzr revid: p_christ@hol.gr-20090330173849-heuqfveq1xdeoe6h
bzr revid: p_christ@hol.gr-20090406130641-9mrstydveuqjkkjv

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py
index 2e8be987c24..b47a86265f5 100644
--- a/bin/addons/base/module/wizard/wizard_export_lang.py
+++ b/bin/addons/base/module/wizard/wizard_export_lang.py
@@ -27,7 +27,7 @@ import cStringIO
 import csv
 import pooler
 from osv import fields,osv
-
+from tools.translate import _
 
 class wizard_export_lang(osv.osv_memory):
 
@@ -60,8 +60,10 @@ class wizard_export_lang(osv.osv_memory):
         elif this.format == 'tgz':
             ext = this.lang and '.po' or '.pot'
             this.advice = _('Save this document to a .tgz file. This archive containt UTF-8 %s files and may be uploaded to launchpad.') % (ext,)
-       
-        this.name = "%s.%s" % (this.lang or _('new'), this.format)
+        filename = _('new')
+        if not this.lang and len(mods) == 1:
+            filename = mods[0]
+        this.name = "%s.%s" % (this.lang or filename, this.format)
         out=base64.encodestring(buf.getvalue())
         buf.close()
         return self.write(cr, uid, ids, {'state':'get', 'data':out, 'advice':this.advice, 'name':this.name}, context=context)