i18n causing regressions

[jpouellet]

Qubes-manager notifications have been broken since QubesOS/qubes-manager@4946d7b because .tr() is attempted to be called on self in places where self is not the QApplication (or anything deriving from QObject?). ([1], [2], [3], almost certainly others)

This results in stack traces like the following:

Exception in thread Thread-2:
Traceback (most recent call last):
  File "/usr/lib64/python2.7/threading.py", line 804, in __bootstrap_inner
    self.run()
  File "/usr/lib/python2.7/site-packages/pyinotify.py", line 1505, in run
    self.loop()
  File "/usr/lib/python2.7/site-packages/pyinotify.py", line 1491, in loop
    self.process_events()
  File "/usr/lib/python2.7/site-packages/pyinotify.py", line 1287, in process_events
    self._default_proc_fun(revent)
  File "/usr/lib/python2.7/site-packages/pyinotify.py", line 924, in __call__
    return _ProcessEvent.__call__(self, event)
  File "/usr/lib/python2.7/site-packages/pyinotify.py", line 644, in __call__
    return meth(event)
  File "/usr/lib64/python2.7/site-packages/qubesmanager/main.py", line 105, in process_IN_CLOSE_WRITE
    trayIcon.showMessage(unicode(self.tr(
AttributeError: 'QubesManagerFileWatcher' object has no attribute 'tr'

I tried just s/self.tr(/app.tr(/ everywhere, but app isn't available everywhere either, so apparently we need to review the scopes on a call-by-call basis? I feel like there should be a cleaner way to address this, but I don't know what that would be.

[jpouellet]

There are also more regressions where .tr() is callable, but still missing conversion from QString to something with .format(). QubesOS/qubes-manager@d073b35 did not hit all cases, for example here.

Definitely don't release to qubes-dom0-current yet ;)

[jpouellet]

There are also more regressions where .tr() is callable, but still missing conversion from QString to something with .format(). QubesOS/qubes-manager@d073b35 did not hit all cases, for example here.

Definitely don't release to qubes-dom0-current yet ;)

[marmarek]

([1], [2], [3], almost certainly others)

Any other example? Most of the code is in QObject based classes - the only exceptions I remember are:

• few classes at the beginning of main.py (you've hit this one)
• block.py, clipboard.py - excluded from translation for this reason
• backup_utils.py, appmenu_select.py - nothing to translate

As for wrapping self.tr with unicode - this is rather ugly, but mostly because QString is incompatible with python builtin str/unicode... The alternative is to switch to QString completely and use QString.arg (%1, %2, etc) instead of str.format ({} or named variant). IMHO consistency with our other python modules is more important than consistency with PyQt.

[marmarek]

([1], [2], [3], almost certainly others)

Any other example? Most of the code is in QObject based classes - the only exceptions I remember are:

• few classes at the beginning of main.py (you've hit this one)
• block.py, clipboard.py - excluded from translation for this reason
• backup_utils.py, appmenu_select.py - nothing to translate

As for wrapping self.tr with unicode - this is rather ugly, but mostly because QString is incompatible with python builtin str/unicode... The alternative is to switch to QString completely and use QString.arg (%1, %2, etc) instead of str.format ({} or named variant). IMHO consistency with our other python modules is more important than consistency with PyQt.

[jpouellet]

It seems I was wrong. All .tr()s except those three (and this) indeed do seem to operate on self in a class deriving from QSomething.

PR to correct just those 3: QubesOS/qubes-manager#26

[jpouellet]

It seems I was wrong. All .tr()s except those three (and this) indeed do seem to operate on self in a class deriving from QSomething.

PR to correct just those 3: QubesOS/qubes-manager#26

[qubesos-bot]

Automated announcement from builder-github

The package qubes-manager-3.2.9-1.fc23 has been pushed to the r3.2 testing repository for dom0.
To test this update, please install it with the following command:

sudo qubes-dom0-update --enablerepo=qubes-dom0-current-testing

Changes included in this update

[qubesos-bot]

Automated announcement from builder-github

The package qubes-manager-3.2.9-1.fc23 has been pushed to the r3.2 testing repository for dom0.
To test this update, please install it with the following command:

sudo qubes-dom0-update --enablerepo=qubes-dom0-current-testing

Changes included in this update