Merge lp:~ken-brotherton/boots/localization into lp:boots
- localization
- Merge into trunk
Proposed by
KenBrotherton
| Status: | Rejected |
|---|---|
| Rejected by: | Max Goodhart |
| Proposed branch: | lp:~ken-brotherton/boots/localization |
| Merge into: | lp:boots |
| Diff against target: |
1071 lines (+416/-69) 26 files modified
boots.py (+1/-1) boots/api/errors.py (+2/-2) boots/api/nodes/node.py (+36/-2) boots/app/client_config.py (+19/-15) boots/lib/console.py (+8/-4) boots/lib/hook.py (+2/-2) boots/lib/lingos/bash_external.py (+1/-1) boots/lib/lingos/external.py (+1/-1) boots/lib/lingos/lingo.py (+1/-1) boots/lib/lingos/lisp/builtins.py (+7/-3) boots/lib/lingos/lisp/lexer.py (+6/-2) boots/lib/lingos/lisp/lisp.py (+7/-3) boots/lib/lingos/lisp/objects.py (+10/-6) boots/lib/lingos/lisp/parser.py (+6/-2) boots/lib/lingos/piped_sql.py (+10/-6) boots/lib/lingos/python.py (+1/-1) boots/lib/lingos/sql.py (+1/-1) boots/lib/ui/components/help.py (+37/-2) boots/lib/ui/components/metacommands.py (+6/-2) boots/lib/ui/generic.py (+2/-7) boots/lib/ui/plain.py (+8/-4) localizations/README.txt (+22/-0) localizations/createpots.sh (+3/-0) localizations/pot.cms (+206/-0) localizations/potfiles.txt (+12/-0) setup.py (+1/-1) |
| To merge this branch: | bzr merge lp:~ken-brotherton/boots/localization |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Max Goodhart | Needs Fixing | ||
| David Rosenbaum | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| KenBrotherton (ken-brotherton) wrote : | # |
- 80. By Ken Brotherton <kennyb@capstone11>
-
fixed localization syntax error
Revision history for this message
| KenBrotherton (ken-brotherton) wrote : | # |
Have fixed the syntax error. should be good to go.
Revision history for this message
| David Rosenbaum (davidjrosenbaum) wrote : | # |
Merging.
review:
Approve
Revision history for this message
| Max Goodhart (chromakode) wrote : | # |
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/
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
Revision history for this message
| Max Goodhart (chromakode) wrote : | # |
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.)
Revision history for this message
| KenBrotherton (ken-brotherton) wrote : | # |
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/
>
> 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@
http://
http://
Revision history for this message
| Max Goodhart (chromakode) wrote : | # |
> Ripped straight from an example?
Googling "gettext fslint" yields this tutorial: http://
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://
This section shows a much better approach for using the gettext module: http://
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/
-M
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'boots.py' | |||
| 2 | --- boots.py 2010-02-17 03:49:02 +0000 | |||
| 3 | +++ boots.py 2010-02-23 04:05:24 +0000 | |||
| 4 | @@ -2,7 +2,7 @@ | |||
| 5 | 2 | # Boots Client | 2 | # Boots Client |
| 6 | 3 | # www.launchpad.net/boots | 3 | # www.launchpad.net/boots |
| 7 | 4 | # www.launchpad.net/drizzle | 4 | # www.launchpad.net/drizzle |
| 9 | 5 | # boots.py | 5 | # boots/boots.py |
| 10 | 6 | # | 6 | # |
| 11 | 7 | # ##### BEGIN LICENSE BLOCK ##### | 7 | # ##### BEGIN LICENSE BLOCK ##### |
| 12 | 8 | # Version: MPL 1.1 | 8 | # Version: MPL 1.1 |
| 13 | 9 | 9 | ||
| 14 | === modified file 'boots/api/errors.py' | |||
| 15 | --- boots/api/errors.py 2010-02-20 23:22:10 +0000 | |||
| 16 | +++ boots/api/errors.py 2010-02-23 04:05:24 +0000 | |||
| 17 | @@ -1,7 +1,7 @@ | |||
| 18 | 1 | # Boots Client | 1 | # Boots Client |
| 19 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 20 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 22 | 4 | # errors.py | 4 | # boots/api/errors.py |
| 23 | 5 | # | 5 | # |
| 24 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 25 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 26 | @@ -36,4 +36,4 @@ | |||
| 27 | 36 | 36 | ||
| 28 | 37 | class ConsoleError(BootsError): | 37 | class ConsoleError(BootsError): |
| 29 | 38 | """Errors to be displayed to be displayed on the console""" | 38 | """Errors to be displayed to be displayed on the console""" |
| 30 | 39 | pass | ||
| 31 | 40 | \ No newline at end of file | 39 | \ No newline at end of file |
| 32 | 40 | pass | ||
| 33 | 41 | 41 | ||
| 34 | === modified file 'boots/api/nodes/node.py' | |||
| 35 | --- boots/api/nodes/node.py 2010-02-21 03:57:45 +0000 | |||
| 36 | +++ boots/api/nodes/node.py 2010-02-23 04:05:24 +0000 | |||
| 37 | @@ -1,7 +1,41 @@ | |||
| 38 | 1 | # Boots API | ||
| 39 | 2 | # www.launchpad.net/boots | ||
| 40 | 3 | # www.launchpad.net/drizzle | ||
| 41 | 4 | # boots/api/nodes/node.py | ||
| 42 | 5 | # | ||
| 43 | 6 | # ##### BEGIN LICENSE BLOCK ##### | ||
| 44 | 7 | # Version: MPL 1.1 | ||
| 45 | 8 | # | ||
| 46 | 9 | # The contents of this file are subject to the Mozilla Public License | ||
| 47 | 10 | # Version 1.1 (the "License"); you may not use this file except in | ||
| 48 | 11 | # compliance with the License. You may obtain a copy of the License at | ||
| 49 | 12 | # http://www.mozilla.org/MPL/ | ||
| 50 | 13 | # | ||
| 51 | 14 | # Software distributed under the License is distributed on an "AS IS" | ||
| 52 | 15 | # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the | ||
| 53 | 16 | # License for the specific language governing rights and limitations | ||
| 54 | 17 | # under the License. | ||
| 55 | 18 | # | ||
| 56 | 19 | # The Original Code is Boots Client code. | ||
| 57 | 20 | # | ||
| 58 | 21 | # The Initial Developer of the Original Code is Clark Boylan, Ken | ||
| 59 | 22 | # Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas | ||
| 60 | 23 | # Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman, | ||
| 61 | 24 | # Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C) | ||
| 62 | 25 | # 2009. All Rights Reserved. | ||
| 63 | 26 | # | ||
| 64 | 27 | # Contributor(s): | ||
| 65 | 28 | # | ||
| 66 | 29 | # ##### END LICENSE BLOCK ##### | ||
| 67 | 30 | |||
| 68 | 1 | from Queue import Queue | 31 | from Queue import Queue |
| 69 | 2 | from itertools import chain, tee, repeat | 32 | from itertools import chain, tee, repeat |
| 70 | 3 | from threading import Thread, Event, Lock | 33 | from threading import Thread, Event, Lock |
| 71 | 4 | from types import GeneratorType | 34 | from types import GeneratorType |
| 72 | 35 | import gettext | ||
| 73 | 36 | gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None | ||
| 74 | 37 | gettext.textdomain("fslint") | ||
| 75 | 38 | _ = gettext.gettext | ||
| 76 | 5 | 39 | ||
| 77 | 6 | def catch_exceptions(iterable): | 40 | def catch_exceptions(iterable): |
| 78 | 7 | try: | 41 | try: |
| 79 | @@ -441,12 +475,12 @@ | |||
| 80 | 441 | def test(): | 475 | def test(): |
| 81 | 442 | def wait(x): | 476 | def wait(x): |
| 82 | 443 | import time | 477 | import time |
| 84 | 444 | print "waiting: {0}".format(x) | 478 | print _("waiting")+": {0}".format(x) |
| 85 | 445 | time.sleep(1) | 479 | time.sleep(1) |
| 86 | 446 | return x | 480 | return x |
| 87 | 447 | 481 | ||
| 88 | 448 | def print_it(foo): | 482 | def print_it(foo): |
| 90 | 449 | print "printing: {0}".format(foo) | 483 | print _("printing")+": {0}".format(foo) |
| 91 | 450 | return foo | 484 | return foo |
| 92 | 451 | 485 | ||
| 93 | 452 | nodes = NodeGraph.from_sequence([SyncNode(lambda x:xrange(10), name="count"), | 486 | nodes = NodeGraph.from_sequence([SyncNode(lambda x:xrange(10), name="count"), |
| 94 | 453 | 487 | ||
| 95 | === modified file 'boots/app/client_config.py' | |||
| 96 | --- boots/app/client_config.py 2010-02-21 00:00:41 +0000 | |||
| 97 | +++ boots/app/client_config.py 2010-02-23 04:05:24 +0000 | |||
| 98 | @@ -34,6 +34,10 @@ | |||
| 99 | 34 | import optparse | 34 | import optparse |
| 100 | 35 | import os | 35 | import os |
| 101 | 36 | import info | 36 | import info |
| 102 | 37 | import gettext | ||
| 103 | 38 | gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None | ||
| 104 | 39 | gettext.textdomain("fslint") | ||
| 105 | 40 | _ = gettext.gettext | ||
| 106 | 37 | 41 | ||
| 107 | 38 | class ClientConfig(object): | 42 | class ClientConfig(object): |
| 108 | 39 | """Class used to read client configuration from files and the cli.""" | 43 | """Class used to read client configuration from files and the cli.""" |
| 109 | @@ -70,17 +74,17 @@ | |||
| 110 | 70 | action = "store", | 74 | action = "store", |
| 111 | 71 | type = "string", | 75 | type = "string", |
| 112 | 72 | dest = "command", | 76 | dest = "command", |
| 114 | 73 | help = "Execute command and exit") | 77 | help = _("Execute command and exit")) |
| 115 | 74 | self._cli_parser.add_option("-D", "--database", | 78 | self._cli_parser.add_option("-D", "--database", |
| 116 | 75 | action = "store", | 79 | action = "store", |
| 117 | 76 | type = "string", | 80 | type = "string", |
| 118 | 77 | dest = "database", | 81 | dest = "database", |
| 120 | 78 | help = "Use database") | 82 | help = _("Use database")) |
| 121 | 79 | self._cli_parser.add_option("-f", "--script", | 83 | self._cli_parser.add_option("-f", "--script", |
| 122 | 80 | action = "store", | 84 | action = "store", |
| 123 | 81 | type = "string", | 85 | type = "string", |
| 124 | 82 | dest = "script", | 86 | dest = "script", |
| 126 | 83 | help = "Execute commands from file and exit") | 87 | help = _("Execute commands from file and exit")) |
| 127 | 84 | self._cli_parser.add_option('-l', '--lingo', | 88 | self._cli_parser.add_option('-l', '--lingo', |
| 128 | 85 | action = 'store', | 89 | action = 'store', |
| 129 | 86 | type = 'string', | 90 | type = 'string', |
| 130 | @@ -89,47 +93,47 @@ | |||
| 131 | 89 | self._cli_parser.add_option("-X", "--norc", | 93 | self._cli_parser.add_option("-X", "--norc", |
| 132 | 90 | action = "store_true", | 94 | action = "store_true", |
| 133 | 91 | dest = "norc", | 95 | dest = "norc", |
| 135 | 92 | help = "Do not read user configuration file") | 96 | help = _("Do not read user configuration file")) |
| 136 | 93 | self._cli_parser.add_option("-r", "--rc", | 97 | self._cli_parser.add_option("-r", "--rc", |
| 137 | 94 | action = "store", | 98 | action = "store", |
| 138 | 95 | type = "string", | 99 | type = "string", |
| 139 | 96 | dest = "rcfile", | 100 | dest = "rcfile", |
| 141 | 97 | help = "Filename of user configuration file") | 101 | help = _("Filename of user configuration file")) |
| 142 | 98 | self._cli_parser.add_option("-H", "--host", | 102 | self._cli_parser.add_option("-H", "--host", |
| 143 | 99 | action = "store", | 103 | action = "store", |
| 144 | 100 | type = "string", | 104 | type = "string", |
| 145 | 101 | dest = "host", | 105 | dest = "host", |
| 147 | 102 | help = "Connect to host") | 106 | help = _("Connect to host")) |
| 148 | 103 | self._cli_parser.add_option("-p", "--port", | 107 | self._cli_parser.add_option("-p", "--port", |
| 149 | 104 | action = "store", | 108 | action = "store", |
| 150 | 105 | type = "int", | 109 | type = "int", |
| 151 | 106 | dest = "port", | 110 | dest = "port", |
| 153 | 107 | help = "Use port number") | 111 | help = _("Use port number")) |
| 154 | 108 | self._cli_parser.add_option("-u", "--user", | 112 | self._cli_parser.add_option("-u", "--user", |
| 155 | 109 | action = "store", | 113 | action = "store", |
| 156 | 110 | type = "string", | 114 | type = "string", |
| 157 | 111 | dest = "username", | 115 | dest = "username", |
| 159 | 112 | help = "Login with username") | 116 | help = _("Login with username")) |
| 160 | 113 | self._cli_parser.add_option("-P", "--password", | 117 | self._cli_parser.add_option("-P", "--password", |
| 161 | 114 | action = "store", | 118 | action = "store", |
| 162 | 115 | type = "string", | 119 | type = "string", |
| 163 | 116 | dest = "password", | 120 | dest = "password", |
| 165 | 117 | help = "Connect using password. If none is given, query for password") | 121 | help = _("Connect using password. If none is given, query for password")) |
| 166 | 118 | self._cli_parser.add_option("-t", "--terminatingchar", | 122 | self._cli_parser.add_option("-t", "--terminatingchar", |
| 167 | 119 | action = "store", | 123 | action = "store", |
| 168 | 120 | type = "string", | 124 | type = "string", |
| 169 | 121 | dest = "terminating_char", | 125 | dest = "terminating_char", |
| 171 | 122 | help = "Specify the SQL statement terminating character. Default is ';'.") | 126 | help = _("Specify the SQL statement terminating character. Default is ';'.")) |
| 172 | 123 | self._cli_parser.add_option("-F", "--historyfile", | 127 | self._cli_parser.add_option("-F", "--historyfile", |
| 173 | 124 | action = "store", | 128 | action = "store", |
| 174 | 125 | type = "string", | 129 | type = "string", |
| 175 | 126 | dest = "history_file", | 130 | dest = "history_file", |
| 177 | 127 | help = "Specify file to save history to") | 131 | help = _("Specify file to save history to")) |
| 178 | 128 | self._cli_parser.add_option("-L", "--historylength", | 132 | self._cli_parser.add_option("-L", "--historylength", |
| 179 | 129 | action = "store", | 133 | action = "store", |
| 180 | 130 | type = "int", | 134 | type = "int", |
| 181 | 131 | dest = "history_length", | 135 | dest = "history_length", |
| 183 | 132 | help = "Specify max history file length") | 136 | help = _("Specify max history file length")) |
| 184 | 133 | 137 | ||
| 185 | 134 | def __getitem__(self, key): | 138 | def __getitem__(self, key): |
| 186 | 135 | """Allows one to use the [] operator to get config items.""" | 139 | """Allows one to use the [] operator to get config items.""" |
| 187 | @@ -169,11 +173,11 @@ | |||
| 188 | 169 | except IOError: | 173 | except IOError: |
| 189 | 170 | if filepath != info.RCFILE: | 174 | if filepath != info.RCFILE: |
| 190 | 171 | # Only print an error if a non-default rc file was specified. | 175 | # Only print an error if a non-default rc file was specified. |
| 192 | 172 | print("rcfile {0} not found".format(filepath)) | 176 | print("rcfile {0} "+_("not found").format(filepath)) |
| 193 | 173 | except SyntaxError: | 177 | except SyntaxError: |
| 195 | 174 | print("rcfile {0} contains a syntax error".format(filepath)) | 178 | print(_("rcfile ")+"{0} "+_("contains a syntax error").format(filepath)) |
| 196 | 175 | except Exception as e: | 179 | except Exception as e: |
| 198 | 176 | print("rcfile {0} contains an error: {1}".format(filepath, e)) | 180 | print(_("rcfile ")+"{0} "+_("contains an error:")+ " {1}".format(filepath, e)) |
| 199 | 177 | return file_dict | 181 | return file_dict |
| 200 | 178 | 182 | ||
| 201 | 179 | def get_cli_conf(self): | 183 | def get_cli_conf(self): |
| 202 | 180 | 184 | ||
| 203 | === modified file 'boots/lib/console.py' | |||
| 204 | --- boots/lib/console.py 2010-02-21 10:23:44 +0000 | |||
| 205 | +++ boots/lib/console.py 2010-02-23 04:05:24 +0000 | |||
| 206 | @@ -1,7 +1,7 @@ | |||
| 207 | 1 | # Boots Client | 1 | # Boots Client |
| 208 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 209 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 211 | 4 | # lib/console.py | 4 | # boots/lib/console.py |
| 212 | 5 | # | 5 | # |
| 213 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 214 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 215 | @@ -44,6 +44,10 @@ | |||
| 216 | 44 | from boots.lib.lingos import piped_sql | 44 | from boots.lib.lingos import piped_sql |
| 217 | 45 | from boots.lib.lingos import sql | 45 | from boots.lib.lingos import sql |
| 218 | 46 | import sys | 46 | import sys |
| 219 | 47 | import gettext | ||
| 220 | 48 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 221 | 49 | gettext.textdomain("fslint") | ||
| 222 | 50 | _ = gettext.gettext | ||
| 223 | 47 | 51 | ||
| 224 | 48 | # Utility function. | 52 | # Utility function. |
| 225 | 49 | def iterable(obj): | 53 | def iterable(obj): |
| 226 | @@ -93,7 +97,7 @@ | |||
| 227 | 93 | if lingo in self.lingos: | 97 | if lingo in self.lingos: |
| 228 | 94 | return self.lingos[lingo].execute(command) | 98 | return self.lingos[lingo].execute(command) |
| 229 | 95 | else: | 99 | else: |
| 231 | 96 | return ConsoleError("Invalid lingo \"{0}\" specified.".format(lingo)) | 100 | return ConsoleError(_("Invalid lingo")+" \"{0}\" "+_("specified.").format(lingo)) |
| 232 | 97 | 101 | ||
| 233 | 98 | def connect(self, host, port, database): | 102 | def connect(self, host, port, database): |
| 234 | 99 | try: | 103 | try: |
| 235 | @@ -106,7 +110,7 @@ | |||
| 236 | 106 | self.servers.append(server) | 110 | self.servers.append(server) |
| 237 | 107 | return True | 111 | return True |
| 238 | 108 | else: | 112 | else: |
| 240 | 109 | error = ConsoleError("Could not connect to {0}:{1}".format(host, port)) | 113 | error = ConsoleError(_("Could not connect to")+" {0}:{1}".format(host, port)) |
| 241 | 110 | self.presenter.presenter_graph.put(error) | 114 | self.presenter.presenter_graph.put(error) |
| 242 | 111 | return False | 115 | return False |
| 243 | 112 | 116 | ||
| 244 | @@ -147,7 +151,7 @@ | |||
| 245 | 147 | 151 | ||
| 246 | 148 | def quit(self): | 152 | def quit(self): |
| 247 | 149 | if self.driver.is_interactive: | 153 | if self.driver.is_interactive: |
| 249 | 150 | self.presenter.presenter_graph.put("Boots quit.") | 154 | self.presenter.presenter_graph.put(_("Boots quit.")) |
| 250 | 151 | 155 | ||
| 251 | 152 | self.hooks["unload"].call() | 156 | self.hooks["unload"].call() |
| 252 | 153 | self.disconnect(None, None) | 157 | self.disconnect(None, None) |
| 253 | 154 | 158 | ||
| 254 | === modified file 'boots/lib/hook.py' | |||
| 255 | --- boots/lib/hook.py 2010-02-21 10:04:23 +0000 | |||
| 256 | +++ boots/lib/hook.py 2010-02-23 04:05:24 +0000 | |||
| 257 | @@ -1,7 +1,7 @@ | |||
| 258 | 1 | # Boots Client | 1 | # Boots Client |
| 259 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 260 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 262 | 4 | # lib/hook.py | 4 | # boots/lib/hook.py |
| 263 | 5 | # | 5 | # |
| 264 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 265 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 266 | @@ -59,4 +59,4 @@ | |||
| 267 | 59 | else: | 59 | else: |
| 268 | 60 | dead_refs.add(callback) | 60 | dead_refs.add(callback) |
| 269 | 61 | self.callbacks -= dead_refs | 61 | self.callbacks -= dead_refs |
| 270 | 62 | |||
| 271 | 63 | \ No newline at end of file | 62 | \ No newline at end of file |
| 272 | 63 | |||
| 273 | 64 | 64 | ||
| 274 | === modified file 'boots/lib/lingos/bash_external.py' | |||
| 275 | --- boots/lib/lingos/bash_external.py 2010-02-08 00:06:50 +0000 | |||
| 276 | +++ boots/lib/lingos/bash_external.py 2010-02-23 04:05:24 +0000 | |||
| 277 | @@ -1,7 +1,7 @@ | |||
| 278 | 1 | # Boots Client | 1 | # Boots Client |
| 279 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 280 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 282 | 4 | # lib/lingos/python.py | 4 | # boots/lib/lingos/python.py |
| 283 | 5 | # | 5 | # |
| 284 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 285 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 286 | 8 | 8 | ||
| 287 | === modified file 'boots/lib/lingos/external.py' | |||
| 288 | --- boots/lib/lingos/external.py 2010-02-08 19:04:36 +0000 | |||
| 289 | +++ boots/lib/lingos/external.py 2010-02-23 04:05:24 +0000 | |||
| 290 | @@ -1,7 +1,7 @@ | |||
| 291 | 1 | # Boots Client | 1 | # Boots Client |
| 292 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 293 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 295 | 4 | # lib/lingos/python.py | 4 | # boots/lib/lingos/python.py |
| 296 | 5 | # | 5 | # |
| 297 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 298 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 299 | 8 | 8 | ||
| 300 | === modified file 'boots/lib/lingos/lingo.py' | |||
| 301 | --- boots/lib/lingos/lingo.py 2010-02-21 10:11:22 +0000 | |||
| 302 | +++ boots/lib/lingos/lingo.py 2010-02-23 04:05:24 +0000 | |||
| 303 | @@ -1,7 +1,7 @@ | |||
| 304 | 1 | # Boots Client | 1 | # Boots Client |
| 305 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 306 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 308 | 4 | # lib/lingos/lingo.py | 4 | # boots/lib/lingos/lingo.py |
| 309 | 5 | # | 5 | # |
| 310 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 311 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 312 | 8 | 8 | ||
| 313 | === modified file 'boots/lib/lingos/lisp/builtins.py' | |||
| 314 | --- boots/lib/lingos/lisp/builtins.py 2010-01-31 06:48:28 +0000 | |||
| 315 | +++ boots/lib/lingos/lisp/builtins.py 2010-02-23 04:05:24 +0000 | |||
| 316 | @@ -1,7 +1,7 @@ | |||
| 317 | 1 | # Boots Client | 1 | # Boots Client |
| 318 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 319 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 321 | 4 | # lib/lingos/lisp/builtins.py | 4 | # boots/lib/lingos/lisp/builtins.py |
| 322 | 5 | # | 5 | # |
| 323 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 324 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 325 | @@ -31,6 +31,10 @@ | |||
| 326 | 31 | 31 | ||
| 327 | 32 | from boots.lib.lingos.lisp import objects | 32 | from boots.lib.lingos.lisp import objects |
| 328 | 33 | import sys | 33 | import sys |
| 329 | 34 | import gettext | ||
| 330 | 35 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 331 | 36 | gettext.textdomain("fslint") | ||
| 332 | 37 | _ = gettext.gettext | ||
| 333 | 34 | 38 | ||
| 334 | 35 | nil = objects.Null() | 39 | nil = objects.Null() |
| 335 | 36 | t = objects.T() | 40 | t = objects.T() |
| 336 | @@ -65,7 +69,7 @@ | |||
| 337 | 65 | elif isinstance(s, objects.String): | 69 | elif isinstance(s, objects.String): |
| 338 | 66 | return objects.Integer(len(s.python_string())) | 70 | return objects.Integer(len(s.python_string())) |
| 339 | 67 | else: | 71 | else: |
| 341 | 68 | raise TypeError('Expected a cons, nil or a string') | 72 | raise TypeError(_('Expected a cons, nil or a string')) |
| 342 | 69 | 73 | ||
| 343 | 70 | def elt_function(s, i): | 74 | def elt_function(s, i): |
| 344 | 71 | """Returns the ith element of the sequence s.""" | 75 | """Returns the ith element of the sequence s.""" |
| 345 | @@ -74,7 +78,7 @@ | |||
| 346 | 74 | elif isinstance(s, objects.String): | 78 | elif isinstance(s, objects.String): |
| 347 | 75 | return s.python_string()[i.python_integer()] | 79 | return s.python_string()[i.python_integer()] |
| 348 | 76 | else: | 80 | else: |
| 350 | 77 | raise TypeError('Expected a cons or string') | 81 | raise TypeError(_('Expected a cons or string')) |
| 351 | 78 | 82 | ||
| 352 | 79 | def gensym_function(): | 83 | def gensym_function(): |
| 353 | 80 | """Returns a unique symbol that will never be the same as any other symbol even if it has the same name.""" | 84 | """Returns a unique symbol that will never be the same as any other symbol even if it has the same name.""" |
| 354 | 81 | 85 | ||
| 355 | === modified file 'boots/lib/lingos/lisp/lexer.py' | |||
| 356 | --- boots/lib/lingos/lisp/lexer.py 2010-01-22 05:58:25 +0000 | |||
| 357 | +++ boots/lib/lingos/lisp/lexer.py 2010-02-23 04:05:24 +0000 | |||
| 358 | @@ -1,7 +1,7 @@ | |||
| 359 | 1 | # Boots Client | 1 | # Boots Client |
| 360 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 361 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 363 | 4 | # lib/lingos/lisp/lexer.py | 4 | # boots/lib/lingos/lisp/lexer.py |
| 364 | 5 | # | 5 | # |
| 365 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 366 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 367 | @@ -30,6 +30,10 @@ | |||
| 368 | 30 | # Defines the lisp lexer. | 30 | # Defines the lisp lexer. |
| 369 | 31 | 31 | ||
| 370 | 32 | import ply.lex as lex | 32 | import ply.lex as lex |
| 371 | 33 | import gettext | ||
| 372 | 34 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 373 | 35 | gettext.textdomain("fslint") | ||
| 374 | 36 | _ = gettext.gettext | ||
| 375 | 33 | 37 | ||
| 376 | 34 | tokens = ('INTEGER', 'STRING', 'SYMBOL', 'QUOTE', 'LEFT_PAREN', 'RIGHT_PAREN') | 38 | tokens = ('INTEGER', 'STRING', 'SYMBOL', 'QUOTE', 'LEFT_PAREN', 'RIGHT_PAREN') |
| 377 | 35 | 39 | ||
| 378 | @@ -42,7 +46,7 @@ | |||
| 379 | 42 | t_ignore = ' \t\n' | 46 | t_ignore = ' \t\n' |
| 380 | 43 | 47 | ||
| 381 | 44 | def t_error(t): | 48 | def t_error(t): |
| 383 | 45 | print('illegal character {0} found'.format(t.value)) | 49 | print(_('illegal character')+' {0} '+_('found').format(t.value)) |
| 384 | 46 | token.lexer.skip(1) | 50 | token.lexer.skip(1) |
| 385 | 47 | 51 | ||
| 386 | 48 | lexer = lex.lex() | 52 | lexer = lex.lex() |
| 387 | 49 | 53 | ||
| 388 | === modified file 'boots/lib/lingos/lisp/lisp.py' | |||
| 389 | --- boots/lib/lingos/lisp/lisp.py 2010-02-07 08:52:29 +0000 | |||
| 390 | +++ boots/lib/lingos/lisp/lisp.py 2010-02-23 04:05:24 +0000 | |||
| 391 | @@ -2,7 +2,7 @@ | |||
| 392 | 2 | # Boots Client | 2 | # Boots Client |
| 393 | 3 | # www.launchpad.net/boots | 3 | # www.launchpad.net/boots |
| 394 | 4 | # www.launchpad.net/drizzle | 4 | # www.launchpad.net/drizzle |
| 396 | 5 | # lib/lingos/lisp/lisp.py | 5 | # boots/lib/lingos/lisp/lisp.py |
| 397 | 6 | # | 6 | # |
| 398 | 7 | # ##### BEGIN LICENSE BLOCK ##### | 7 | # ##### BEGIN LICENSE BLOCK ##### |
| 399 | 8 | # Version: MPL 1.1 | 8 | # Version: MPL 1.1 |
| 400 | @@ -54,6 +54,10 @@ | |||
| 401 | 54 | from boots.lib.lingos.lisp import parser | 54 | from boots.lib.lingos.lisp import parser |
| 402 | 55 | import re | 55 | import re |
| 403 | 56 | import readline | 56 | import readline |
| 404 | 57 | import gettext | ||
| 405 | 58 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 406 | 59 | gettext.textdomain("fslint") | ||
| 407 | 60 | _ = gettext.gettext | ||
| 408 | 57 | 61 | ||
| 409 | 58 | def input_complete(string): | 62 | def input_complete(string): |
| 410 | 59 | """Returns string if string is a complete lisp expression. Otherwise, None is returned.""" | 63 | """Returns string if string is a complete lisp expression. Otherwise, None is returned.""" |
| 411 | @@ -64,7 +68,7 @@ | |||
| 412 | 64 | paren_level = left_parens - right_parens | 68 | paren_level = left_parens - right_parens |
| 413 | 65 | 69 | ||
| 414 | 66 | if paren_level < 0: | 70 | if paren_level < 0: |
| 416 | 67 | raise SyntaxError('unmatched closing ")"') | 71 | raise SyntaxError(_('unmatched closing')+' ")"') |
| 417 | 68 | elif paren_level > 0: | 72 | elif paren_level > 0: |
| 418 | 69 | return None | 73 | return None |
| 419 | 70 | else: | 74 | else: |
| 420 | @@ -83,7 +87,7 @@ | |||
| 421 | 83 | if isinstance(stream, file): | 87 | if isinstance(stream, file): |
| 422 | 84 | stream = stream.readline | 88 | stream = stream.readline |
| 423 | 85 | elif not callable(stream): | 89 | elif not callable(stream): |
| 425 | 86 | raise TypeError('{0} is not a stream or a callable'.format(stream)) | 90 | raise TypeError('{0} '+_('is not a stream or a callable').format(stream)) |
| 426 | 87 | # Read lines until all open lisp expressions have been closed. | 91 | # Read lines until all open lisp expressions have been closed. |
| 427 | 88 | while True: | 92 | while True: |
| 428 | 89 | line = stream() | 93 | line = stream() |
| 429 | 90 | 94 | ||
| 430 | === modified file 'boots/lib/lingos/lisp/objects.py' | |||
| 431 | --- boots/lib/lingos/lisp/objects.py 2010-01-31 06:34:57 +0000 | |||
| 432 | +++ boots/lib/lingos/lisp/objects.py 2010-02-23 04:05:24 +0000 | |||
| 433 | @@ -1,7 +1,7 @@ | |||
| 434 | 1 | # Boots Client | 1 | # Boots Client |
| 435 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 436 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 438 | 4 | # lib/lingos/lisp/objects.py | 4 | # boots/lib/lingos/lisp/objects.py |
| 439 | 5 | # | 5 | # |
| 440 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 441 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 442 | @@ -32,6 +32,10 @@ | |||
| 443 | 32 | import abc | 32 | import abc |
| 444 | 33 | import copy | 33 | import copy |
| 445 | 34 | import sys | 34 | import sys |
| 446 | 35 | import gettext | ||
| 447 | 36 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 448 | 37 | gettext.textdomain("fslint") | ||
| 449 | 38 | _ = gettext.gettext | ||
| 450 | 35 | 39 | ||
| 451 | 36 | _gensym_count = 1 | 40 | _gensym_count = 1 |
| 452 | 37 | _symbols = {} | 41 | _symbols = {} |
| 453 | @@ -104,7 +108,7 @@ | |||
| 454 | 104 | else_expression = car(cdr(cdr(cdr(self)))) | 108 | else_expression = car(cdr(cdr(cdr(self)))) |
| 455 | 105 | 109 | ||
| 456 | 106 | if then_expression is Null() or cdr(cdr(cdr(cdr(self)))) is not Null(): | 110 | if then_expression is Null() or cdr(cdr(cdr(cdr(self)))) is not Null(): |
| 458 | 107 | raise SyntaxError('wrong number of arguments for if special form {0}'.format(self)) | 111 | raise SyntaxError(_('wrong number of arguments for if special form')+' {0}'.format(self)) |
| 459 | 108 | 112 | ||
| 460 | 109 | if condition_expression.evaluate(environment) != Null(): | 113 | if condition_expression.evaluate(environment) != Null(): |
| 461 | 110 | return then_expression.evaluate(environment) | 114 | return then_expression.evaluate(environment) |
| 462 | @@ -123,7 +127,7 @@ | |||
| 463 | 123 | values = arguments[2::2] | 127 | values = arguments[2::2] |
| 464 | 124 | 128 | ||
| 465 | 125 | if len(symbols) != len(values) or len(symbols) == 0: | 129 | if len(symbols) != len(values) or len(symbols) == 0: |
| 467 | 126 | raise SyntaxError('The number of symbols must equal the number of values and must be non-zero') | 130 | raise SyntaxError(_('The number of symbols must equal the number of values and must be non-zero')) |
| 468 | 127 | 131 | ||
| 469 | 128 | for symbol, value in zip(symbols, values): | 132 | for symbol, value in zip(symbols, values): |
| 470 | 129 | value = value.evaluate(environment) | 133 | value = value.evaluate(environment) |
| 471 | @@ -137,7 +141,7 @@ | |||
| 472 | 137 | else: # Handle function calls. | 141 | else: # Handle function calls. |
| 473 | 138 | function = self.car.evaluate(environment) | 142 | function = self.car.evaluate(environment) |
| 474 | 139 | if not isinstance(function, Lambda): | 143 | if not isinstance(function, Lambda): |
| 476 | 140 | raise TypeError('Expected a function') | 144 | raise TypeError(_('Expected a function')) |
| 477 | 141 | else: | 145 | else: |
| 478 | 142 | return function.call((argument.evaluate(environment) for argument in self.python_list()[1:]), environment) | 146 | return function.call((argument.evaluate(environment) for argument in self.python_list()[1:]), environment) |
| 479 | 143 | 147 | ||
| 480 | @@ -196,7 +200,7 @@ | |||
| 481 | 196 | # def __delitem__(self, symbol): | 200 | # def __delitem__(self, symbol): |
| 482 | 197 | # """Removes the first binding found for symbol. Returns True if the symbol is found and False otherwise.""" | 201 | # """Removes the first binding found for symbol. Returns True if the symbol is found and False otherwise.""" |
| 483 | 198 | # if not isinstance(symbol, Symbol): | 202 | # if not isinstance(symbol, Symbol): |
| 485 | 199 | # raise TypeError('Expected a symbol') | 203 | # raise TypeError(_('Expected a symbol')) |
| 486 | 200 | 204 | ||
| 487 | 201 | # if symbol in self._environment: | 205 | # if symbol in self._environment: |
| 488 | 202 | # self._environment[symbol].pop() | 206 | # self._environment[symbol].pop() |
| 489 | @@ -223,7 +227,7 @@ | |||
| 490 | 223 | def pop(self): | 227 | def pop(self): |
| 491 | 224 | """Removes the innermost scope and returns a dictionary that corresponds to its bindings.""" | 228 | """Removes the innermost scope and returns a dictionary that corresponds to its bindings.""" |
| 492 | 225 | if len(self._scopes) <= 1: | 229 | if len(self._scopes) <= 1: |
| 494 | 226 | raise RuntimeError('Cannot pop the innermost scope because then no scopes would remain') | 230 | raise RuntimeError(_('Cannot pop the innermost scope because then no scopes would remain')) |
| 495 | 227 | symbols = self._scopes.pop() | 231 | symbols = self._scopes.pop() |
| 496 | 228 | 232 | ||
| 497 | 229 | for symbol in symbols: | 233 | for symbol in symbols: |
| 498 | 230 | 234 | ||
| 499 | === modified file 'boots/lib/lingos/lisp/parser.py' | |||
| 500 | --- boots/lib/lingos/lisp/parser.py 2010-01-23 23:32:39 +0000 | |||
| 501 | +++ boots/lib/lingos/lisp/parser.py 2010-02-23 04:05:24 +0000 | |||
| 502 | @@ -1,7 +1,7 @@ | |||
| 503 | 1 | # Boots Client | 1 | # Boots Client |
| 504 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 505 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 507 | 4 | # lib/lingos/lisp/parser.py | 4 | # boots/lib/lingos/lisp/parser.py |
| 508 | 5 | # | 5 | # |
| 509 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 510 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 511 | @@ -33,6 +33,10 @@ | |||
| 512 | 33 | from boots.lib.lingos.lisp import builtins | 33 | from boots.lib.lingos.lisp import builtins |
| 513 | 34 | from boots.lib.lingos.lisp import objects | 34 | from boots.lib.lingos.lisp import objects |
| 514 | 35 | import ply.yacc as yacc | 35 | import ply.yacc as yacc |
| 515 | 36 | import gettext | ||
| 516 | 37 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 517 | 38 | gettext.textdomain("fslint") | ||
| 518 | 39 | _ = gettext.gettext | ||
| 519 | 36 | 40 | ||
| 520 | 37 | def p_expression_integer(p): | 41 | def p_expression_integer(p): |
| 521 | 38 | 'expression : INTEGER' | 42 | 'expression : INTEGER' |
| 522 | @@ -67,7 +71,7 @@ | |||
| 523 | 67 | p[0] = objects.Cons(p[1], p[2]) | 71 | p[0] = objects.Cons(p[1], p[2]) |
| 524 | 68 | 72 | ||
| 525 | 69 | def p_error(p): | 73 | def p_error(p): |
| 527 | 70 | print('syntax error') | 74 | print(_('syntax error')) |
| 528 | 71 | 75 | ||
| 529 | 72 | # Disable debugging output and caching of parse tables. | 76 | # Disable debugging output and caching of parse tables. |
| 530 | 73 | parser = yacc.yacc(debug = 0, write_tables = 0) | 77 | parser = yacc.yacc(debug = 0, write_tables = 0) |
| 531 | 74 | 78 | ||
| 532 | === modified file 'boots/lib/lingos/piped_sql.py' | |||
| 533 | --- boots/lib/lingos/piped_sql.py 2010-02-21 03:57:45 +0000 | |||
| 534 | +++ boots/lib/lingos/piped_sql.py 2010-02-23 04:05:24 +0000 | |||
| 535 | @@ -1,7 +1,7 @@ | |||
| 536 | 1 | # Boots Client | 1 | # Boots Client |
| 537 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 538 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 540 | 4 | # lib/lingos/sql.py | 4 | # boots/lib/lingos/piped_sql.py |
| 541 | 5 | # | 5 | # |
| 542 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 543 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 544 | @@ -32,6 +32,10 @@ | |||
| 545 | 32 | from boots.lib.lingos import lingo | 32 | from boots.lib.lingos import lingo |
| 546 | 33 | from boots.lib.lingos import sql | 33 | from boots.lib.lingos import sql |
| 547 | 34 | import re | 34 | import re |
| 548 | 35 | import gettext | ||
| 549 | 36 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 550 | 37 | gettext.textdomain("fslint") | ||
| 551 | 38 | _ = gettext.gettext | ||
| 552 | 35 | 39 | ||
| 553 | 36 | # FIXME: These node constructors should probably moved into the API so | 40 | # FIXME: These node constructors should probably moved into the API so |
| 554 | 37 | # they can be used in scripts. | 41 | # they can be used in scripts. |
| 555 | @@ -65,14 +69,14 @@ | |||
| 556 | 65 | def register(name, constructor): | 69 | def register(name, constructor): |
| 557 | 66 | """Register a constructor that is used to contruct nodes when that specified name is used.""" | 70 | """Register a constructor that is used to contruct nodes when that specified name is used.""" |
| 558 | 67 | if name in _constructors: | 71 | if name in _constructors: |
| 560 | 68 | raise KeyError('A constructor with name {0} already exists'.format(name)) | 72 | raise KeyError(_('A constructor with name')+' {0} '+_('already exists').format(name)) |
| 561 | 69 | 73 | ||
| 562 | 70 | _constructors[name] = (arguments, constructor) | 74 | _constructors[name] = (arguments, constructor) |
| 563 | 71 | 75 | ||
| 564 | 72 | def construct(name, *arguments): | 76 | def construct(name, *arguments): |
| 565 | 73 | """Contructs a node using the given name and arguments.""" | 77 | """Contructs a node using the given name and arguments.""" |
| 566 | 74 | if name not in _constructors: | 78 | if name not in _constructors: |
| 568 | 75 | raise KeyError('There is no constructor with the name {0}.'.format(name)) | 79 | raise KeyError(_('There is no constructor with the name')+' {0}.'.format(name)) |
| 569 | 76 | 80 | ||
| 570 | 77 | return _constructors[name](*arguments) | 81 | return _constructors[name](*arguments) |
| 571 | 78 | 82 | ||
| 572 | @@ -87,7 +91,7 @@ | |||
| 573 | 87 | match = clause_re.match(clause_string) | 91 | match = clause_re.match(clause_string) |
| 574 | 88 | 92 | ||
| 575 | 89 | if not match: | 93 | if not match: |
| 577 | 90 | raise SyntaxError('{0} is not in the correct function call syntax'.format(clause_string)) | 94 | raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(clause_string)) |
| 578 | 91 | 95 | ||
| 579 | 92 | constructor_call = match.group('constructor_call').strip() | 96 | constructor_call = match.group('constructor_call').strip() |
| 580 | 93 | output_file = match.group('output_file') | 97 | output_file = match.group('output_file') |
| 581 | @@ -98,7 +102,7 @@ | |||
| 582 | 98 | match = constructor_call_re.match(constructor_string) | 102 | match = constructor_call_re.match(constructor_string) |
| 583 | 99 | 103 | ||
| 584 | 100 | if not match: | 104 | if not match: |
| 586 | 101 | raise SyntaxError('{0} is not in the correct function call syntax'.format(constructor_string)) | 105 | raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(constructor_string)) |
| 587 | 102 | 106 | ||
| 588 | 103 | name = match.group('name') | 107 | name = match.group('name') |
| 589 | 104 | arguments = match.group('arguments') | 108 | arguments = match.group('arguments') |
| 590 | @@ -137,7 +141,7 @@ | |||
| 591 | 137 | # SQL is only allowed for the first node. | 141 | # SQL is only allowed for the first node. |
| 592 | 138 | if sql: | 142 | if sql: |
| 593 | 139 | if not first_node: | 143 | if not first_node: |
| 595 | 140 | raise SyntaxError('SQL is only permitted for the first clause') | 144 | raise SyntaxError(_('SQL is only permitted for the first clause')) |
| 596 | 141 | 145 | ||
| 597 | 142 | # FIXME: Add support for multiple servers here. Currently only the first server | 146 | # FIXME: Add support for multiple servers here. Currently only the first server |
| 598 | 143 | # is used. | 147 | # is used. |
| 599 | 144 | 148 | ||
| 600 | === modified file 'boots/lib/lingos/python.py' | |||
| 601 | --- boots/lib/lingos/python.py 2010-02-20 23:42:07 +0000 | |||
| 602 | +++ boots/lib/lingos/python.py 2010-02-23 04:05:24 +0000 | |||
| 603 | @@ -1,7 +1,7 @@ | |||
| 604 | 1 | # Boots Client | 1 | # Boots Client |
| 605 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 606 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 608 | 4 | # lib/lingos/python.py | 4 | # boots/lib/lingos/python.py |
| 609 | 5 | # | 5 | # |
| 610 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 611 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 612 | 8 | 8 | ||
| 613 | === modified file 'boots/lib/lingos/sql.py' | |||
| 614 | --- boots/lib/lingos/sql.py 2010-02-16 00:38:41 +0000 | |||
| 615 | +++ boots/lib/lingos/sql.py 2010-02-23 04:05:24 +0000 | |||
| 616 | @@ -1,7 +1,7 @@ | |||
| 617 | 1 | # Boots Client | 1 | # Boots Client |
| 618 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 619 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 621 | 4 | # lib/lingos/sql.py | 4 | # boots/lib/lingos/sql.py |
| 622 | 5 | # | 5 | # |
| 623 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 624 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 625 | 8 | 8 | ||
| 626 | === modified file 'boots/lib/ui/components/help.py' | |||
| 627 | --- boots/lib/ui/components/help.py 2010-02-07 09:29:31 +0000 | |||
| 628 | +++ boots/lib/ui/components/help.py 2010-02-23 04:05:24 +0000 | |||
| 629 | @@ -1,4 +1,39 @@ | |||
| 630 | 1 | # Boots Client | ||
| 631 | 2 | # www.launchpad.net/boots | ||
| 632 | 3 | # www.launchpad.net/drizzle | ||
| 633 | 4 | # boots/lib/ui/components/help.py | ||
| 634 | 5 | # | ||
| 635 | 6 | # ##### BEGIN LICENSE BLOCK ##### | ||
| 636 | 7 | # Version: MPL 1.1 | ||
| 637 | 8 | # | ||
| 638 | 9 | # The contents of this file are subject to the Mozilla Public License | ||
| 639 | 10 | # Version 1.1 (the "License"); you may not use this file except in | ||
| 640 | 11 | # compliance with the License. You may obtain a copy of the License at | ||
| 641 | 12 | # http://www.mozilla.org/MPL/ | ||
| 642 | 13 | # | ||
| 643 | 14 | # Software distributed under the License is distributed on an "AS IS" | ||
| 644 | 15 | # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the | ||
| 645 | 16 | # License for the specific language governing rights and limitations | ||
| 646 | 17 | # under the License. | ||
| 647 | 18 | # | ||
| 648 | 19 | # The Original Code is Boots Client code. | ||
| 649 | 20 | # | ||
| 650 | 21 | # The Initial Developer of the Original Code is Clark Boylan, Ken | ||
| 651 | 22 | # Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas | ||
| 652 | 23 | # Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman, | ||
| 653 | 24 | # Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C) | ||
| 654 | 25 | # 2009. All Rights Reserved. | ||
| 655 | 26 | # | ||
| 656 | 27 | # Contributor(s): | ||
| 657 | 28 | # | ||
| 658 | 29 | # ##### END LICENSE BLOCK ##### | ||
| 659 | 1 | # Utility function | 30 | # Utility function |
| 660 | 31 | |||
| 661 | 32 | import gettext | ||
| 662 | 33 | gettext.bindtextdomain("fslint", "/usr/share/locale") | ||
| 663 | 34 | gettext.textdomain("fslint") | ||
| 664 | 35 | _ = gettext.gettext | ||
| 665 | 36 | |||
| 666 | 2 | def issubseq(seq, seq2): | 37 | def issubseq(seq, seq2): |
| 667 | 3 | """Determines if the elements the sequence seq form a subsequence of the sequence seq2.""" | 38 | """Determines if the elements the sequence seq form a subsequence of the sequence seq2.""" |
| 668 | 4 | if len(seq) == 0: | 39 | if len(seq) == 0: |
| 669 | @@ -29,7 +64,7 @@ | |||
| 670 | 29 | def format(self): | 64 | def format(self): |
| 671 | 30 | """Returns a string that represents this topic in human readable form as | 65 | """Returns a string that represents this topic in human readable form as |
| 672 | 31 | described in detail above.""" | 66 | described in detail above.""" |
| 674 | 32 | text = "{0.title}\n\n{0.description}\n\nSee also: {0.see_also}".format(self) | 67 | text = "{0.title}\n\n{0.description}\n\n"+_("See also: ") + "{0.see_also}".format(self) |
| 675 | 33 | return text | 68 | return text |
| 676 | 34 | 69 | ||
| 677 | 35 | def format_index(self): | 70 | def format_index(self): |
| 678 | @@ -63,7 +98,7 @@ | |||
| 679 | 63 | assert isinstance(item, str) | 98 | assert isinstance(item, str) |
| 680 | 64 | return query | 99 | return query |
| 681 | 65 | else: | 100 | else: |
| 683 | 66 | raise TypeError('query object {0} is not a string or tuple of strings'.format(query)) | 101 | raise TypeError(_('query object')+ ' {0} '+ _('is not a string or tuple of strings').format(query)) |
| 684 | 67 | 102 | ||
| 685 | 68 | def _ensure_key(self, key): | 103 | def _ensure_key(self, key): |
| 686 | 69 | """Creates a new subtopic that key maps to if none exists.""" | 104 | """Creates a new subtopic that key maps to if none exists.""" |
| 687 | 70 | 105 | ||
| 688 | === modified file 'boots/lib/ui/components/metacommands.py' | |||
| 689 | --- boots/lib/ui/components/metacommands.py 2010-02-07 01:52:52 +0000 | |||
| 690 | +++ boots/lib/ui/components/metacommands.py 2010-02-23 04:05:24 +0000 | |||
| 691 | @@ -1,7 +1,7 @@ | |||
| 692 | 1 | # Boots Client | 1 | # Boots Client |
| 693 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 694 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 696 | 4 | # lib/console.py | 4 | # boots/lib/ui/components/metacommands.py |
| 697 | 5 | # | 5 | # |
| 698 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 699 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 700 | @@ -29,6 +29,10 @@ | |||
| 701 | 29 | # ##### END LICENSE BLOCK ##### | 29 | # ##### END LICENSE BLOCK ##### |
| 702 | 30 | 30 | ||
| 703 | 31 | import warnings | 31 | import warnings |
| 704 | 32 | import gettext | ||
| 705 | 33 | gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None | ||
| 706 | 34 | gettext.textdomain("fslint") | ||
| 707 | 35 | _ = gettext.gettext | ||
| 708 | 32 | 36 | ||
| 709 | 33 | def parse_metacommand(commandstring): | 37 | def parse_metacommand(commandstring): |
| 710 | 34 | """This function wraps str.split() for metacommands | 38 | """This function wraps str.split() for metacommands |
| 711 | @@ -50,7 +54,7 @@ | |||
| 712 | 50 | # FIXME: Issue warning through the UI using ui.print | 54 | # FIXME: Issue warning through the UI using ui.print |
| 713 | 51 | # FIXME: Determine the offending command(s) (set.intersect?) | 55 | # FIXME: Determine the offending command(s) (set.intersect?) |
| 714 | 52 | # FIXME: Print offending commands | 56 | # FIXME: Print offending commands |
| 716 | 53 | warnings.warn("Conflicts between metacommands detected.") | 57 | warnings.warn(_("Conflicts between metacommands detected.")) |
| 717 | 54 | self.names |= newnames | 58 | self.names |= newnames |
| 718 | 55 | 59 | ||
| 719 | 56 | class MetaCommands(object): | 60 | class MetaCommands(object): |
| 720 | 57 | 61 | ||
| 721 | === modified file 'boots/lib/ui/generic.py' | |||
| 722 | --- boots/lib/ui/generic.py 2010-02-22 19:33:02 +0000 | |||
| 723 | +++ boots/lib/ui/generic.py 2010-02-23 04:05:24 +0000 | |||
| 724 | @@ -31,7 +31,6 @@ | |||
| 725 | 31 | two pieces, each classes, the StreamDriver and StreamPresenter.""" | 31 | two pieces, each classes, the StreamDriver and StreamPresenter.""" |
| 726 | 32 | 32 | ||
| 727 | 33 | import sys | 33 | import sys |
| 728 | 34 | import os | ||
| 729 | 35 | import StringIO | 34 | import StringIO |
| 730 | 36 | 35 | ||
| 731 | 37 | class StreamDriver(object): | 36 | class StreamDriver(object): |
| 732 | @@ -57,12 +56,8 @@ | |||
| 733 | 57 | except EOFError: | 56 | except EOFError: |
| 734 | 58 | return | 57 | return |
| 735 | 59 | 58 | ||
| 742 | 60 | @property | 59 | def unload(self): |
| 743 | 61 | def is_interactive(self): | 60 | pass |
| 738 | 62 | if hasattr(os, "isatty") and hasattr(self.stream, "fileno"): | ||
| 739 | 63 | return os.isatty(self.stream.fileno()) | ||
| 740 | 64 | else: | ||
| 741 | 65 | return False | ||
| 744 | 66 | 61 | ||
| 745 | 67 | class StreamPresenter(object): | 62 | class StreamPresenter(object): |
| 746 | 68 | """StreamPresenters write out boots results to streams, stdout for | 63 | """StreamPresenters write out boots results to streams, stdout for |
| 747 | 69 | 64 | ||
| 748 | === modified file 'boots/lib/ui/plain.py' | |||
| 749 | --- boots/lib/ui/plain.py 2010-02-21 10:23:44 +0000 | |||
| 750 | +++ boots/lib/ui/plain.py 2010-02-23 04:05:24 +0000 | |||
| 751 | @@ -1,7 +1,7 @@ | |||
| 752 | 1 | # Boots Client | 1 | # Boots Client |
| 753 | 2 | # www.launchpad.net/boots | 2 | # www.launchpad.net/boots |
| 754 | 3 | # www.launchpad.net/drizzle | 3 | # www.launchpad.net/drizzle |
| 756 | 4 | # lib/ui/plain.py | 4 | # boots/lib/ui/plain.py |
| 757 | 5 | # | 5 | # |
| 758 | 6 | # ##### BEGIN LICENSE BLOCK ##### | 6 | # ##### BEGIN LICENSE BLOCK ##### |
| 759 | 7 | # Version: MPL 1.1 | 7 | # Version: MPL 1.1 |
| 760 | @@ -34,6 +34,10 @@ | |||
| 761 | 34 | import os | 34 | import os |
| 762 | 35 | import time | 35 | import time |
| 763 | 36 | import readline | 36 | import readline |
| 764 | 37 | import gettext | ||
| 765 | 38 | gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None | ||
| 766 | 39 | gettext.textdomain("fslint") | ||
| 767 | 40 | _ = gettext.gettext | ||
| 768 | 37 | 41 | ||
| 769 | 38 | from boots.api.nodes.node import NodeGraph, SyncNode | 42 | from boots.api.nodes.node import NodeGraph, SyncNode |
| 770 | 39 | from boots.lib.ui.components.metacommands import MetaCommands, parse_metacommand | 43 | from boots.lib.ui.components.metacommands import MetaCommands, parse_metacommand |
| 771 | @@ -149,7 +153,7 @@ | |||
| 772 | 149 | dashes = map(lambda x: "-"*(x+2), max_widths) | 153 | dashes = map(lambda x: "-"*(x+2), max_widths) |
| 773 | 150 | sep_line = "+" + "+".join(dashes) + "+\n" | 154 | sep_line = "+" + "+".join(dashes) + "+\n" |
| 774 | 151 | current_time = time.time() | 155 | current_time = time.time() |
| 776 | 152 | info_line = "{0} rows in set ({1:.2f} seconds).\n".format(len(self.buffer), | 156 | info_line = "{0} " +_("rows in set")+" ({1:.2f} "+ _("seconds")+".\n".format(len(self.buffer), |
| 777 | 153 | current_time - result["begin_time"]) | 157 | current_time - result["begin_time"]) |
| 778 | 154 | names = (column[0] for column in self.last_desc) | 158 | names = (column[0] for column in self.last_desc) |
| 779 | 155 | sys.stdout.write(sep_line) | 159 | sys.stdout.write(sep_line) |
| 780 | @@ -163,7 +167,7 @@ | |||
| 781 | 163 | self.buffer = [] | 167 | self.buffer = [] |
| 782 | 164 | else: | 168 | else: |
| 783 | 165 | if isinstance(result, Exception): | 169 | if isinstance(result, Exception): |
| 785 | 166 | sys.stdout.write("ERROR ") | 170 | sys.stdout.write(_("ERROR ")) |
| 786 | 167 | sys.stdout.write(" :: ".join(map(str, result.args))) | 171 | sys.stdout.write(" :: ".join(map(str, result.args))) |
| 787 | 168 | else: | 172 | else: |
| 788 | 169 | sys.stdout.write(str(result)) | 173 | sys.stdout.write(str(result)) |
| 789 | @@ -182,4 +186,4 @@ | |||
| 790 | 182 | if lingo in self.console.lingos: | 186 | if lingo in self.console.lingos: |
| 791 | 183 | self.lingo = lingo | 187 | self.lingo = lingo |
| 792 | 184 | else: | 188 | else: |
| 794 | 185 | self.present("The specified lingo \"{0}\" does not exist.".format(lingo)) | 189 | self.present(_("The specified lingo")+" \"{0}\" "+_("does not exist.").format(lingo)) |
| 795 | 186 | 190 | ||
| 796 | === added directory 'localizations' | |||
| 797 | === added file 'localizations/README.txt' | |||
| 798 | --- localizations/README.txt 1970-01-01 00:00:00 +0000 | |||
| 799 | +++ localizations/README.txt 2010-02-23 04:05:24 +0000 | |||
| 800 | @@ -0,0 +1,22 @@ | |||
| 801 | 1 | ========When adding code that outputs a string======== | ||
| 802 | 2 | 1) Add (if not present already) to the import section of the .py file | ||
| 803 | 3 | #========= | ||
| 804 | 4 | import gettext | ||
| 805 | 5 | gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None | ||
| 806 | 6 | gettext.textdomain("fslint") | ||
| 807 | 7 | _ = gettext.gettext | ||
| 808 | 8 | #========= | ||
| 809 | 9 | And then wrap all output strings with _("..."). | ||
| 810 | 10 | You should do this so that if you are using dynamicly created content, that created content is not part of the wrapped string. | ||
| 811 | 11 | Ex: | ||
| 812 | 12 | help = "Execute commands from file and exit") | ||
| 813 | 13 | should be wrapped as such: | ||
| 814 | 14 | help = _("Execute commands from file and exit")) | ||
| 815 | 15 | Ex: | ||
| 816 | 16 | print("rcfile {0} contains a syntax error".format(filepath)) | ||
| 817 | 17 | should be wrapped as such: | ||
| 818 | 18 | print(_("rcfile ")+"{0} "+_("contains a syntax error").format(filepath)) | ||
| 819 | 19 | |||
| 820 | 20 | 2) Add your file path to the /boots/localizations/potfiles.txt file. | ||
| 821 | 21 | 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. | ||
| 822 | 22 | 4) Upload new pot file to the launchpad localization section for creation or updating of .po files. (more on this later --ken) | ||
| 823 | 0 | 23 | ||
| 824 | === added file 'localizations/createpots.sh' | |||
| 825 | --- localizations/createpots.sh 1970-01-01 00:00:00 +0000 | |||
| 826 | +++ localizations/createpots.sh 2010-02-23 04:05:24 +0000 | |||
| 827 | @@ -0,0 +1,3 @@ | |||
| 828 | 1 | #!/bin/bash | ||
| 829 | 2 | xgettext --from-code=utf-8 --keyword=tr --default-domain=cms --output=pot.cms --files-from=potfiles.txt | ||
| 830 | 3 | |||
| 831 | 0 | 4 | ||
| 832 | === added file 'localizations/pot.cms' | |||
| 833 | --- localizations/pot.cms 1970-01-01 00:00:00 +0000 | |||
| 834 | +++ localizations/pot.cms 2010-02-23 04:05:24 +0000 | |||
| 835 | @@ -0,0 +1,206 @@ | |||
| 836 | 1 | # SOME DESCRIPTIVE TITLE. | ||
| 837 | 2 | # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER | ||
| 838 | 3 | # This file is distributed under the same license as the PACKAGE package. | ||
| 839 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| 840 | 5 | # | ||
| 841 | 6 | #, fuzzy | ||
| 842 | 7 | msgid "" | ||
| 843 | 8 | msgstr "" | ||
| 844 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | ||
| 845 | 10 | "Report-Msgid-Bugs-To: \n" | ||
| 846 | 11 | "POT-Creation-Date: 2010-02-22 13:01-0800\n" | ||
| 847 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| 848 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 849 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | ||
| 850 | 15 | "MIME-Version: 1.0\n" | ||
| 851 | 16 | "Content-Type: text/plain; charset=CHARSET\n" | ||
| 852 | 17 | "Content-Transfer-Encoding: 8bit\n" | ||
| 853 | 18 | |||
| 854 | 19 | #: ../boots/api/nodes/node.py:478 | ||
| 855 | 20 | msgid "waiting" | ||
| 856 | 21 | msgstr "" | ||
| 857 | 22 | |||
| 858 | 23 | #: ../boots/api/nodes/node.py:483 | ||
| 859 | 24 | msgid "printing" | ||
| 860 | 25 | msgstr "" | ||
| 861 | 26 | |||
| 862 | 27 | #: ../boots/app/client_config.py:77 | ||
| 863 | 28 | msgid "Execute command and exit" | ||
| 864 | 29 | msgstr "" | ||
| 865 | 30 | |||
| 866 | 31 | #: ../boots/app/client_config.py:82 | ||
| 867 | 32 | msgid "Use database" | ||
| 868 | 33 | msgstr "" | ||
| 869 | 34 | |||
| 870 | 35 | #: ../boots/app/client_config.py:87 | ||
| 871 | 36 | msgid "Execute commands from file and exit" | ||
| 872 | 37 | msgstr "" | ||
| 873 | 38 | |||
| 874 | 39 | #: ../boots/app/client_config.py:96 | ||
| 875 | 40 | msgid "Do not read user configuration file" | ||
| 876 | 41 | msgstr "" | ||
| 877 | 42 | |||
| 878 | 43 | #: ../boots/app/client_config.py:101 | ||
| 879 | 44 | msgid "Filename of user configuration file" | ||
| 880 | 45 | msgstr "" | ||
| 881 | 46 | |||
| 882 | 47 | #: ../boots/app/client_config.py:106 | ||
| 883 | 48 | msgid "Connect to host" | ||
| 884 | 49 | msgstr "" | ||
| 885 | 50 | |||
| 886 | 51 | #: ../boots/app/client_config.py:111 | ||
| 887 | 52 | msgid "Use port number" | ||
| 888 | 53 | msgstr "" | ||
| 889 | 54 | |||
| 890 | 55 | #: ../boots/app/client_config.py:116 | ||
| 891 | 56 | msgid "Login with username" | ||
| 892 | 57 | msgstr "" | ||
| 893 | 58 | |||
| 894 | 59 | #: ../boots/app/client_config.py:121 | ||
| 895 | 60 | msgid "Connect using password. If none is given, query for password" | ||
| 896 | 61 | msgstr "" | ||
| 897 | 62 | |||
| 898 | 63 | #: ../boots/app/client_config.py:126 | ||
| 899 | 64 | msgid "Specify the SQL statement terminating character. Default is ';'." | ||
| 900 | 65 | msgstr "" | ||
| 901 | 66 | |||
| 902 | 67 | #: ../boots/app/client_config.py:131 | ||
| 903 | 68 | msgid "Specify file to save history to" | ||
| 904 | 69 | msgstr "" | ||
| 905 | 70 | |||
| 906 | 71 | #: ../boots/app/client_config.py:136 | ||
| 907 | 72 | msgid "Specify max history file length" | ||
| 908 | 73 | msgstr "" | ||
| 909 | 74 | |||
| 910 | 75 | #: ../boots/app/client_config.py:176 | ||
| 911 | 76 | msgid "not found" | ||
| 912 | 77 | msgstr "" | ||
| 913 | 78 | |||
| 914 | 79 | #: ../boots/app/client_config.py:178 ../boots/app/client_config.py:180 | ||
| 915 | 80 | msgid "rcfile " | ||
| 916 | 81 | msgstr "" | ||
| 917 | 82 | |||
| 918 | 83 | #: ../boots/app/client_config.py:178 | ||
| 919 | 84 | msgid "contains a syntax error" | ||
| 920 | 85 | msgstr "" | ||
| 921 | 86 | |||
| 922 | 87 | #: ../boots/app/client_config.py:180 | ||
| 923 | 88 | msgid "contains an error:" | ||
| 924 | 89 | msgstr "" | ||
| 925 | 90 | |||
| 926 | 91 | #: ../boots/lib/console.py:100 | ||
| 927 | 92 | msgid "Invalid lingo" | ||
| 928 | 93 | msgstr "" | ||
| 929 | 94 | |||
| 930 | 95 | #: ../boots/lib/console.py:100 | ||
| 931 | 96 | msgid "specified." | ||
| 932 | 97 | msgstr "" | ||
| 933 | 98 | |||
| 934 | 99 | #: ../boots/lib/console.py:113 | ||
| 935 | 100 | msgid "Could not connect to" | ||
| 936 | 101 | msgstr "" | ||
| 937 | 102 | |||
| 938 | 103 | #: ../boots/lib/console.py:154 | ||
| 939 | 104 | msgid "Boots quit." | ||
| 940 | 105 | msgstr "" | ||
| 941 | 106 | |||
| 942 | 107 | #: ../boots/lib/ui/plain.py:156 | ||
| 943 | 108 | msgid "rows in set" | ||
| 944 | 109 | msgstr "" | ||
| 945 | 110 | |||
| 946 | 111 | #: ../boots/lib/ui/plain.py:156 | ||
| 947 | 112 | msgid "seconds" | ||
| 948 | 113 | msgstr "" | ||
| 949 | 114 | |||
| 950 | 115 | #: ../boots/lib/ui/plain.py:170 | ||
| 951 | 116 | msgid "ERROR " | ||
| 952 | 117 | msgstr "" | ||
| 953 | 118 | |||
| 954 | 119 | #: ../boots/lib/ui/plain.py:189 | ||
| 955 | 120 | msgid "The specified lingo" | ||
| 956 | 121 | msgstr "" | ||
| 957 | 122 | |||
| 958 | 123 | #: ../boots/lib/ui/plain.py:189 | ||
| 959 | 124 | msgid "does not exist." | ||
| 960 | 125 | msgstr "" | ||
| 961 | 126 | |||
| 962 | 127 | #: ../boots/lib/ui/components/help.py:67 | ||
| 963 | 128 | msgid "See also: " | ||
| 964 | 129 | msgstr "" | ||
| 965 | 130 | |||
| 966 | 131 | #: ../boots/lib/ui/components/help.py:101 | ||
| 967 | 132 | msgid "query object" | ||
| 968 | 133 | msgstr "" | ||
| 969 | 134 | |||
| 970 | 135 | #: ../boots/lib/ui/components/help.py:101 | ||
| 971 | 136 | msgid "is not a string or tuple of strings" | ||
| 972 | 137 | msgstr "" | ||
| 973 | 138 | |||
| 974 | 139 | #: ../boots/lib/ui/components/metacommands.py:57 | ||
| 975 | 140 | msgid "Conflicts between metacommands detected." | ||
| 976 | 141 | msgstr "" | ||
| 977 | 142 | |||
| 978 | 143 | #: ../boots/lib/lingos/piped_sql.py:72 | ||
| 979 | 144 | msgid "A constructor with name" | ||
| 980 | 145 | msgstr "" | ||
| 981 | 146 | |||
| 982 | 147 | #: ../boots/lib/lingos/piped_sql.py:72 | ||
| 983 | 148 | msgid "already exists" | ||
| 984 | 149 | msgstr "" | ||
| 985 | 150 | |||
| 986 | 151 | #: ../boots/lib/lingos/piped_sql.py:79 | ||
| 987 | 152 | msgid "There is no constructor with the name" | ||
| 988 | 153 | msgstr "" | ||
| 989 | 154 | |||
| 990 | 155 | #: ../boots/lib/lingos/piped_sql.py:94 ../boots/lib/lingos/piped_sql.py:105 | ||
| 991 | 156 | msgid "is not in the correct function call syntax" | ||
| 992 | 157 | msgstr "" | ||
| 993 | 158 | |||
| 994 | 159 | #: ../boots/lib/lingos/piped_sql.py:144 | ||
| 995 | 160 | msgid "SQL is only permitted for the first clause" | ||
| 996 | 161 | msgstr "" | ||
| 997 | 162 | |||
| 998 | 163 | #: ../boots/lib/lingos/lisp/builtins.py:72 | ||
| 999 | 164 | msgid "Expected a cons, nil or a string" | ||
| 1000 | 165 | msgstr "" | ||
| 1001 | 166 | |||
| 1002 | 167 | #: ../boots/lib/lingos/lisp/builtins.py:81 | ||
| 1003 | 168 | msgid "Expected a cons or string" | ||
| 1004 | 169 | msgstr "" | ||
| 1005 | 170 | |||
| 1006 | 171 | #: ../boots/lib/lingos/lisp/lexer.py:49 | ||
| 1007 | 172 | msgid "illegal character" | ||
| 1008 | 173 | msgstr "" | ||
| 1009 | 174 | |||
| 1010 | 175 | #: ../boots/lib/lingos/lisp/lexer.py:49 | ||
| 1011 | 176 | msgid "found" | ||
| 1012 | 177 | msgstr "" | ||
| 1013 | 178 | |||
| 1014 | 179 | #: ../boots/lib/lingos/lisp/lisp.py:71 | ||
| 1015 | 180 | msgid "unmatched closing" | ||
| 1016 | 181 | msgstr "" | ||
| 1017 | 182 | |||
| 1018 | 183 | #: ../boots/lib/lingos/lisp/lisp.py:90 | ||
| 1019 | 184 | msgid "is not a stream or a callable" | ||
| 1020 | 185 | msgstr "" | ||
| 1021 | 186 | |||
| 1022 | 187 | #: ../boots/lib/lingos/lisp/objects.py:111 | ||
| 1023 | 188 | msgid "wrong number of arguments for if special form" | ||
| 1024 | 189 | msgstr "" | ||
| 1025 | 190 | |||
| 1026 | 191 | #: ../boots/lib/lingos/lisp/objects.py:130 | ||
| 1027 | 192 | msgid "" | ||
| 1028 | 193 | "The number of symbols must equal the number of values and must be non-zero" | ||
| 1029 | 194 | msgstr "" | ||
| 1030 | 195 | |||
| 1031 | 196 | #: ../boots/lib/lingos/lisp/objects.py:144 | ||
| 1032 | 197 | msgid "Expected a function" | ||
| 1033 | 198 | msgstr "" | ||
| 1034 | 199 | |||
| 1035 | 200 | #: ../boots/lib/lingos/lisp/objects.py:230 | ||
| 1036 | 201 | msgid "Cannot pop the innermost scope because then no scopes would remain" | ||
| 1037 | 202 | msgstr "" | ||
| 1038 | 203 | |||
| 1039 | 204 | #: ../boots/lib/lingos/lisp/parser.py:74 | ||
| 1040 | 205 | msgid "syntax error" | ||
| 1041 | 206 | msgstr "" | ||
| 1042 | 0 | 207 | ||
| 1043 | === added file 'localizations/potfiles.txt' | |||
| 1044 | --- localizations/potfiles.txt 1970-01-01 00:00:00 +0000 | |||
| 1045 | +++ localizations/potfiles.txt 2010-02-23 04:05:24 +0000 | |||
| 1046 | @@ -0,0 +1,12 @@ | |||
| 1047 | 1 | ../boots/api/nodes/node.py | ||
| 1048 | 2 | ../boots/app/client_config.py | ||
| 1049 | 3 | ../boots/lib/console.py | ||
| 1050 | 4 | ../boots/lib/ui/plain.py | ||
| 1051 | 5 | ../boots/lib/ui/components/help.py | ||
| 1052 | 6 | ../boots/lib/ui/components/metacommands.py | ||
| 1053 | 7 | ../boots/lib/lingos/piped_sql.py | ||
| 1054 | 8 | ../boots/lib/lingos/lisp/builtins.py | ||
| 1055 | 9 | ../boots/lib/lingos/lisp/lexer.py | ||
| 1056 | 10 | ../boots/lib/lingos/lisp/lisp.py | ||
| 1057 | 11 | ../boots/lib/lingos/lisp/objects.py | ||
| 1058 | 12 | ../boots/lib/lingos/lisp/parser.py | ||
| 1059 | 0 | 13 | ||
| 1060 | === modified file 'setup.py' | |||
| 1061 | --- setup.py 2010-02-17 03:49:02 +0000 | |||
| 1062 | +++ setup.py 2010-02-23 04:05:24 +0000 | |||
| 1063 | @@ -2,7 +2,7 @@ | |||
| 1064 | 2 | # Boots Setup | 2 | # Boots Setup |
| 1065 | 3 | # www.launchpad.net/boots | 3 | # www.launchpad.net/boots |
| 1066 | 4 | # www.launchpad.net/drizzle | 4 | # www.launchpad.net/drizzle |
| 1068 | 5 | # setup.py | 5 | # boots/setup.py |
| 1069 | 6 | # | 6 | # |
| 1070 | 7 | # ##### BEGIN LICENSE BLOCK ##### | 7 | # ##### BEGIN LICENSE BLOCK ##### |
| 1071 | 8 | # Version: MPL 1.1 | 8 | # Version: MPL 1.1 |
Please ignore prev prop, it was empty. hehe. Have added localization to the code.