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

[KenBrotherton]

[KenBrotherton (ken-brotherton)]

Please ignore prev prop, it was empty. hehe. Have added localization to the code.

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

80. By Ken Brotherton <kennyb@capstone11> on 2010-02-23

fixed localization syntax error

[KenBrotherton (ken-brotherton)]

Have fixed the syntax error. should be good to go.

[David Rosenbaum (davidjrosenbaum)]

Merging.

review: Approve

[Max Goodhart (chromakode)]

This branch is not ready!

It currently uses the localization domain "fslint", apparently ripped straight from an example. In addition, it munges already corrected headers, and steps on the definition of is_interactive in boots/lib/ui/generic.py -- reintroducing a bug.

Please make sure to review the complete diffs every time you merge -- and critically look at the code! This was a bit sloppy.

review: Needs Fixing

[Max Goodhart (chromakode)]

I tried creating a reverse commit of this merge, but because the commit was immediately followed by more header changes, the undo commit had ~20 conflicts. The easiest way to fix this was to simply uncommit the last 3 commits and redo David's last two commits. I then forced those changes, overwriting lp:boots. This means that if you've pulled lp:boots since, you'll need to force the pull with --overwrite (WARNING: this will remove any commits you've added locally. Make sure you won't lose any data before proceeding, and only do it if bzr pull gives an error first).

(David -- you put a GPL header on constructors.py, rather than LGPL. I assumed this was a mistake, and corrected it.)

[KenBrotherton (ken-brotherton)]

Ripped straight from an example? Munges? Steps on? Can you be more
specific? All the testing that I did showed no problems.

On Sat, 2010-02-27 at 04:35 +0000, Chromakode wrote:
> Review: Needs Fixing
> This branch is not ready!
>
> It currently uses the localization domain "fslint", apparently ripped straight from an example. In addition, it munges already corrected headers, and steps on the definition of is_interactive in boots/lib/ui/generic.py -- reintroducing a bug.
>
> Please make sure to review the complete diffs every time you merge -- and critically look at the code! This was a bit sloppy.

--

*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

[Max Goodhart (chromakode)]

> Ripped straight from an example?

Googling "gettext fslint" yields this tutorial: http://www.pixelbeat.org/programming/i18n.html

The code in this branch matches the tutorial in using "fslint" as the gettext domain. If you had read this tutorial closely, at the top of the page, you'd have seen that "domain=fslint" accords to "your app".

Did you read the gettext module documentation before writing this code? http://docs.python.org/library/gettext.html

This section shows a much better approach for using the gettext module: http://docs.python.org/library/gettext.html#localizing-your-application

Please make those changes and resubmit your merge proposal.

> Munges? Steps on? Can you be more specific? All the testing that I did showed no problems.

The headers will already corrected by Andreas, whose branch I already merged. You were not assigned that task.

In addition, if you look at the diff, it reverts the definition of the "is_interactive" function in boots/lib/ui/generic.py. This is something David should have caught at merge time, and removed.

-M

Unmerged revisions

80. By Ken Brotherton <kennyb@capstone11> on 2010-02-23

fixed localization syntax error

79. By Ken Brotherton <kennyb@capstone11> on 2010-02-22

added localization

=== modified file 'boots.py'
--- boots.py	2010-02-17 03:49:02 +0000
+++ boots.py	2010-02-23 04:05:24 +0000
@@ -2,7 +2,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# boots.py
+# boots/boots.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/api/errors.py'
--- boots/api/errors.py	2010-02-20 23:22:10 +0000
+++ boots/api/errors.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# errors.py 
+# boots/api/errors.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -36,4 +36,4 @@
 
 class ConsoleError(BootsError):
     """Errors to be displayed to be displayed on the console"""
-    pass
\ No newline at end of file
+    pass

