# HG changeset patch
# User jruigrok
# Date 1270973712 0
# Node ID 35ddd6822ab506e17a50f5470cb62eedc60037a7
# Parent  74de1a99a3125b5d09c93387cf4e807ce8b914a4
Merged revisions 459 via svnmerge from
http://svn.edgewall.org/repos/babel/trunk

........
  r459 | palgarvio | 2008-12-16 00:14:50 +0100 (di, 16 dec 2008) | 2 lines

  Typo's and sorted output of `list-locales`.
........

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
  * Backport r493-494: documentation typo fixes.
  * Make the CLDR import script work with Python 2.7.
+ * Fix various typos.
+ * Sort output of list-locales.
 
 
 Version 0.9.5
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -639,7 +639,7 @@
             identifiers = localedata.list()
             longest = max([len(identifier) for identifier in identifiers])
             format = u'%%-%ds %%s' % (longest + 1)
-            for identifier in localedata.list():
+            for identifier in sorted(localedata.list()):
                 locale = Locale.parse(identifier)
                 output = format % (identifier, locale.english_name)
                 print output.encode(sys.stdout.encoding or
@@ -1000,13 +1000,13 @@
         parser.add_option('--ignore-obsolete', dest='ignore_obsolete',
                           action='store_true',
                           help='do not include obsolete messages in the output '
-                               '(default %default)'),
+                               '(default %default)')
         parser.add_option('--no-fuzzy-matching', '-N', dest='no_fuzzy_matching',
                           action='store_true',
-                          help='do not use fuzzy matching (default %default)'),
+                          help='do not use fuzzy matching (default %default)')
         parser.add_option('--previous', dest='previous', action='store_true',
                           help='keep previous msgids of translated messages '
-                               '(default %default)'),
+                               '(default %default)')
 
         parser.set_defaults(domain='messages', ignore_obsolete=False,
                             no_fuzzy_matching=False, previous=False)
@@ -1017,7 +1017,7 @@
         if not options.output_file and not options.output_dir:
             parser.error('you must specify the output file or directory')
         if options.output_file and not options.locale:
-            parser.error('you must specify the loicale')
+            parser.error('you must specify the locale')
         if options.no_fuzzy_matching and options.previous:
             options.previous = False