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

[Dylan McCall]

[Dylan McCall (dylanmccall)]

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

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: Needs Resubmitting

Unmerged revisions

3826. By Dylan McCall on 2010-02-22

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

=== modified file 'ubiquity/frontend/base.py'
--- ubiquity/frontend/base.py	2010-02-21 15:36:49 +0000
+++ ubiquity/frontend/base.py	2010-02-24 03:32:14 +0000
@@ -406,24 +406,3 @@
             self.debconf_progress_info(
                 self.get_string('ubiquity/install/success_command'))
             execute_root('sh', '-c', self.success_cmd)
-    
-    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.
-        # 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
 
=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2010-02-17 11:43:14 +0000
+++ ubiquity/frontend/gtk_ui.py	2010-02-24 03:32:14 +0000
@@ -906,7 +906,7 @@
         self.live_installer.hide()
 
         slideshow_dir = '/usr/share/ubiquity-slideshow'
-        slideshow_locale = self.slideshow_get_available_locale(slideshow_dir, self.locale)
+        slideshow_locale = self.locale
         slideshow_main = slideshow_dir + '/slides/index.html'
 
         s = self.live_installer.get_screen()
 
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2010-02-23 23:57:43 +0000
+++ ubiquity/frontend/kde_ui.py	2010-02-24 03:32:15 +0000
@@ -739,7 +739,7 @@
         self.current_page = None
 
         slideshow_dir = '/usr/share/ubiquity-slideshow-kubuntu'
-        slideshow_locale = self.slideshow_get_available_locale(slideshow_dir, self.locale)
+        slideshow_locale = self.locale
         slideshow_main = slideshow_dir + '/slides/index.html'
 
         s = self.app.desktop().availableGeometry()