=== modified file 'boots/api/nodes/node.py'
--- boots/api/nodes/node.py	2010-02-21 03:57:45 +0000
+++ boots/api/nodes/node.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,41 @@
+# Boots API
+# www.launchpad.net/boots
+# www.launchpad.net/drizzle
+# boots/api/nodes/node.py
+#
+# ##### BEGIN LICENSE BLOCK #####
+# Version: MPL 1.1
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is Boots Client code.
+#
+# The Initial Developer of the Original Code is Clark Boylan, Ken
+# Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas
+# Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman,
+# Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C)
+# 2009. All Rights Reserved.
+#
+# Contributor(s):
+#
+# ##### END LICENSE BLOCK #####
+
 from Queue import Queue
 from itertools import chain, tee, repeat
 from threading import Thread, Event, Lock
 from types import GeneratorType
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 def catch_exceptions(iterable):
     try:
@@ -441,12 +475,12 @@
 def test():
     def wait(x):
         import time
-        print "waiting: {0}".format(x)
+        print _("waiting")+": {0}".format(x)
         time.sleep(1)
         return x
     
     def print_it(foo):
-        print "printing: {0}".format(foo)
+        print _("printing")+": {0}".format(foo)
         return foo
     
     nodes = NodeGraph.from_sequence([SyncNode(lambda x:xrange(10), name="count"),

=== modified file 'boots/app/client_config.py'
--- boots/app/client_config.py	2010-02-21 00:00:41 +0000
+++ boots/app/client_config.py	2010-02-23 04:05:24 +0000
@@ -34,6 +34,10 @@
 import optparse
 import os
 import info
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 class ClientConfig(object):
     """Class used to read client configuration from files and the cli."""
@@ -70,17 +74,17 @@
                                     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',
@@ -89,47 +93,47 @@
         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",
-                                    help = "Connect using password. If none is given, query for password")
+                                    help = _("Connect using password. If none is given, query for password"))
         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."""
@@ -169,11 +173,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-21 10:23:44 +0000
+++ boots/lib/console.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/console.py 
+# boots/lib/console.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -44,6 +44,10 @@
 from boots.lib.lingos import piped_sql
 from boots.lib.lingos import sql
 import sys
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 # Utility function.
 def iterable(obj):
@@ -93,7 +97,7 @@
         if lingo in self.lingos:
             return self.lingos[lingo].execute(command)
         else:
-            return ConsoleError("Invalid lingo \"{0}\" specified.".format(lingo))
+            return ConsoleError(_("Invalid lingo")+" \"{0}\" "+_("specified.").format(lingo))
 
     def connect(self, host, port, database):
         try:
@@ -106,7 +110,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
 
@@ -147,7 +151,7 @@
         
     def quit(self):
         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)

=== modified file 'boots/lib/hook.py'
--- boots/lib/hook.py	2010-02-21 10:04:23 +0000
+++ boots/lib/hook.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/hook.py 
+# boots/lib/hook.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -59,4 +59,4 @@
             else:
                 dead_refs.add(callback)
         self.callbacks -= dead_refs
-                
\ No newline at end of file
+                

=== modified file 'boots/lib/lingos/bash_external.py'
--- boots/lib/lingos/bash_external.py	2010-02-08 00:06:50 +0000
+++ boots/lib/lingos/bash_external.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/python.py
+# boots/lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/lib/lingos/external.py'
--- boots/lib/lingos/external.py	2010-02-08 19:04:36 +0000
+++ boots/lib/lingos/external.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/python.py
+# boots/lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/lib/lingos/lingo.py'
--- boots/lib/lingos/lingo.py	2010-02-21 10:11:22 +0000
+++ boots/lib/lingos/lingo.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lingo.py
+# boots/lib/lingos/lingo.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/lib/lingos/lisp/builtins.py'
--- boots/lib/lingos/lisp/builtins.py	2010-01-31 06:48:28 +0000
+++ boots/lib/lingos/lisp/builtins.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lisp/builtins.py
+# boots/lib/lingos/lisp/builtins.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -31,6 +31,10 @@
 
 from boots.lib.lingos.lisp import objects
 import sys
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 nil = objects.Null()
 t = objects.T()
@@ -65,7 +69,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."""
@@ -74,7 +78,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-01-22 05:58:25 +0000
+++ boots/lib/lingos/lisp/lexer.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lisp/lexer.py
+# boots/lib/lingos/lisp/lexer.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -30,6 +30,10 @@
 # Defines the lisp lexer.
 
 import ply.lex as lex
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 tokens = ('INTEGER', 'STRING', 'SYMBOL', 'QUOTE', 'LEFT_PAREN', 'RIGHT_PAREN')
 
