ubiquity

Merge lp:~dylanmccall/ubiquity/bug-1046511-fixed-slideshow-extras into lp:ubiquity

  1. bug-1046511-fixed-slideshow-extras
  2. Merge into trunk
Proposed by Dylan McCall
Status: Merged
Merged at revision: 5641
Proposed branch: lp:~dylanmccall/ubiquity/bug-1046511-fixed-slideshow-extras
Merge into: lp:ubiquity
Diff against target: 12 lines (+1/-1)
1 file modified
ubiquity/frontend/base.py (+1/-1)
To merge this branch: bzr merge lp:~dylanmccall/ubiquity/bug-1046511-fixed-slideshow-extras
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+123308@code.launchpad.net

Description of the change

This is the _real_ fix for bug #1046511. Previously, Ubiquity would ignore the presence of new locales in ubiquity-slideshow/slides/extras.

To post a comment you must log in.

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 2012-08-12 22:54:11 +0000
3+++ ubiquity/frontend/base.py 2012-09-07 16:11:38 +0000
4@@ -442,7 +442,7 @@
5 # available. If en is not available this would return c.
6
7 base_slides_dir = os.path.join(slideshow_dir, 'slides', 'l10n')
8- extra_slides_dir = os.path.join(base_slides_dir, 'extra')
9+ extra_slides_dir = os.path.join(slideshow_dir, 'slides', 'extra')
10
11 ll_cc = locale.split('.')[0]
12 ll = ll_cc.split('_')[0]

Subscribers

People subscribed via source and target branches

to status/vote changes: