Merge lp:~ralsina/ubuntuone-control-panel/octetes into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Marked humanized units as translatable (Fixes LP:985333).

Mark humanized units as translatable

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

I like your octetes!

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-04-05 14:52:55 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-05-14 16:22:20 +0000
@@ -253,8 +253,6 @@
                    ' Would you like to install it?')
 QUIT_LABEL = _('Quit Ubuntu One')
 
-# pylint: enable=E0602
-
 
 def humanize(int_bytes):
     """Return a human readable representation of 'int_bytes'.
@@ -263,8 +261,9 @@
     the result.
 
     """
-    units = {0: 'bytes', 1: 'KiB', 2: 'MiB', 3: 'GiB', 4: 'TiB',
-             5: 'PiB', 6: 'Eib', 7: 'ZiB', 8: 'YiB'}
+    units = {0: _('bytes'), 1: _('KiB'), 2: _('MiB'), 3: _('GiB'),
+             4: _('TiB'), 5: _('PiB'), 6: _('Eib'), 7: _('ZiB'),
+             8: _('YiB')}
     unit = 0
     while int_bytes >= KILOBYTES:
         int_bytes = int_bytes / float(KILOBYTES)
@@ -273,6 +272,7 @@
     str_bytes = str_bytes.rstrip('0')
     str_bytes = str_bytes.rstrip('.')
     return '%s %s' % (str_bytes, units[unit])
+# pylint: enable=E0602
 
 
 def show_quota_warning(int_bytes_used, int_bytes_total):