@@ -42,7 +46,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-07 08:52:29 +0000
+++ boots/lib/lingos/lisp/lisp.py	2010-02-23 04:05:24 +0000
@@ -2,7 +2,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lisp/lisp.py
+# boots/lib/lingos/lisp/lisp.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -54,6 +54,10 @@
 from boots.lib.lingos.lisp import parser
 import re
 import readline
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 def input_complete(string):
     """Returns string if string is a complete lisp expression.  Otherwise, None is returned."""
@@ -64,7 +68,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:
@@ -83,7 +87,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-01-31 06:34:57 +0000
+++ boots/lib/lingos/lisp/objects.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lisp/objects.py
+# boots/lib/lingos/lisp/objects.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -32,6 +32,10 @@
 import abc
 import copy
 import sys
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 _gensym_count = 1
 _symbols = {}
@@ -104,7 +108,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)
@@ -123,7 +127,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)
@@ -137,7 +141,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)
 
@@ -196,7 +200,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()
@@ -223,7 +227,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-01-23 23:32:39 +0000
+++ boots/lib/lingos/lisp/parser.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/lisp/parser.py
+# boots/lib/lingos/lisp/parser.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -33,6 +33,10 @@
 from boots.lib.lingos.lisp import builtins
 from boots.lib.lingos.lisp import objects
 import ply.yacc as yacc
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 def p_expression_integer(p):
     'expression : INTEGER'
@@ -67,7 +71,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-21 03:57:45 +0000
+++ boots/lib/lingos/piped_sql.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/sql.py
+# boots/lib/lingos/piped_sql.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -32,6 +32,10 @@
 from boots.lib.lingos import lingo
 from boots.lib.lingos import sql
 import re
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 # FIXME: These node constructors should probably moved into the API so
 # they can be used in scripts.
@@ -65,14 +69,14 @@
 def register(name, constructor):
     """Register a constructor that is used to contruct nodes when that specified name is used."""
     if name in _constructors:
-        raise KeyError('A constructor with name {0} already exists'.format(name))
+        raise KeyError(_('A constructor with name')+' {0} '+_('already exists').format(name))
         
     _constructors[name] = (arguments, constructor)
 
 def construct(name, *arguments):
     """Contructs a node using the given name and arguments."""
     if name not in _constructors:
-        raise KeyError('There is no constructor with the name {0}.'.format(name))
+        raise KeyError(_('There is no constructor with the name')+' {0}.'.format(name))
     
     return _constructors[name](*arguments)
 
@@ -87,7 +91,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')
@@ -98,7 +102,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')
@@ -137,7 +141,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/lingos/python.py'
--- boots/lib/lingos/python.py	2010-02-20 23:42:07 +0000
+++ boots/lib/lingos/python.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/python.py
+# boots/lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/lib/lingos/sql.py'
--- boots/lib/lingos/sql.py	2010-02-16 00:38:41 +0000
+++ boots/lib/lingos/sql.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/lingos/sql.py
+# boots/lib/lingos/sql.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1

=== modified file 'boots/lib/ui/components/help.py'
--- boots/lib/ui/components/help.py	2010-02-07 09:29:31 +0000
+++ boots/lib/ui/components/help.py	2010-02-23 04:05:24 +0000
@@ -1,4 +1,39 @@
+# Boots Client
+# www.launchpad.net/boots
+# www.launchpad.net/drizzle
+# boots/lib/ui/components/help.py
+#
+# ##### BEGIN LICENSE BLOCK #####
+# Version: MPL 1.1
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is Boots Client code.
+#
+# The Initial Developer of the Original Code is Clark Boylan, Ken
+# Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas
+# Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman,
+# Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C)
+# 2009. All Rights Reserved.
+#
+# Contributor(s):
+#
+# ##### END LICENSE BLOCK #####
 # Utility function
