Merge lp:~andrea.corbellini/ubiquity/bug-531343 into lp:ubiquity

[Andrea Corbellini]

[Stéphane Graber (stgraber)]

Was already fixed in commit below:

stgraber@castiana:~/data/code/ubiquity/ubiquity$ bzr log -r 3896.1.1
------------------------------------------------------------
revno: 3896.1.1
committer: Roman Shtylman <email address hidden>
branch nick: dev
timestamp: Sat 2010-03-06 16:35:37 -0500
message:
  fix for LP: #532533

  kubuntu install able to progress past language screen

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2010-02-26 14:43:54 +0000
+++ ubiquity/frontend/kde_ui.py	2010-03-03 14:58:16 +0000
@@ -113,10 +113,10 @@
             event.ignore()
 
 class Controller(ubiquity.frontend.base.Controller):
-    def translate(self, lang=None, just_me=True, reget=False):
+    def translate(self, lang=None, just_me=True, not_me=False, reget=False):
         if lang:
             self._wizard.locale = lang
-        self._wizard.translate_pages(lang, just_me, reget)
+        self._wizard.translate_pages(lang, just_me, not_me, reget)
 
     def allow_go_forward(self, allowed):
         self._wizard.allow_go_forward(allowed)
@@ -460,13 +460,18 @@
         rv = reduce(recurse, parentWidget.children(), [parentWidget])
         return rv
 
-    def translate_pages(self, lang=None, just_current=True, reget=False):
+    def translate_pages(
+        self, lang=None, just_current=True, not_current=False, reget=False):
+        current_page = self.pages[self.pagesindex]
         if just_current:
             pages = [self.pages[self.pagesindex]]
         else:
             pages = self.pages
         widgets = []
         for p in pages:
+            # There's no sense retranslating the page we're leaving.
+            if not_current and p == current_page:
+                continue
             prefix = p.ui.get('plugin_prefix')
             for w in p.widgets:
                 for c in self.all_children(w):