Merge lp:~dylanmccall/ubiquity/ubiquity-slideshow-quantal-beta-1 into lp:ubiquity

[Dylan McCall]

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 :)

[lp:~dylanmccall/ubiquity/ubiquity-slideshow-quantal-beta-1]

5586. By Dylan McCall on 2012-08-12

Tweaks to support ubiquity-slideshow's new file structure and parameter format (LP: #1035806)

[Dimitri John Ledkov (xnox)]

I did not test LTR/RTL.
I did test translations and they are ok.

=== modified file 'ubiquity/frontend/base.py'
--- ubiquity/frontend/base.py	2012-07-16 14:29:13 +0000
+++ ubiquity/frontend/base.py	2012-08-12 22:56:19 +0000
@@ -437,24 +437,22 @@
 
     def slideshow_get_available_locale(self, slideshow_dir, locale):
         # Returns the ideal locale for the given slideshow, based on the
-        # given locale, or 'c' if an ideal one is not available.
+        # given locale, or 'C' if an ideal one is not available.
         # For example, with locale=en_CA, this returns en if en_CA is not
         # available. If en is not available this would return c.
 
-        slides_dir = '%s/slides' % slideshow_dir
-        locale_choice = 'c'
-
-        if os.path.exists('%s/loc.%s' % (slides_dir, locale)):
-            locale_choice = locale
-        else:
-            ll_cc = locale.split('.')[0]
-            ll = ll_cc.split('_')[0]
-            if os.path.exists('%s/loc.%s' % (slides_dir, ll_cc)):
-                locale_choice = ll_cc
-            elif os.path.exists('%s/loc.%s' % (slides_dir, ll)):
-                locale_choice = ll
-
-        return locale_choice
+        base_slides_dir = os.path.join(slideshow_dir, 'slides', 'l10n')
+        extra_slides_dir = os.path.join(base_slides_dir, 'extra')
+
+        ll_cc = locale.split('.')[0]
+        ll = ll_cc.split('_')[0]
+
+        for slides_dir in [extra_slides_dir, base_slides_dir]:
+            for test_locale in [locale, ll_cc, ll]:
+                locale_dir = os.path.join(slides_dir, test_locale)
+                if os.path.exists(locale_dir):
+                    return test_locale
+        return 'C'
 
     def check_returncode(self, *args):
         if self.wget_retcode is not None or self.wget_proc is None:
 
=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2012-07-16 14:29:13 +0000
+++ ubiquity/frontend/gtk_ui.py	2012-08-12 22:56:19 +0000
@@ -803,17 +803,20 @@
             return
 
         self.page_section.hide()
+
         slideshow_locale = self.slideshow_get_available_locale(
             self.slideshow, self.locale)
-        slideshow_main = self.slideshow + '/slides/index.html'
-
-        slides = 'file://' + slideshow_main
-        if slideshow_locale != 'c':  # slideshow will use default automatically
-            slides += '#?locale=' + slideshow_locale
-            ltr = i18n.get_string(
-                'default-ltr', slideshow_locale, 'ubiquity/imported')
-            if ltr == 'default:RTL':
-                slides += '?rtl'
+        slideshow_main = os.path.join(self.slideshow, 'slides', 'index.html')
+
+        parameters = []
+        parameters.append('locale=%s' % slideshow_locale)
+        ltr = i18n.get_string(
+            'default-ltr', slideshow_locale, 'ubiquity/imported')
+        if ltr == 'default:RTL':
+            parameters.append('rtl')
+        parameters_encoded = '&'.join(parameters)
+
+        slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
 
         from gi.repository import WebKit
         # We have no significant browsing interface, so there isn't much point
 
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2012-07-16 14:29:13 +0000
+++ ubiquity/frontend/kde_ui.py	2012-08-12 22:56:19 +0000
@@ -568,18 +568,20 @@
         slideshow_dir = '/usr/share/ubiquity-slideshow'
         slideshow_locale = self.slideshow_get_available_locale(slideshow_dir,
                                                                self.locale)
-        slideshow_main = slideshow_dir + '/slides/index.html'
+        slideshow_main = os.path.join(slideshow_dir, 'slides', 'index.html')
         if not os.path.exists(slideshow_main) or self.hide_slideshow:
             self.ui.pageMode.hide()
             return
 
-        slides = 'file://' + slideshow_main
-        if slideshow_locale != 'c':  # slideshow will use default automatically
-            slides += '#?locale=' + slideshow_locale
-            ltr = i18n.get_string('default-ltr', slideshow_locale,
-                                  'ubiquity/imported')
-            if ltr == 'default:RTL':
-                slides += '?rtl'
+        parameters = []
+        parameters.append('locale=%s' % slideshow_locale)
+        ltr = i18n.get_string(
+            'default-ltr', slideshow_locale, 'ubiquity/imported')
+        if ltr == 'default:RTL':
+            parameters.append('rtl')
+        parameters_encoded = '&'.join(parameters)
+
+        slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
 
         from PyQt4.QtWebKit import QWebView
         from PyQt4.QtWebKit import QWebPage