+
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale")
+gettext.textdomain("fslint")
+_ = gettext.gettext
+
 def issubseq(seq, seq2):
     """Determines if the elements the sequence seq form a subsequence of the sequence seq2."""
     if len(seq) == 0:
@@ -29,7 +64,7 @@
     def format(self):
         """Returns a string that represents this topic in human readable form as
         described in detail above."""
-        text = "{0.title}\n\n{0.description}\n\nSee also: {0.see_also}".format(self)
+        text = "{0.title}\n\n{0.description}\n\n"+_("See also: ") + "{0.see_also}".format(self)
         return text
  
     def format_index(self):
@@ -63,7 +98,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."""

=== modified file 'boots/lib/ui/components/metacommands.py'
--- boots/lib/ui/components/metacommands.py	2010-02-07 01:52:52 +0000
+++ boots/lib/ui/components/metacommands.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/console.py 
+# boots/lib/ui/components/metacommands.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -29,6 +29,10 @@
 # ##### END LICENSE BLOCK #####
 
 import warnings
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
+gettext.textdomain("fslint")
+_ = gettext.gettext
 
 def parse_metacommand(commandstring):
     """This function wraps str.split() for metacommands
@@ -50,7 +54,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/generic.py'
--- boots/lib/ui/generic.py	2010-02-22 19:33:02 +0000
+++ boots/lib/ui/generic.py	2010-02-23 04:05:24 +0000
@@ -31,7 +31,6 @@
 two pieces, each classes, the StreamDriver and StreamPresenter."""
 
 import sys
-import os
 import StringIO
 
 class StreamDriver(object):
@@ -57,12 +56,8 @@
         except EOFError:
             return
         
-    @property
-    def is_interactive(self):
-        if hasattr(os, "isatty") and hasattr(self.stream, "fileno"):
-            return os.isatty(self.stream.fileno())
-        else:
-            return False
+    def unload(self):
+        pass
 
 class StreamPresenter(object):
     """StreamPresenters write out boots results to streams, stdout for

=== modified file 'boots/lib/ui/plain.py'
--- boots/lib/ui/plain.py	2010-02-21 10:23:44 +0000
+++ boots/lib/ui/plain.py	2010-02-23 04:05:24 +0000
@@ -1,7 +1,7 @@
 # Boots Client
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# lib/ui/plain.py
+# boots/lib/ui/plain.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1
@@ -34,6 +34,10 @@
 import os
 import time
 import readline
+import gettext
+gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
+gettext.textdomain("fslint")
+_ = gettext.gettext
  
 from boots.api.nodes.node import NodeGraph, SyncNode
 from boots.lib.ui.components.metacommands import MetaCommands, parse_metacommand
@@ -149,7 +153,7 @@
                     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),
+                    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)
@@ -163,7 +167,7 @@
                     self.buffer = []
         else:
             if isinstance(result, Exception):
-                sys.stdout.write("ERROR ")
+                sys.stdout.write(_("ERROR "))
                 sys.stdout.write(" :: ".join(map(str, result.args)))
             else:
                 sys.stdout.write(str(result))
@@ -182,4 +186,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 directory 'localizations'
=== added file 'localizations/README.txt'
--- localizations/README.txt	1970-01-01 00:00:00 +0000
+++ localizations/README.txt	2010-02-23 04:05:24 +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/createpots.sh'
--- localizations/createpots.sh	1970-01-01 00:00:00 +0000
+++ localizations/createpots.sh	2010-02-23 04:05:24 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+xgettext --from-code=utf-8 --keyword=tr --default-domain=cms --output=pot.cms --files-from=potfiles.txt
+

=== added file 'localizations/pot.cms'
--- localizations/pot.cms	1970-01-01 00:00:00 +0000
+++ localizations/pot.cms	2010-02-23 04:05:24 +0000
@@ -0,0 +1,206 @@
+# 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-02-22 13:01-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/api/nodes/node.py:478
+msgid "waiting"
+msgstr ""
+
+#: ../boots/api/nodes/node.py:483
+msgid "printing"
+msgstr ""
+
+#: ../boots/app/client_config.py:77
+msgid "Execute command and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:82
+msgid "Use database"
+msgstr ""
+
+#: ../boots/app/client_config.py:87
+msgid "Execute commands from file and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:96
+msgid "Do not read user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:101
+msgid "Filename of user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:106
+msgid "Connect to host"
+msgstr ""
+
+#: ../boots/app/client_config.py:111
+msgid "Use port number"
+msgstr ""
+
+#: ../boots/app/client_config.py:116
+msgid "Login with username"
+msgstr ""
+
+#: ../boots/app/client_config.py:121
+msgid "Connect using password. If none is given, query for password"
+msgstr ""
+
+#: ../boots/app/client_config.py:126
+msgid "Specify the SQL statement terminating character. Default is ';'."
+msgstr ""
+
+#: ../boots/app/client_config.py:131
+msgid "Specify file to save history to"
+msgstr ""
+
+#: ../boots/app/client_config.py:136
+msgid "Specify max history file length"
+msgstr ""
+
+#: ../boots/app/client_config.py:176
+msgid "not found"
+msgstr ""
+
+#: ../boots/app/client_config.py:178 ../boots/app/client_config.py:180
+msgid "rcfile "
+msgstr ""
+
+#: ../boots/app/client_config.py:178
+msgid "contains a syntax error"
+msgstr ""
+
+#: ../boots/app/client_config.py:180
+msgid "contains an error:"
+msgstr ""
+
+#: ../boots/lib/console.py:100
+msgid "Invalid lingo"
+msgstr ""
+
+#: ../boots/lib/console.py:100
+msgid "specified."
+msgstr ""
+
+#: ../boots/lib/console.py:113
+msgid "Could not connect to"
+msgstr ""
+
+#: ../boots/lib/console.py:154
+msgid "Boots quit."
+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/help.py:67
+msgid "See also: "
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:101
+msgid "query object"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:101
+msgid "is not a string or tuple of strings"
+msgstr ""
+
+#: ../boots/lib/ui/components/metacommands.py:57
+msgid "Conflicts between metacommands detected."
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:72
+msgid "A constructor with name"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:72
+msgid "already exists"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:79
+msgid "There is no constructor with the name"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:94 ../boots/lib/lingos/piped_sql.py:105
+msgid "is not in the correct function call syntax"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:144
+msgid "SQL is only permitted for the first clause"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/builtins.py:72
+msgid "Expected a cons, nil or a string"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/builtins.py:81
+msgid "Expected a cons or string"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lexer.py:49
+msgid "illegal character"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lexer.py:49
+msgid "found"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lisp.py:71
+msgid "unmatched closing"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/lisp.py:90
+msgid "is not a stream or a callable"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:111
+msgid "wrong number of arguments for if special form"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:130
+msgid ""
+"The number of symbols must equal the number of values and must be non-zero"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:144
+msgid "Expected a function"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/objects.py:230
+msgid "Cannot pop the innermost scope because then no scopes would remain"
+msgstr ""
+
+#: ../boots/lib/lingos/lisp/parser.py:74
+msgid "syntax error"
+msgstr ""

=== added file 'localizations/potfiles.txt'
--- localizations/potfiles.txt	1970-01-01 00:00:00 +0000
+++ localizations/potfiles.txt	2010-02-23 04:05:24 +0000
@@ -0,0 +1,12 @@
+../boots/api/nodes/node.py
+../boots/app/client_config.py
+../boots/lib/console.py
+../boots/lib/ui/plain.py
+../boots/lib/ui/components/help.py
+../boots/lib/ui/components/metacommands.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

=== modified file 'setup.py'
--- setup.py	2010-02-17 03:49:02 +0000
+++ setup.py	2010-02-23 04:05:24 +0000
@@ -2,7 +2,7 @@
 # Boots Setup
 # www.launchpad.net/boots
 # www.launchpad.net/drizzle
-# setup.py
+# boots/setup.py
 #
 # ##### BEGIN LICENSE BLOCK #####
 # Version: MPL 1.1