[master] [PATCH] Fix the final progress message on live installations

[Vratislav Podzimek]

It needs to be translated and the product name should be used.

Signed-off-by: Vratislav Podzimek 
---
 pyanaconda/ui/gui/hubs/progress.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 73597a4..7de2cff 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -24,6 +24,7 @@ from __future__ import division
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)

+# pylint: disable-msg=E0611
 from gi.repository import GLib, Gtk

import itertools
@@ -176,8 +177,10 @@ class ProgressHub(Hub):

if flags.livecdInstall:
             continueText = self.builder.get_object("rebootLabel")
-            continueText.set_text("%s is now successfully installed on your system and ready "
-                                  "for you to use!  When you are ready, reboot your system to start using it!")
+            continueText.set_text(_("%s is now successfully installed on your "
+                                    "system and ready for you to use! When you "
+                                    "are ready, reboot your system to start "
+                                    "using it!") % productName)
             self.continueButton.set_label("_Quit")

self._progressBar = self.builder.get_object("progressBar")

[Samantha N. Bueno]

On Tue, Dec 18, 2012 at 12:01:14PM +0100, Vratislav Podzimek wrote:
> It needs to be translated and the product name should be used.
> Signed-off-by: Vratislav Podzimek
>
> pyanaconda/ui/gui/hubs/progress.py | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
> index 73597a4..7de2cff 100644
> --- a/pyanaconda/ui/gui/hubs/progress.py
> +++ b/pyanaconda/ui/gui/hubs/progress.py
> @@ -24,6 +24,7 @@ from __future__ import division
>  import gettext
>  _ = lambda x: gettext.ldgettext("anaconda", x)
>
> +# pylint: disable-msg=E0611

Can this just be removed?
> from gi.repository import GLib, Gtk
>
> import itertools
> @@ -176,8 +177,10 @@ class ProgressHub(Hub):
>      if flags.livecdInstall:
>          continueText = self.builder.get_object("rebootLabel")
>        continueText.set_text("%s is now successfully installed on your system and ready "
>                              "for you to use!  When you are ready, reboot your system to start using it!")
>        continueText.set_text(_("%s is now successfully installed on your "
>                                "system and ready for you to use! When you "
>                                "are ready, reboot your system to start "
>                                "using it!") % productName)
>        self.continueButton.set_label("_Quit")
>
>    self._progressBar = self.builder.get_object("progressBar")

Ack otherwise.

Samantha

[Vratislav Podzimek]

On Tue, 2012-12-18 at 08:12 -0500, Samantha N. Bueno wrote:
> On Tue, Dec 18, 2012 at 12:01:14PM +0100, Vratislav Podzimek wrote:
> > It needs to be translated and the product name should be used.
> > Signed-off-by: Vratislav Podzimek
> >
> > pyanaconda/ui/gui/hubs/progress.py | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
> > index 73597a4..7de2cff 100644
> > --- a/pyanaconda/ui/gui/hubs/progress.py
> > +++ b/pyanaconda/ui/gui/hubs/progress.py
> > @@ -24,6 +24,7 @@ from __future__ import division
> >  import gettext
> >  _ = lambda x: gettext.ldgettext("anaconda", x)
> >
> > +# pylint: disable-msg=E0611
>
> Can this just be removed?

You mean the comment or locally disabling pylint? We have this on many
other places too. pylint just doesn't work with gi.repository imports
and marks such imports as errors.

[Samantha N. Bueno]

On Tue, Dec 18, 2012 at 02:36:43PM +0100, Vratislav Podzimek wrote:
> On Tue, 2012-12-18 at 08:12 -0500, Samantha N. Bueno wrote:
> > On Tue, Dec 18, 2012 at 12:01:14PM +0100, Vratislav Podzimek wrote:
> > > It needs to be translated and the product name should be used.
> > > Signed-off-by: Vratislav Podzimek
> > >
> > > pyanaconda/ui/gui/hubs/progress.py | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
> > > index 73597a4..7de2cff 100644
> > > --- a/pyanaconda/ui/gui/hubs/progress.py
> > > +++ b/pyanaconda/ui/gui/hubs/progress.py
> > > @@ -24,6 +24,7 @@ from __future__ import division
> > >  import gettext
> > >  _ = lambda x: gettext.ldgettext("anaconda", x)
> > >
> > > +# pylint: disable-msg=E0611
> >
> > Can this just be removed?
>
> You mean the comment or locally disabling pylint? We have this on many
> other places too. pylint just doesn't work with gi.repository imports
> and marks such imports as errors.

I meant the comment. I was not aware of that peculiarity though, so
nevermind--ack from me.

Samantha