Merge lp:~dylanmccall/ubiquity/ubiquity-slideshow-quantal-beta-1 into lp:ubiquity
Status: | Merged |
---|---|
Merged at revision: | 5604 |
Proposed branch: | lp:~dylanmccall/ubiquity/ubiquity-slideshow-quantal-beta-1 |
Merge into: | lp:ubiquity |
Diff against target: |
108 lines (+35/-32) 3 files modified
ubiquity/frontend/base.py (+13/-15) ubiquity/frontend/gtk_ui.py (+12/-9) ubiquity/frontend/kde_ui.py (+10/-8) |
To merge this branch: | bzr merge lp:~dylanmccall/ubiquity/ubiquity-slideshow-quantal-beta-1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Installer Team | Pending | ||
Review via email: mp+119280@code.launchpad.net |
Description of the change
This change brings Ubiquity in line with the upcoming changes to ubiquity-slideshow. It involves the following:
- Translations for ubiquity-slideshow are arranged differently now, and there's a funny hack in Ubiquity that looks up translations so it can correctly tell the slideshow whether text should flow right-to-left or left-to-right. It would be nice to actually remove that hack, but for the time being I just cleaned it up a little and made it use the new directory structure.
- New format for parameters sent to the slideshow, removing crazy and unnecessary '?' characters.
In addition, I cleaned up my code in some places, using os.path.join instead of hard-coded '/' characters where appropriate.
Old versions of ubiquity-slideshow will behave strangely with Ubiquity with this patch, and vice-versa. I'd like to get everything in place before beta 1 :)
I did not test LTR/RTL.
I did test translations and they are ok.