Merge lp:~dylanmccall/ubiquity/lp-476269 into lp:ubiquity

Proposed by Dylan McCall on 2010-02-24
Status: Rejected
Rejected by: Dimitri John Ledkov on 2012-08-29
Proposed branch: lp:~dylanmccall/ubiquity/lp-476269
Merge into: lp:ubiquity
Diff against target: 54 lines (+2/-23)
3 files modified
ubiquity/frontend/base.py (+0/-21)
ubiquity/frontend/gtk_ui.py (+1/-1)
ubiquity/frontend/kde_ui.py (+1/-1)
To merge this branch: bzr merge lp:~dylanmccall/ubiquity/lp-476269
Reviewer Review Type Date Requested Status
Dimitri John Ledkov 2010-02-24 Resubmit on 2012-08-29
Review via email: mp+20029@code.launchpad.net
To post a comment you must log in.
Dylan McCall (dylanmccall) wrote :

Part of my fix, where I had Ubiquity itself select the ideal fallback locale for the slideshow, was very flawed. This new version removes that excess functionality, where Javascript in the slideshow now handles all the necessary thinking in a manner consistent with other applications.

In this new version I have completely removed slideshow_get_available_locale() from ubiquity/frontend/base.py, kde_ui.py and gtk_ui.py. The slideshow is simply handed the entire current locale name, such as en_CA.UTF8, and it handles the rest.

Dimitri John Ledkov (xnox) wrote :

Two years later....
You submit a proposal to extend the function this merge proposal removes. So I'm gonna reject this merge proposal =)
If that's ok =)

review: Resubmit

Unmerged revisions

3826. By Dylan McCall on 2010-02-22

Remove locale check / fallback for slideshow in ubiquity (all done in ubiquity-slideshow now)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubiquity/frontend/base.py'
2--- ubiquity/frontend/base.py 2010-02-21 15:36:49 +0000
3+++ ubiquity/frontend/base.py 2010-02-24 03:32:14 +0000
4@@ -406,24 +406,3 @@
5 self.debconf_progress_info(
6 self.get_string('ubiquity/install/success_command'))
7 execute_root('sh', '-c', self.success_cmd)
8-
9- def slideshow_get_available_locale(self, slideshow_dir, locale):
10- # Returns the ideal locale for the given slideshow, based on the
11- # given locale, or 'c' if an ideal one is not available.
12- # For example, with locale=en_CA, this returns en if en_CA is not
13- # available. If en is not available this would return c.
14-
15- slides_dir = '%s/slides' % slideshow_dir
16- locale_choice = 'c'
17-
18- if os.path.exists('%s/loc.%s' % (slides_dir, locale)):
19- locale_choice = locale
20- else:
21- ll_cc = locale.split('.')[0]
22- ll = ll_cc.split('_')[0]
23- if os.path.exists('%s/loc.%s' % (slides_dir, ll_cc)):
24- locale_choice = ll_cc
25- elif os.path.exists('%s/loc.%s' % (slides_dir, ll)):
26- locale_choice = ll
27-
28- return locale_choice
29
30=== modified file 'ubiquity/frontend/gtk_ui.py'
31--- ubiquity/frontend/gtk_ui.py 2010-02-17 11:43:14 +0000
32+++ ubiquity/frontend/gtk_ui.py 2010-02-24 03:32:14 +0000
33@@ -906,7 +906,7 @@
34 self.live_installer.hide()
35
36 slideshow_dir = '/usr/share/ubiquity-slideshow'
37- slideshow_locale = self.slideshow_get_available_locale(slideshow_dir, self.locale)
38+ slideshow_locale = self.locale
39 slideshow_main = slideshow_dir + '/slides/index.html'
40
41 s = self.live_installer.get_screen()
42
43=== modified file 'ubiquity/frontend/kde_ui.py'
44--- ubiquity/frontend/kde_ui.py 2010-02-23 23:57:43 +0000
45+++ ubiquity/frontend/kde_ui.py 2010-02-24 03:32:15 +0000
46@@ -739,7 +739,7 @@
47 self.current_page = None
48
49 slideshow_dir = '/usr/share/ubiquity-slideshow-kubuntu'
50- slideshow_locale = self.slideshow_get_available_locale(slideshow_dir, self.locale)
51+ slideshow_locale = self.locale
52 slideshow_main = slideshow_dir + '/slides/index.html'
53
54 s = self.app.desktop().availableGeometry()

Subscribers

People subscribed via source and target branches

to status/vote changes: