Merge lp:~openerp-dev/openobject-addons/7.0-opw-586661-ado into lp:openobject-addons/7.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX] make the breadcrump string translatable

Steps:
1). Install any language other than english
2). Now switch to that installed language and goto supplier invoice and create new one and save it
You will find the breadcrump string is not translated.
I have also attached here a link of video which show the issue : http://www.youtube.com/watch?v=-NuBlSdrWKQ

Regards,
Amit

[Naresh(OpenERP) (nch-openerp)]

Hi Amit,

The missing terms in .POT's will be filled upon when a complete re-export of the translation terms are done.So there is no need to add them to .pot. Please uncommit the changes realted to .pot's.

Thanks,
Naresh Soni
OpenERP Enterprise Service

review: Needs Fixing

[Olivier Dony (Odoo) (odo-openerp)]

I will fix it while merging:

- no change to the POTs, will be done when exporting as Naresh explained
- avoid creating translatable terms with trailing spaces - it creates extra terms to translate ("Invoice" is already translated, so why ask translators to translate "Invoice "?!) and there's always a chance translators will not copy the whitespace characters. If the position of the space could change between languages, then the whole sentence needs to be made translatable in a way that translators can understand, for example "Invoice %(invoice_number)s" .

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-03-06 15:01:42 +0000
+++ account/account_invoice.py	2013-03-13 06:42:22 +0000
@@ -1121,10 +1121,10 @@
         if not ids:
             return []
         types = {
-                'out_invoice': 'Invoice ',
-                'in_invoice': 'Sup. Invoice ',
-                'out_refund': 'Refund ',
-                'in_refund': 'Supplier Refund ',
+                'out_invoice': _('Invoice '),
+                'in_invoice': _('Sup. Invoice '),
+                'out_refund': _('Refund '),
+                'in_refund': _('Supplier Refund '),
                 }
         return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 

=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2013-03-07 12:19:34 +0000
+++ account/i18n/account.pot	2013-03-13 06:42:22 +0000
@@ -53,6 +53,30 @@
 msgstr ""
 
 #. module: account
+#: code:addons/account/account_invoice.py:1124
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1125
+#, python-format
+msgid "Sup. Invoice "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1126
+#, python-format
+msgid "Refund "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1127
+#, python-format
+msgid "Supplier Refund "
+msgstr ""
+
+#. module: account
 #: code:addons/account/account_bank_statement.py:368
 #, python-format
 msgid "Journal item \"%s\" is not valid."