Commits

Axel Hecht committed 44483e5

bug 938112, support the keyboard apps items key in manifest.webapp
Also allow a localizable app name in addition to the detail keys.

Comments (0)

Files changed (1)

                 except ValueError:
                     manifest_webapp = {}
                 lines = []
-                # manifest can either be a top-level app or
+                # manifest can be a top-level app, and
                 # have entry points, notably happening in
                 # the communications apps.
+                # The keyboard app features 'inputs' as
+                # localizable key, so support that too :-(
+                data_list = [(None, manifest_webapp)]
                 if ('entry_points' in manifest_webapp):
-                    data_list = manifest_webapp['entry_points'].iteritems()
-                else:
-                    data_list = [(None, manifest_webapp)]
+                    data_list.extend(manifest_webapp['entry_points'].iteritems())
+                if ('inputs' in manifest_webapp):
+                    data_list.extend(manifest_webapp['inputs'].iteritems())
+
                 for ep, entry_data in data_list:
                     if ('locales' in entry_data and
                         'en-US' in entry_data['locales']):