Merge lp:~parthpanchl/ubiquity/fix-1350855 into lp:ubiquity

Proposed by Parth Panchal
Status: Merged
Merged at revision: 6277
Proposed branch: lp:~parthpanchl/ubiquity/fix-1350855
Merge into: lp:ubiquity
Diff against target: 35 lines (+3/-5)
2 files modified
ubiquity/frontend/kde_components/PartMan.py (+2/-4)
ubiquity/frontend/kde_ui.py (+1/-1)
To merge this branch: bzr merge lp:~parthpanchl/ubiquity/fix-1350855
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+252224@code.launchpad.net

Description of the change

1. Adds `optional_widgets` (`page_advanced`) to the list of widgets to be translated
2. Calls `translate_widget_children` after creating `create` & `edit` `dialog`

To post a comment you must log in.
Revision history for this message
Jonathan Riddell (jr) wrote :

seems to work nice

The "Undo all changes" button and "boot loader" doesn't seem to be translated, any thoughts on that?

I did get a crash on this when I first tried it, but I didn't save it and I can't recreate it now even though I tried a few different times and different ways so I guess I'll merge.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubiquity/frontend/kde_components/PartMan.py'
--- ubiquity/frontend/kde_components/PartMan.py 2014-06-30 13:09:16 +0000
+++ ubiquity/frontend/kde_components/PartMan.py 2015-03-08 16:11:09 +0000
@@ -149,8 +149,7 @@
149 dialog.partition_create_use_combo.currentIndexChanged[int].connect(149 dialog.partition_create_use_combo.currentIndexChanged[int].connect(
150 self.on_partition_create_use_combo_changed)150 self.on_partition_create_use_combo_changed)
151151
152 # TODO152 self.ctrlr._wizard.translate_widget_children(dialog)
153 # self.translate_widget_children(dialog)
154153
155 # TODO cjwatson 2006-11-01: Because partman doesn't use a question154 # TODO cjwatson 2006-11-01: Because partman doesn't use a question
156 # group for these, we have to figure out in advance whether each155 # group for these, we have to figure out in advance whether each
@@ -261,8 +260,7 @@
261 dialog.partition_edit_use_combo.currentIndexChanged[int].connect(260 dialog.partition_edit_use_combo.currentIndexChanged[int].connect(
262 self.on_partition_edit_use_combo_changed)261 self.on_partition_edit_use_combo_changed)
263262
264 # TODO263 self.ctrlr._wizard.translate_widget_children(dialog)
265 # self.translate_widget_children(dialog)
266264
267 current_size = None265 current_size = None
268 if ('can_resize' not in partition or not partition['can_resize'] or266 if ('can_resize' not in partition or not partition['can_resize'] or
269267
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py 2015-01-09 09:15:51 +0000
+++ ubiquity/frontend/kde_ui.py 2015-03-08 16:11:09 +0000
@@ -651,7 +651,7 @@
651 if not_current and p == current_page:651 if not_current and p == current_page:
652 continue652 continue
653 prefix = p.ui.get('plugin_prefix')653 prefix = p.ui.get('plugin_prefix')
654 for w in p.widgets:654 for w in p.widgets + p.optional_widgets:
655 for c in self.all_children(w):655 for c in self.all_children(w):
656 widgets.append((c, prefix))656 widgets.append((c, prefix))
657657

Subscribers

People subscribed via source and target branches

to status/vote changes: