ubiquity

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

  1. fix-1350855
  2. Merge into trunk
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
1=== modified file 'ubiquity/frontend/kde_components/PartMan.py'
2--- ubiquity/frontend/kde_components/PartMan.py 2014-06-30 13:09:16 +0000
3+++ ubiquity/frontend/kde_components/PartMan.py 2015-03-08 16:11:09 +0000
4@@ -149,8 +149,7 @@
5 dialog.partition_create_use_combo.currentIndexChanged[int].connect(
6 self.on_partition_create_use_combo_changed)
7
8- # TODO
9- # self.translate_widget_children(dialog)
10+ self.ctrlr._wizard.translate_widget_children(dialog)
11
12 # TODO cjwatson 2006-11-01: Because partman doesn't use a question
13 # group for these, we have to figure out in advance whether each
14@@ -261,8 +260,7 @@
15 dialog.partition_edit_use_combo.currentIndexChanged[int].connect(
16 self.on_partition_edit_use_combo_changed)
17
18- # TODO
19- # self.translate_widget_children(dialog)
20+ self.ctrlr._wizard.translate_widget_children(dialog)
21
22 current_size = None
23 if ('can_resize' not in partition or not partition['can_resize'] or
24
25=== modified file 'ubiquity/frontend/kde_ui.py'
26--- ubiquity/frontend/kde_ui.py 2015-01-09 09:15:51 +0000
27+++ ubiquity/frontend/kde_ui.py 2015-03-08 16:11:09 +0000
28@@ -651,7 +651,7 @@
29 if not_current and p == current_page:
30 continue
31 prefix = p.ui.get('plugin_prefix')
32- for w in p.widgets:
33+ for w in p.widgets + p.optional_widgets:
34 for c in self.all_children(w):
35 widgets.append((c, prefix))
36

Subscribers

People subscribed via source and target branches

to status/vote changes: