Merge lp:~ken-brotherton/boots/local2 into lp:boots

[KenBrotherton]

[KenBrotherton (ken-brotherton)]

Tested and working. Forced to remerged the app and lib data as the domain for the two is the same. No found way to distinguish between the two at run time.

[Max Goodhart (chromakode)]

The module boots.util appears to be missing. Did you forget to add the file?

review: Needs Fixing

[KenBrotherton (ken-brotherton)]

Corrected. Please rereview.

On Tue, 2010-03-02 at 00:58 +0000, Chromakode wrote:
> Review: Needs Fixing
> The module boots.util appears to be missing. Did you forget to add the file?

--

*You can find me on IM as well
bedlamoid (Yahoo,AIM, MSN)
ken.brotherton@gmail (GTalk)
http://www.myspace.com/broken_broken
http://www.facebook.com/people/Ken-Brotherton/691662047

[lp:~ken-brotherton/boots/local2]

92. By Ken Brotherton <kennyb@capstone14> on 2010-03-02

Tested Full app Localizations

[Max Goodhart (chromakode)]

Still working on merging. I think expressions like...

return ConsoleError(_("Invalid lingo")+" \"{0}\" "+_("specified.").format(lingo))

...need the sting formatting operators inside the localized strings. See:

http://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms

=== modified file 'boots/api/nodes/node.py'
--- boots/api/nodes/node.py	2010-02-27 05:40:10 +0000
+++ boots/api/nodes/node.py	2010-03-02 01:07:12 +0000
@@ -25,6 +25,8 @@
 from itertools import chain, tee, repeat
 from threading import Thread, Event, Lock
 from types import GeneratorType
+import gettext
+gettext.install("boots",localedir=None,unicode=1)
 
 def catch_exceptions(iterable):
     try:

=== modified file 'boots/app/client_config.py'
--- boots/app/client_config.py	2010-03-01 08:03:27 +0000
+++ boots/app/client_config.py	2010-03-02 01:07:12 +0000
@@ -28,6 +28,7 @@
 import optparse
 import os, os.path
 import info
+from boots.util import set_gettext
 
 def find_executable(name):
     # Search algorithm adapted from os._execvpe 
@@ -88,71 +89,75 @@
                                     action = "store",
                                     type = "string",
                                     dest = "command",
-                                    help = "Execute command and exit")
+                                    help = _("Execute command and exit"))
         self._cli_parser.add_option("-D", "--database",
                                     action = "store",
                                     type = "string",
                                     dest = "database",
-                                    help = "Use database")
+                                    help = _("Use database"))
         self._cli_parser.add_option("-f", "--script",
                                     action = "store",
                                     type = "string",
                                     dest = "script",
-                                    help = "Execute commands from file and exit")
+                                    help = _("Execute commands from file and exit"))
         self._cli_parser.add_option('-l', '--lingo',
                                     action = 'store',
                                     type = 'string',
                                     dest = 'lingo',
-                                    help = 'Set the lingo to use')
+                                    help = _('Set the lingo to use'))
         self._cli_parser.add_option("-X", "--norc",
                                     action = "store_true",
                                     dest = "norc",
-                                    help = "Do not read user configuration file")
+                                    help = _("Do not read user configuration file"))
         self._cli_parser.add_option("-r", "--rc",
                                     action = "store",
                                     type = "string",
                                     dest = "rcfile",
-                                    help = "Filename of user configuration file")
+                                    help = _("Filename of user configuration file"))
         self._cli_parser.add_option("-H", "--host",
                                     action = "store",
                                     type = "string",
                                     dest = "host",
-                                    help = "Connect to host")
+                                    help = _("Connect to host"))
         self._cli_parser.add_option("-p", "--port",
                                     action = "store",
                                     type = "int",
                                     dest = "port",
-                                    help = "Use port number")
+                                    help = _("Use port number"))
         self._cli_parser.add_option("-u", "--user",
                                     action = "store",
                                     type = "string",
                                     dest = "username",
-                                    help = "Login with username")
+                                    help = _("Login with username"))
         self._cli_parser.add_option("-P", "--password",
                                     action = "store",
                                     type = "string",
                                     dest = "password",
+<<<<<<< TREE
                                     help = "Connect using password. If none is given, query for password")
         self._cli_parser.add_option("--pager",
                                     action = "store",
                                     type = "string",
                                     dest = "pager",
                                     help = "Pipe query results to the specified pager.")
+=======
+                                    help = _("Connect using password. If none is given, query for password"))
+>>>>>>> MERGE-SOURCE
         self._cli_parser.add_option("-t", "--terminatingchar",
                                     action = "store",
                                     type = "string",
                                     dest = "terminating_char",
-                                    help = "Specify the SQL statement terminating character. Default is ';'.")
+                                    help = _("Specify the SQL statement terminating character. Default is ';'."))
         self._cli_parser.add_option("-F", "--historyfile",
                                     action = "store",
                                     type = "string",
                                     dest = "history_file",
-                                    help = "Specify file to save history to")
+                                    help = _("Specify file to save history to"))
         self._cli_parser.add_option("-L", "--historylength",
                                     action = "store",
                                     type = "int",
                                     dest = "history_length",
-                                    help = "Specify max history file length")
+                                    help = _("Specify max history file length"))
  
     def __getitem__(self, key):
         """Allows one to use the [] operator to get config items."""
@@ -200,11 +205,11 @@
         except IOError:
             if filepath != info.RCFILE:
                 # Only print an error if a non-default rc file was specified.
-                print("rcfile {0} not found".format(filepath))
+                print("rcfile {0} "+_("not found").format(filepath))
         except SyntaxError:
-            print("rcfile {0} contains a syntax error".format(filepath))
+            print("rcfile {0} "+_("contains a syntax error").format(filepath))
         except Exception as e:
-            print("rcfile {0} contains an error: {1}".format(filepath, e))
+            print("rcfile {0} "+_("contains an error:")+" {1}".format(filepath, e))
         return file_dict
 
     def get_cli_conf(self):

=== modified file 'boots/lib/console.py'
--- boots/lib/console.py	2010-02-28 22:37:03 +0000
+++ boots/lib/console.py	2010-03-02 01:07:12 +0000
@@ -38,8 +38,10 @@
 from boots.lib.lingos import python
 from boots.lib.lingos import piped_sql
 from boots.lib.lingos import sql
+from boots.util import set_gettext
 import sys
 
+
 # Utility function.
 def iterable(obj):
     """Returns True if obj is iterable; otherwise, False is returned."""
@@ -91,20 +93,20 @@
         self.hooks["load"].call()
 
     def _init_help(self):
-        self.help = HelpTopic("boots", "Boots Help", "Help", """
-            Boots is a flexible, extensible, and multilingual shell for working with databases. To read more about a subtopic, use `help <topic>`.""")
+        self.help = HelpTopic("boots", "Boots Help", "Help", _("""
+            Boots is a flexible, extensible, and multilingual shell for working with databases. To read more about a subtopic, use `help <topic>`."""))
         
         self.help["commands"] = QueryIndexTopic("commands", None, 
-                                                "List of Boots commands.",
+                                                _("List of Boots commands."),
                                                 query=("commands",))
         
-        self.help["commands"].add("\quit", "quit", "Quit boots.")
-        self.help["commands"].add("\help", "help", "Show help for a topic.", """
+        self.help["commands"].add("\quit", "quit", _("Quit boots."))
+        self.help["commands"].add("\help", "help", _("Show help for a topic."), _("""
             help <topic>
-            Show help for \"topic\".""")
+            Show help for \"topic\"."""))
             
-        self.help.add("lingos", "Lingos", "Documentation for loaded lingos.", """
-            A lingo is a command language usable within Boots.""")
+        self.help.add("lingos", "Lingos", _("Documentation for loaded lingos."), _("""
+            A lingo is a command language usable within Boots."""))
 
     def input_complete(self, command, lingo):
         if self.metacommands.get_metacommand(command) is not None:
@@ -115,6 +117,7 @@
             return command
                       
     def run(self, command, lingo="sql"):
+<<<<<<< TREE
         if not lingo in self.lingos:
             return ConsoleError("Invalid lingo \"{0}\" specified.".format(lingo))
         
@@ -130,6 +133,12 @@
         result_graph.link_output(self.presenter.presenter_graph)
         result_graph.start()
         result_graph.run()
+=======
+        if lingo in self.lingos:
+            return self.lingos[lingo].execute(command)
+        else:
+            return ConsoleError(_("Invalid lingo")+" \"{0}\" "+_("specified.").format(lingo))
+>>>>>>> MERGE-SOURCE
 
     def connect(self, host, port, database):
         try:
@@ -142,7 +151,7 @@
             self.servers.append(server)
             return True
         else:
-            error = ConsoleError("Could not connect to {0}:{1}".format(host, port))
+            error = ConsoleError(_("Could not connect to")+" {0}:{1}".format(host, port))
             self.presenter.presenter_graph.put(error)
             return False
 
@@ -162,7 +171,7 @@
         if self.welcome_msg and self.driver.is_interactive:
             server_lines = []
             for server in self.servers:
-                line_format = "{0.hostname}:{0.port} (server v{0.server_version})"
+                line_format = "{0.hostname}:{0.port} ("+_("server")+" v{0.server_version})"
                 server_lines.append(line_format.format(server))
             server_status = "\n".join(server_lines)
             
@@ -182,7 +191,7 @@
         
     def quit(self, exitcode = 0):
         if self.driver.is_interactive:
-            self.presenter.presenter_graph.put("Boots quit.")
+            self.presenter.presenter_graph.put(_("Boots quit."))
             
         self.hooks["unload"].call()
         self.disconnect(None, None)
@@ -200,9 +209,9 @@
                 self.presenter.present(topic.format(include_index=True))
             else:
                 paths = ", ".join("\"{0}\"".format(" ".join(path)) for path in results)
-                self.presenter.present("Did you mean: {0}?".format(paths))
+                self.presenter.present(_("Did you mean:")+" {0}?".format(paths))
         else:
-            self.presenter.present("No help found for \"{0}\".".format(" ".join(query)))
+            self.presenter.present(_("No help found for")+" \"{0}\".".format(" ".join(query)))
 
     def meta_connect(self, host=None, port=None, database=None):
         if host is None: 

=== modified file 'boots/lib/lingos/lingo.py'
--- boots/lib/lingos/lingo.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lingo.py	2010-03-02 01:07:12 +0000
@@ -23,6 +23,8 @@
 
 import sys
 
+from boots.util import set_gettext
+
 class LingoRegistry(object):
     def __init__(self):
         self._lingos = {}
@@ -31,7 +33,7 @@
         """Registers a lingo with the given name and interpreter.  Raises a KeyError if a lingo with
         name is already registered."""
         if name in self._lingos:
-            raise KeyError('A lingo with name {0} already exists'.format(name))
+            raise KeyError(_('A lingo with name')+' {0} '+_('already exists').format(name))
     
         self._lingos[name] = interpreter
     

=== modified file 'boots/lib/lingos/lisp/builtins.py'
--- boots/lib/lingos/lisp/builtins.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lisp/builtins.py	2010-03-02 01:07:12 +0000
@@ -22,8 +22,10 @@
 # ##### END LICENSE BLOCK #####
 
 from boots.lib.lingos.lisp import objects
+from boots.util import set_gettext
 import sys
 
+
 nil = objects.Null()
 t = objects.T()
 
@@ -57,7 +59,7 @@
     elif isinstance(s, objects.String):
         return objects.Integer(len(s.python_string()))
     else:
-        raise TypeError('Expected a cons, nil or a string')
+        raise TypeError(_('Expected a cons, nil or a string'))
 
 def elt_function(s, i):
     """Returns the ith element of the sequence s."""
@@ -66,7 +68,7 @@
     elif isinstance(s, objects.String):
         return s.python_string()[i.python_integer()]
     else:
-        raise TypeError('Expected a cons or string')
+        raise TypeError(_('Expected a cons or string'))
 
 def gensym_function():
     """Returns a unique symbol that will never be the same as any other symbol even if it has the same name."""

=== modified file 'boots/lib/lingos/lisp/lexer.py'
--- boots/lib/lingos/lisp/lexer.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lisp/lexer.py	2010-03-02 01:07:12 +0000
@@ -22,6 +22,7 @@
 # ##### END LICENSE BLOCK #####
 
 import ply.lex as lex
+from boots.util import set_gettext
 
 tokens = ('INTEGER', 'STRING', 'SYMBOL', 'QUOTE', 'LEFT_PAREN', 'RIGHT_PAREN')
 
@@ -34,7 +35,7 @@
 t_ignore = ' \t\n'
 
 def t_error(t):
-    print('illegal character {0} found'.format(t.value))
+    print(_('illegal character {0} found').format(t.value))
     token.lexer.skip(1)
 
 lexer = lex.lex()

=== modified file 'boots/lib/lingos/lisp/lisp.py'
--- boots/lib/lingos/lisp/lisp.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lisp/lisp.py	2010-03-02 01:07:12 +0000
@@ -44,9 +44,11 @@
 from boots.lib.lingos.lisp import lexer
 from boots.lib.lingos.lisp import objects
 from boots.lib.lingos.lisp import parser
+from boots.util import set_gettext
 import re
 import readline
 
+
 def input_complete(string):
     """Returns string if string is a complete lisp expression.  Otherwise, None is returned."""
     # Remove strings as they may contain parentheses.
@@ -56,7 +58,7 @@
     paren_level = left_parens - right_parens
 
     if paren_level < 0:
-        raise SyntaxError('unmatched closing ")"')
+        raise SyntaxError(_('unmatched closing ")"'))
     elif paren_level > 0:
         return None
     else:
@@ -75,7 +77,7 @@
     if isinstance(stream, file):
         stream = stream.readline
     elif not callable(stream):
-        raise TypeError('{0} is not a stream or a callable'.format(stream))
+        raise TypeError('{0} '+_('is not a stream or a callable').format(stream))
     # Read lines until all open lisp expressions have been closed.
     while True:
         line = stream()

=== modified file 'boots/lib/lingos/lisp/objects.py'
--- boots/lib/lingos/lisp/objects.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lisp/objects.py	2010-03-02 01:07:12 +0000
@@ -25,6 +25,8 @@
 import copy
 import sys
 
+from boots.util import set_gettext
+
 _gensym_count = 1
 _symbols = {}
 
@@ -96,7 +98,7 @@
             else_expression = car(cdr(cdr(cdr(self))))
 
             if then_expression is Null() or cdr(cdr(cdr(cdr(self)))) is not Null():
-                raise SyntaxError('wrong number of arguments for if special form {0}'.format(self))
+                raise SyntaxError(_('wrong number of arguments for if special form')+' {0}'.format(self))
 
             if condition_expression.evaluate(environment) != Null():
                 return then_expression.evaluate(environment)
@@ -115,7 +117,7 @@
             values = arguments[2::2]
 
             if len(symbols) != len(values) or len(symbols) == 0:
-                raise SyntaxError('The number of symbols must equal the number of values and must be non-zero')
+                raise SyntaxError(_('The number of symbols must equal the number of values and must be non-zero'))
 
             for symbol, value in zip(symbols, values):
                 value = value.evaluate(environment)
@@ -129,7 +131,7 @@
         else: # Handle function calls.
             function = self.car.evaluate(environment)
             if not isinstance(function, Lambda):
-                raise TypeError('Expected a function')
+                raise TypeError(_('Expected a function'))
             else:
                 return function.call((argument.evaluate(environment) for argument in self.python_list()[1:]), environment)
 
@@ -165,18 +167,18 @@
     def __getitem__(self, symbol):
         """Returns the value of symbol in the environment."""
         if not isinstance(symbol, Symbol):
-            raise TypeError('Expected a symbol')
+            raise TypeError(_('Expected a symbol'))
 
         try:
             return self._environment[symbol][-1]
         except KeyError:
-            raise KeyError('No binding for {0} exists in the current environment'.format(symbol))
+            raise KeyError(_('No binding for')+' {0} '+_('exists in the current environment').format(symbol))
 
     def __setitem__(self, symbol, value):
         """Sets symbol to value in the environment.  If no binding for symbol exists, a binding is created at the innermost
         scope."""
         if not isinstance(symbol, Symbol):
-            raise TypeError('Expected a symbol')
+            raise TypeError(_('Expected a symbol'))
 
         if symbol not in self._environment:
             self._environment[symbol] = [value]
@@ -188,7 +190,7 @@
     # def __delitem__(self, symbol):
     #     """Removes the first binding found for symbol.  Returns True if the symbol is found and False otherwise."""
     #     if not isinstance(symbol, Symbol):
-    #         raise TypeError('Expected a symbol')
+    #         raise TypeError(_('Expected a symbol'))
         
     #     if symbol in self._environment:
     #         self._environment[symbol].pop()
@@ -215,7 +217,7 @@
     def pop(self):
         """Removes the innermost scope and returns a dictionary that corresponds to its bindings."""
         if len(self._scopes) <= 1:
-            raise RuntimeError('Cannot pop the innermost scope because then no scopes would remain')
+            raise RuntimeError(_('Cannot pop the innermost scope because then no scopes would remain'))
         symbols = self._scopes.pop()
         
         for symbol in symbols:

=== modified file 'boots/lib/lingos/lisp/parser.py'
--- boots/lib/lingos/lisp/parser.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/lisp/parser.py	2010-03-02 01:07:12 +0000
@@ -24,8 +24,10 @@
 from lexer import tokens
 from boots.lib.lingos.lisp import builtins
 from boots.lib.lingos.lisp import objects
+from boots.util import set_gettext
 import ply.yacc as yacc
 
+
 def p_expression_integer(p):
     'expression : INTEGER'
     p[0] = objects.Integer(int(p[1]))
@@ -59,7 +61,7 @@
     p[0] = objects.Cons(p[1], p[2])
 
 def p_error(p):
-    print('syntax error')
+    print(_('syntax error'))
 
 # Disable debugging output and caching of parse tables.
 parser = yacc.yacc(debug = 0, write_tables = 0)

=== modified file 'boots/lib/lingos/piped_sql.py'
--- boots/lib/lingos/piped_sql.py	2010-02-27 05:54:13 +0000
+++ boots/lib/lingos/piped_sql.py	2010-03-02 01:07:12 +0000
@@ -26,8 +26,10 @@
 from boots.lib.ui.components.help import HelpTopic
 from boots.lib.lingos import lingo
 from boots.lib.lingos import sql
+from boots.util import set_gettext
 import re
 
+
 # Set this to another node constructor to change the default constructor used for output files.
 output_file_node = csv_output_file_node
 
@@ -40,7 +42,7 @@
 constructor_call_re = re.compile('^(?P<name>[a-zA-Z_]+)\((?P<arguments>([^,\(\)]+,)*[^,\(\)]+)?\)$')
 
 class PipedSQLInterpreter(sql.SQLInterpreter):
-    help = HelpTopic("pipedsql", "Piped SQL Lingo", "Enhanced SQL query language supporting pipes.")
+    help = HelpTopic("pipedsql", "Piped SQL Lingo", _("Enhanced SQL query language supporting pipes."))
     
     def __init__(self, *args, **kwargs):
         super(PipedSQLInterpreter, self).__init__(*args, **kwargs)
@@ -52,7 +54,7 @@
         match = clause_re.match(clause_string)
 
         if not match:
-            raise SyntaxError('{0} is not in the correct function call syntax'.format(clause_string))
+            raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(clause_string))
 
         constructor_call = match.group('constructor_call').strip()
         output_file = match.group('output_file')
@@ -63,7 +65,7 @@
         match = constructor_call_re.match(constructor_string)
 
         if not match:
-            raise SyntaxError('{0} is not in the correct function call syntax'.format(constructor_string))
+            raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(constructor_string))
         
         name = match.group('name')
         arguments = match.group('arguments')
@@ -90,7 +92,7 @@
                     constructor_call, output_file = self._parse_clause(clause)
                 except SyntaxError as e:
                     print(e)
-                    print 'error1'
+                    print _('error1')
                     return [] # Return an empty list to avoid printing None.
 
                 try:
@@ -102,7 +104,7 @@
                 # SQL is only allowed for the first node.
                 if sql:
                     if not first_node:
-                        raise SyntaxError('SQL is only permitted for the first clause')
+                        raise SyntaxError(_('SQL is only permitted for the first clause'))
                     
                     # FIXME: Add support for multiple servers here.  Currently only the first server
                     # is used.

=== modified file 'boots/lib/ui/components/help.py'
--- boots/lib/ui/components/help.py	2010-02-27 05:54:13 +0000
+++ boots/lib/ui/components/help.py	2010-03-02 01:07:12 +0000
@@ -21,6 +21,8 @@
 #
 # ##### END LICENSE BLOCK #####
 
+from boots.util import set_gettext
+
 def issubseq(subseq, seq):
     """Determines if the elements the sequence subseq form a subsequence of the sequence seq."""
     for start in range(len(seq) - len(subseq) + 1):
@@ -63,11 +65,11 @@
         template += "{0.description}"
         
         if self.see_also:
-            template += "\n\nSee also: {0.see_also}"
+            template += "\n\n"+_("See also:")+" {0.see_also}"
         
         output = template.format(self)
         if include_index and self._subtopics:
-            output += "\n--- Subtopics ---\n" + self.format_index()
+            output += "\n--- "+_("Subtopics")+" ---\n" + self.format_index()
             
         return output
  
@@ -101,7 +103,7 @@
                 assert isinstance(item, str)
             return query
         else:
-            raise TypeError('query object {0} is not a string or tuple of strings'.format(query))
+            raise TypeError(_('query object')+' {0} '+_('is not a string or tuple of strings').format(query))
  
     def _ensure_key(self, key):
         """Creates a new subtopic that key maps to if none exists."""
@@ -198,4 +200,4 @@
         subtopics = self._subtopics.copy()
         for path in self.root.search(self.query):
             subtopics.update(self.root[path]._subtopics)
-        return subtopics
\ No newline at end of file
+        return subtopics

=== modified file 'boots/lib/ui/components/metacommands.py'
--- boots/lib/ui/components/metacommands.py	2010-02-27 05:54:13 +0000
+++ boots/lib/ui/components/metacommands.py	2010-03-02 01:07:12 +0000
@@ -22,6 +22,7 @@
 # ##### END LICENSE BLOCK #####
 
 import warnings
+from boots.util import set_gettext
 
 def parse_metacommand(commandstring):
     """This function wraps str.split() for metacommands
@@ -43,7 +44,7 @@
             # FIXME: Issue warning through the UI using ui.print
             # FIXME: Determine the offending command(s) (set.intersect?)
             # FIXME: Print offending commands
-            warnings.warn("Conflicts between metacommands detected.")
+            warnings.warn(_("Conflicts between metacommands detected."))
         self.names |= newnames
 
 class MetaCommands(object):

=== modified file 'boots/lib/ui/plain.py'
--- boots/lib/ui/plain.py	2010-03-01 08:21:05 +0000
+++ boots/lib/ui/plain.py	2010-03-02 01:07:12 +0000
@@ -28,13 +28,18 @@
 import os
 import time
 import readline
+<<<<<<< TREE
 import subprocess
 import threading
+=======
+
+>>>>>>> MERGE-SOURCE
  
 from boots.api.nodes.node import NodeGraph, SyncNode
 from boots.lib.ui.components.help import HelpTopic
 from boots.lib.ui.components.metacommands import MetaCommands, parse_metacommand
 from boots.lib.ui.generic import StdinDriver, StdoutPresenter
+from boots.util import set_gettext
 
 class PlainUI(StdinDriver, StdoutPresenter):
     """Class that provides a 'plain' UI for boots. Input is taken on stdin,
@@ -42,11 +47,11 @@
     results are printed to stdout. These results are printed as tables when
     they are Server packets and as string interpretations otherwise."""
     
-    help = HelpTopic("plain", "Plain UI", "Plain UI documentation.", """
-        A simple, minimal user interface for Boots.""")
+    help = HelpTopic("plain", "Plain UI", _("Plain UI documentation."), _("""
+        A simple, minimal user interface for Boots."""))
     
-    help.add("commands", None, "List of Plain UI commands.")
-    help["commands"].add("\use", "use", "Switch to a different lingo.")
+    help.add("commands", None, _("List of Plain UI commands."))
+    help["commands"].add("\use", "use", _("Switch to a different lingo."))
     
     def __init__(self, console):
         """Initialize a UI giving it its parent console, primary prompt,
@@ -183,6 +188,7 @@
             self.last_desc = result["info"]
             if result["result"]:
                 self.buffer.extend(result["result"])
+<<<<<<< TREE
             elif self.buffer:
                 printed = False
                 if self.pager_command and self.console.driver.is_interactive:
@@ -201,6 +207,32 @@
             sys.stdout.write("\n")
         elif result is not None:
             sys.stdout.write(str(result))
+=======
+            else:
+                if self.buffer:
+                    max_widths = map(max, [(len(column[0]), column[2]) for column in self.last_desc])
+                    dashes = map(lambda x: "-"*(x+2), max_widths)
+                    sep_line = "+" + "+".join(dashes) + "+\n"
+                    current_time = time.time()
+                    info_line = "{0} "+_("rows in set")+" ({1:.2f} "+_("seconds")+").\n".format(len(self.buffer),
+                                                                             current_time - result["begin_time"])
+                    names = (column[0] for column in self.last_desc)
+                    sys.stdout.write(sep_line)
+                    sys.stdout.write(padded(names, max_widths))
+                    sys.stdout.write(sep_line)
+                    for row in self.buffer:
+                        sys.stdout.write(padded(map(show_NULL, row), max_widths))
+                    sys.stdout.write(sep_line)
+                    sys.stdout.write(info_line)
+                    # Reset values for next result set.
+                    self.buffer = []
+        else:
+            if isinstance(result, Exception):
+                sys.stdout.write(_("ERROR "))
+                sys.stdout.write(" :: ".join(map(str, result.args)))
+            else:
+                sys.stdout.write(str(result))
+>>>>>>> MERGE-SOURCE
             sys.stdout.write("\n")
 
     @property
@@ -216,4 +248,4 @@
         if lingo in self.console.lingos:
             self.lingo = lingo
         else:
-            self.present("The specified lingo \"{0}\" does not exist.".format(lingo))
+            self.present(_("The specified lingo")+" \"{0}\" "+_("does not exist.").format(lingo))

=== added file 'boots/util.py'
--- boots/util.py	1970-01-01 00:00:00 +0000
+++ boots/util.py	2010-03-02 01:07:12 +0000
@@ -0,0 +1,27 @@
+# Boots Client Project
+# www.launchpad.net/boots
+#
+# ##### BEGIN LICENSE BLOCK #####
+#
+# Copyright (C) 2009-2010 Clark Boylan, Ken Brotherton, Max Goodman,
+#                         Victoria Lewis, David Rosenbaum, and Andreas Turriff
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ##### END LICENSE BLOCK #####
+
+import locale, gettext
+def set_gettext(mo_location='/usr/share/locale'):
+    locale.setlocale(locale.LC_ALL)
+    gettext.install('boots', mo_location)

=== added directory 'localizations'
=== added file 'localizations/README.txt'
--- localizations/README.txt	1970-01-01 00:00:00 +0000
+++ localizations/README.txt	2010-03-02 01:07:12 +0000
@@ -0,0 +1,22 @@
+========When adding code that outputs a string========
+1) Add (if not present already) to the import section of the .py file
+#=========
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
+gettext.textdomain("fslint")
+_ = gettext.gettext
+#=========
+And then wrap all output strings with _("...").
+You should do this so that if you are using dynamicly created content, that created content is not part of the wrapped string.
+Ex:
+help = "Execute commands from file and exit")
+should be wrapped as such:
+help = _("Execute commands from file and exit"))
+Ex:
+print("rcfile {0} contains a syntax error".format(filepath))
+should be wrapped as such:
+print(_("rcfile ")+"{0} "+_("contains a syntax error").format(filepath))
+
+2) Add your file path to the /boots/localizations/potfiles.txt file.
+3) Generate the updated .pot file by running the /boots/localization/createpots.sh script.  This will overwrite the existing pot.cms file.  Any prevously generated .po .mo files can then be updated from this new file.
+4) Upload new pot file to the launchpad localization section for creation or updating of .po files.  (more on this later --ken)

=== added file 'localizations/boots.pot'
--- localizations/boots.pot	1970-01-01 00:00:00 +0000
+++ localizations/boots.pot	2010-03-02 01:07:12 +0000
@@ -0,0 +1,281 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-01 16:40-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../boots/lib/console.py:96
+msgid ""
+"\n"
+"            Boots is a flexible, extensible, and multilingual shell for "
+"working with databases. To read more about a subtopic, use `help <topic>`."
+msgstr ""
+
+#: ../boots/lib/console.py:100
+msgid "List of Boots commands."
+msgstr ""
+
+#: ../boots/lib/console.py:103
+msgid "Quit boots."
+msgstr ""
+
+#: ../boots/lib/console.py:104
+msgid "Show help for a topic."
+msgstr ""
+
+#: ../boots/lib/console.py:104
+msgid ""
+"\n"
+"            help <topic>\n"
+"            Show help for \"topic\"."
+msgstr ""
+
+#: ../boots/lib/console.py:108
+msgid "Documentation for loaded lingos."
+msgstr ""
+
+#: ../boots/lib/console.py:108
+msgid ""
+"\n"
+"            A lingo is a command language usable within Boots."
+msgstr ""
+
+#: ../boots/lib/console.py:123
+msgid "Invalid lingo"
+msgstr ""
+
+#: ../boots/lib/console.py:123
+msgid "specified."
+msgstr ""
+
+#: ../boots/lib/console.py:136
+msgid "Could not connect to"
+msgstr ""
+
+#: ../boots/lib/console.py:156
+msgid "server"
+msgstr ""
+
+#: ../boots/lib/console.py:189
+msgid "Boots quit."
+msgstr ""
+
+#: ../boots/lib/console.py:207
+msgid "Did you mean:"
+msgstr ""
+
+#: ../boots/lib/console.py:209
+msgid "No help found for"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:45
+msgid "Plain UI documentation."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:45
+msgid ""
+"\n"
+"        A simple, minimal user interface for Boots."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:48
+msgid "List of Plain UI commands."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:49
+msgid "Switch to a different lingo."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:156
+msgid "rows in set"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:156
+msgid "seconds"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:170
+msgid "ERROR "
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:189
+msgid "The specified lingo"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:189
+msgid "does not exist."
+msgstr ""
+
+#: ../boots/lib/ui/components/metacommands.py:47
+msgid "Conflicts between metacommands detected."
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:68
+msgid "See also:"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:72
+msgid "Subtopics"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:106
+msgid "query object"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:106
+msgid "is not a string or tuple of strings"
+msgstr ""
+
+#: ../boots/lib/lingos/lingo.py:36
+msgid "A lingo with name"
+msgstr ""
+
+#: ../boots/lib/lingos/lingo.py:36
+msgid "already exists"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:45
+msgid "Enhanced SQL query language supporting pipes."
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:57 ../boots/lib/lingos/piped_sql.py:68
+msgid "is not in the correct function call syntax"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:95
+msgid "error1"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:107
+msgid "SQL is only permitted for the first clause"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/builtins.py:62
+msgid "Expected a cons, nil or a string"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/builtins.py:71
+msgid "Expected a cons or string"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lexer.py:38
+msgid "illegal character {0} found"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lisp.py:61
+msgid "unmatched closing \")\""
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lisp.py:80
+msgid "is not a stream or a callable"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:101
+msgid "wrong number of arguments for if special form"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:120
+msgid ""
+"The number of symbols must equal the number of values and must be non-zero"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:134
+msgid "Expected a function"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:170
+#: ../boots/lib/lingos/lisp/objects.py:181
+msgid "Expected a symbol"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:175
+msgid "No binding for"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:175
+msgid "exists in the current environment"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:220
+msgid "Cannot pop the innermost scope because then no scopes would remain"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/parser.py:64
+msgid "syntax error"
+msgstr ""
+
+#: ../boots/app/client_config.py:68
+msgid "Execute command and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:73
+msgid "Use database"
+msgstr ""
+
+#: ../boots/app/client_config.py:78
+msgid "Execute commands from file and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:83
+msgid "Set the lingo to use"
+msgstr ""
+
+#: ../boots/app/client_config.py:87
+msgid "Do not read user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:92
+msgid "Filename of user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:97
+msgid "Connect to host"
+msgstr ""
+
+#: ../boots/app/client_config.py:102
+msgid "Use port number"
+msgstr ""
+
+#: ../boots/app/client_config.py:107
+msgid "Login with username"
+msgstr ""
+
+#: ../boots/app/client_config.py:112
+msgid "Connect using password. If none is given, query for password"
+msgstr ""
+
+#: ../boots/app/client_config.py:117
+msgid "Specify the SQL statement terminating character. Default is ';'."
+msgstr ""
+
+#: ../boots/app/client_config.py:122
+msgid "Specify file to save history to"
+msgstr ""
+
+#: ../boots/app/client_config.py:127
+msgid "Specify max history file length"
+msgstr ""
+
+#: ../boots/app/client_config.py:167
+msgid "not found"
+msgstr ""
+
+#: ../boots/app/client_config.py:169
+msgid "contains a syntax error"
+msgstr ""
+
+#: ../boots/app/client_config.py:171
+msgid "contains an error:"
+msgstr ""

=== added file 'localizations/createpots.sh'
--- localizations/createpots.sh	1970-01-01 00:00:00 +0000
+++ localizations/createpots.sh	2010-03-02 01:07:12 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+xgettext --from-code=utf-8 --keyword=tr --default-domain=cms --output=boots.pot --files-from=potfiles.txt
+

=== added file 'localizations/potfiles.txt'
--- localizations/potfiles.txt	1970-01-01 00:00:00 +0000
+++ localizations/potfiles.txt	2010-03-02 01:07:12 +0000
@@ -0,0 +1,12 @@
+../boots/lib/console.py
+../boots/lib/ui/plain.py
+../boots/lib/ui/components/metacommands.py
+../boots/lib/ui/components/help.py
+../boots/lib/lingos/lingo.py
+../boots/lib/lingos/piped_sql.py
+../boots/lib/lingos/lisp/builtins.py
+../boots/lib/lingos/lisp/lexer.py
+../boots/lib/lingos/lisp/lisp.py
+../boots/lib/lingos/lisp/objects.py
+../boots/lib/lingos/lisp/parser.py
+../boots/app/client_config.py