[Jifty-commit] r2782 - in jifty/branches/virtual-models: .
lib/Jifty lib/Jifty/Manual lib/Jifty/Script share/po
share/web/templates/__jifty share/web/templates/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Feb 10 19:52:41 EST 2007
Author: jesse
Date: Sat Feb 10 19:52:40 2007
New Revision: 2782
Added:
jifty/branches/virtual-models/lib/Jifty/Script/Adopt.pm
jifty/branches/virtual-models/lib/Jifty/Script/Env.pm
Modified:
jifty/branches/virtual-models/ (props changed)
jifty/branches/virtual-models/lib/Jifty/Logger.pm
jifty/branches/virtual-models/lib/Jifty/Manual/Cookbook.pod
jifty/branches/virtual-models/lib/Jifty/Manual/Tutorial.pod
jifty/branches/virtual-models/lib/Jifty/Plugin.pm
jifty/branches/virtual-models/lib/Jifty/Script.pm
jifty/branches/virtual-models/lib/Jifty/Script/FastCGI.pm
jifty/branches/virtual-models/lib/Jifty/Test.pm
jifty/branches/virtual-models/lib/Jifty/Web/PageRegion.pm
jifty/branches/virtual-models/share/po/en.po
jifty/branches/virtual-models/share/po/fr.po
jifty/branches/virtual-models/share/po/ja.po
jifty/branches/virtual-models/share/po/zh_cn.po
jifty/branches/virtual-models/share/po/zh_tw.po
jifty/branches/virtual-models/share/web/templates/__jifty/halo
jifty/branches/virtual-models/share/web/templates/_elements/nav
Log:
r21871 at hualien (orig r2762): audreyt | 2007-02-08 02:36:21 -0500
* I18N and zh-* L10N for menu and halo.
r21874 at hualien (orig r2765): audreyt | 2007-02-08 04:24:55 -0500
* Jifty::Script - Assume "jifty fastcgi" when we are running under cgi.
r21901 at hualien (orig r2769): jesse | 2007-02-09 00:04:20 -0500
r21899 at hualien: jesse | 2007-02-09 00:02:01 -0500
* Added the ability to force arguments and path when rengering a region. This lets developers force override something passed in via ajax or a "sticky" value from a previous request.
r21909 at hualien (orig r2771): ewilhelm | 2007-02-09 04:37:25 -0500
lib/Jifty/Plugin.pm - typo fix
lib/Jifty/Manual/Tutorial.pod - cleanup, linked a pod reference
lib/Jifty/Manual/Cookbook.pod - spelling and grammar
r21910 at hualien (orig r2772): ewilhelm | 2007-02-09 05:36:21 -0500
lib/Jifty/Script/Adopt.pm - explore and steal from the stock components directory
lib/Jifty/Script/Env.pm - braindump Jifty.config.stash and such
r21957 at hualien (orig r2775): falcone | 2007-02-09 16:56:06 -0500
r16693 at ketch: falcone | 2007-02-09 16:54:37 -0500
* stop hiding messages/warns from the database during tests
* default to only showing WARN and higher when running tests
(rather than our more normal INFO)
r21958 at hualien (orig r2776): falcone | 2007-02-09 17:01:01 -0500
r16695 at ketch: falcone | 2007-02-09 17:00:42 -0500
* don't double warn. Now that we stopped schema creation from suppressing
warnings this *shouldn't* be necesary
Modified: jifty/branches/virtual-models/lib/Jifty/Logger.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Logger.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Logger.pm Sat Feb 10 19:52:40 2007
@@ -122,7 +122,6 @@
# the aliasing so we can remove trailing newlines
my @lines = map {"$_"} @_;
$logger->warn(map {chomp; $_} @lines);
- carp (map {chomp; $_} @lines);
}
elsif ($previous_warning_handler) {
# Fallback to the old handler
Modified: jifty/branches/virtual-models/lib/Jifty/Manual/Cookbook.pod
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Manual/Cookbook.pod (original)
+++ jifty/branches/virtual-models/lib/Jifty/Manual/Cookbook.pod Sat Feb 10 19:52:40 2007
@@ -181,7 +181,7 @@
dispatcher, to limit who is able to perform what actions -- see
L<Jifty::API>.
-=head2 Run my Jifty app as fascgi in Apache/Lighttpd ?
+=head2 Run my Jifty app as fastcgi in Apache/Lighttpd ?
Jifty provides a really simple way to run the application as a fastcgi
server. The complete instructions and examples are in C<'jifty help
@@ -259,7 +259,7 @@
If the form is generated by a C<Jifty::Action::Record>-based action
(all those autogenerated CRUD actions), then this is all you need to
-do. And that is probably 90% of the case. C<Jifty::Action::Record>
+do. And that is probably 90% of cases. C<Jifty::Action::Record>
would check if there is a method named like C<canonicalize_fieldname>
when it is rendering form fields. If found, related javascript code is
generated. You do not have to modify any code in your view. Jifty does
Modified: jifty/branches/virtual-models/lib/Jifty/Manual/Tutorial.pod
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Manual/Tutorial.pod (original)
+++ jifty/branches/virtual-models/lib/Jifty/Manual/Tutorial.pod Sat Feb 10 19:52:40 2007
@@ -30,11 +30,10 @@
modules your system needs, and downloading and installing them all in
one go. Don't worry, it will ask you first before it makes any changes.
-On most systems you can Perl's bundled CPAN module to download
+On most systems you can use Perl's bundled CPAN module to download
and install Jifty:
- # perl -MCPAN -e'install Jifty' # Unix-like systems
- # perl -MCPAN -e"install Jifty" # Win32 systems
+ # perl -MCPAN -e"install Jifty"
If you've downloaded a C<.tar.gz> of Jifty, you can do a
manual install:
@@ -55,9 +54,9 @@
Once you have Jifty happily installed, you're ready to
create your first application.
-Jifty is intentionally a bit minimalist. All you I<really>
-need to make an application go is a copy of the F<jifty> commandline
-tool (inside your new application's F<bin/> directory.
+Jifty is intentionally a bit minimalist. All you I<really> need to make
+an application go is a copy of the F<jifty> commandline tool (inside
+your new application's F<bin/> directory.)
Of course, it's often helpful to have a bit more structure around to
help guide your work. Jifty comes with tools to build that structure for
@@ -240,7 +239,7 @@
Ok. It's time to initialize MyWeblog's database. By default, Jifty sets up your
application with the SQLite database engine. If you'd rather use PostgreSQL or
-MySQL, you need to add some content to F<etc/jifty.yml>. (See C<Jifty::Config>
+MySQL, you need to add some content to F<etc/jifty.yml>. (See L<Jifty::Config>
for a bit more information).
# jifty schema --setup
Modified: jifty/branches/virtual-models/lib/Jifty/Plugin.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Plugin.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Plugin.pm Sat Feb 10 19:52:40 2007
@@ -25,7 +25,7 @@
the: constructor
The dispatcher for a plugin should live in
-C<Jifty::Plugin::I<name>::Disptcher>; it is written like any other
+C<Jifty::Plugin::I<name>::Dispatcher>; it is written like any other
L<Jifty::Dispatcher>. Plugin dispatcher rules are checked before the
application's rules; however, see L<Jifty::Dispatcher/Plugins and rule
ordering> for how to manually specify exceptions to this.
Modified: jifty/branches/virtual-models/lib/Jifty/Script.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Script.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Script.pm Sat Feb 10 19:52:40 2007
@@ -5,9 +5,13 @@
=head2 prepare
C<prepare> figures out which command to run. If the user wants
-C<--help> give them help. If they have no command on the commandline,
-but a JIFTY_COMMAND environment variable, try that. If they have
-neither, shows the help. Otherwise, let App::CLI figure it out.
+C<--help> give them help.
+
+In the normal case, let App::CLI figure out the commandline.
+If they have no command on the commandline, but a JIFTY_COMMAND
+environment variable, try that. Otherwise, if the GATEWAY_INTERFACE
+environment variable is set, assume we are running under CGI with the
+C<fastcgi> command. If all fails, shows the help.
=cut
@@ -16,11 +20,17 @@
if ($ARGV[0] =~ /--?h(elp?)/i) {
shift @ARGV; #discard the --help
unshift @ARGV, 'help';
- } elsif (!$ARGV[0] and $ENV{'JIFTY_COMMAND'}) {
- my $cmd = $ENV{'JIFTY_COMMAND'};
- unshift @ARGV, $cmd;
- } elsif (! @ARGV) {
- unshift @ARGV, 'help';
+ }
+ elsif (!@ARGV) {
+ if ( my $cmd = $ENV{'JIFTY_COMMAND'} ) {
+ unshift @ARGV, $cmd;
+ }
+ elsif ( $ENV{GATEWAY_INTERFACE} ) {
+ unshift @ARGV, 'fastcgi';
+ }
+ else {
+ unshift @ARGV, 'help';
+ }
}
return $self->SUPER::prepare(@_);
}
Added: jifty/branches/virtual-models/lib/Jifty/Script/Adopt.pm
==============================================================================
--- (empty file)
+++ jifty/branches/virtual-models/lib/Jifty/Script/Adopt.pm Sat Feb 10 19:52:40 2007
@@ -0,0 +1,127 @@
+package Jifty::Script::Adopt;
+
+use warnings;
+use strict;
+
+use base qw/App::CLI::Command/;
+
+use File::Copy ();
+use File::Spec ();
+use File::Basename ();
+
+use Jifty::Util;
+
+=head1 NAME
+
+Jifty::Script::Adopt - localize a stock jifty component
+
+=head1 DESCRIPTION
+
+Creates directories and copies files for you, launching $ENV{EDITOR} if
+it is defined.
+
+=head2 options
+
+=over
+
+=item --ls PATH
+
+List the contents of the stock components path.
+
+=back
+
+=cut
+
+sub options {
+ (
+ 'l|ls' => 'list',
+ 't|tree' => 'tree',
+ )
+}
+
+=head2 run
+
+ jifty adopt web/templates/_elements/nav
+
+ jifty adopt --ls web/static/
+
+=cut
+
+sub run {
+ my $self = shift;
+ my (@args) = @_;
+
+ my $filename = shift(@args);
+ $filename ||= '';
+ my @parts = split(/[\/\\]/, $filename);
+
+ if($self->{list}) {
+ my $dir = File::Spec->catfile(Jifty::Util->share_root, @parts);
+ unless(-d $dir) {
+ warn "no such directory $dir";
+ }
+ opendir(my $dh, $dir) or die;
+ my @files = sort(grep(! /^\.\.?$/, readdir($dh)));
+ my @dirs;
+ # sort directories first
+ for(my $i = 0; $i < @files; $i++) { # List::MoreUtil::part ?
+ if(-d File::Spec->catfile($dir, $files[$i])) {
+ push(@dirs, splice(@files, $i, 1) . '/');
+ $i--;
+ }
+ }
+ print join("\n", @dirs, @files, '');
+
+ exit;
+ }
+ elsif($self->{tree}) {
+ # Just punting here, maybe don't need this usage except when you
+ # have no tree command? Oh, the irony.
+ my $dir = File::Spec->catfile(Jifty::Util->share_root, @parts);
+ unless(-d $dir) {
+ warn "no such directory $dir";
+ }
+
+ system('tree', $dir) and die "oops $!";
+
+ exit;
+ }
+
+ unless($filename) {
+ die "usage: jifty adopt <filename>\n";
+ }
+
+ my $share = 'share';
+ unless(-d $share) {
+ die "must be run from your app directory\n";
+ }
+
+ my $source = File::Spec->catfile(Jifty::Util->share_root, @parts);
+ (-e $source) or die "no such source file '$source'\n";
+
+ my $dest = File::Spec->catfile($share, @parts);
+
+ unless(-d File::Basename::dirname($dest)) {
+ Jifty::Util->make_path($dest);
+ }
+
+ if(-e $dest) {
+ print "$dest exists, overwrite? [n]\n";
+ chomp(my $ans = <STDIN>); $ans ||= 'n';
+ exit 1 unless(lc($ans) eq 'y');
+ }
+ File::Copy::copy($source, $dest) or die "copy failed $!";
+ chmod(0644, $dest) or die "cannot change mode $!";
+
+ # TODO put an option on that?
+ if($ENV{EDITOR}) {
+ fork and exit;
+ exec("$ENV{EDITOR} $dest");
+ }
+
+} # end run
+
+# original author: Eric Wilhelm
+
+1;
+# vim:ts=4:sw=4:et:sta
Added: jifty/branches/virtual-models/lib/Jifty/Script/Env.pm
==============================================================================
--- (empty file)
+++ jifty/branches/virtual-models/lib/Jifty/Script/Env.pm Sat Feb 10 19:52:40 2007
@@ -0,0 +1,92 @@
+package Jifty::Script::Env;
+
+use warnings;
+use strict;
+
+use base qw/App::CLI::Command/;
+
+use Scalar::Util ();
+
+use Jifty::Config;
+use Jifty::YAML;
+
+=head1 NAME
+
+Jifty::Script::Env - access the Jifty environment
+
+=head1 DESCRIPTION
+
+Loads Jifty and your configuration, allowing you to verify and examine
+your setup.
+
+=head2 run
+
+ jifty env <Class> <method> [arguments]
+
+Loads Jifty::Class and calls method on it, providing shortcuts for
+things like:
+
+ perl -MJifty::Util -e 'print Jifty::Util->share_root, "\n";'
+
+The class and method can be combined with a '->' But, unquoted '>' is a
+redirect so simply use the '-' or '.' characters.
+
+ jifty env Util share_root
+ jifty env 'Util->share_root'
+ jifty env Util.share_root
+
+You may chain accessors. A leading dot also means the class is Jifty.
+
+ jifty env Jifty.config.framework ApplicationName
+ jifty env .config.framework ApplicationName
+
+With no arguments, acts as 'C<jifty env Jifty.config.stash>'.
+
+=cut
+
+sub run {
+ my $self = shift;
+ my (@args) = @_;
+
+ Jifty->new();
+
+ unless(@args) {
+ return($self->run('Jifty.config.stash'));
+ }
+
+ my ($class, $method, @and) = split(/(?:->?|\.)/, shift(@args));
+ $class ||= 'Jifty';
+ $method ||= shift(@args);
+
+ my @ans;
+
+ # enable Jifty.config.stash usage
+ unless($class eq 'Jifty') {
+ $class = 'Jifty::' . $class;
+ eval("require $class") or die $@;
+ }
+
+ # walk down the chain of methods
+ unshift(@and, $method);
+ $method = pop(@and);
+ while(my $attrib = shift(@and)) {
+ $class = $class->$attrib;
+ }
+
+ @ans = $class->$method(@args);
+
+ # if something in the answer is a reference, just dump
+ if(grep({Scalar::Util::reftype($_)} @ans)) {
+ print Jifty::YAML::Dump(\@ans);
+ }
+ else {
+ print join("\n", @ans, '');
+ }
+
+
+} # end run
+
+# original author: Eric Wilhelm
+
+1;
+# vim:ts=4:sw=4:et:sta
Modified: jifty/branches/virtual-models/lib/Jifty/Script/FastCGI.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Script/FastCGI.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Script/FastCGI.pm Sat Feb 10 19:52:40 2007
@@ -19,13 +19,12 @@
new world-changing application is generating, you'll need something a bit heavier-duty
than the pure-perl Jifty standalone server. C<FastCGI> is what you're looking for.
-Because Apache's FastCGI dispatcher can't pass commandline flags to your script, you'll need
-to call jifty a bit differently:
-
+ # These two lines are FastCGI-specific; skip them to run in vanilla CGI mode
AddHandler fastcgi-script fcgi
+ FastCgiServer /path/to/your/jifty/app/bin/jifty
+
DocumentRoot /path/to/your/jifty/app/share/web/templates
- FastCgiServer /path/to/your/jifty/app/bin/jifty -initial-env JIFTY_COMMAND=fastcgi
- ScriptAlias / /path/to/your/jifty/app/bin/jifty/
+ ScriptAlias / /path/to/your/jifty/app/bin/jifty/
For B<lighttpd> (L<http://www.lighttpd.net/>), use this setting:
Modified: jifty/branches/virtual-models/lib/Jifty/Test.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Test.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Test.pm Sat Feb 10 19:52:40 2007
@@ -142,13 +142,11 @@
Jifty->new( no_handle => 1 );
- Log::Log4perl->get_logger("SchemaTool")->less_logging(3);
my $schema = Jifty::Script::Schema->new;
$schema->{drop_database} =
$schema->{create_database} =
$schema->{create_all_tables} = 1;
$schema->run;
- Log::Log4perl->get_logger("SchemaTool")->more_logging(3);
Jifty->new();
$class->setup_mailbox;
@@ -191,6 +189,7 @@
},
Mailer => 'Jifty::Test',
MailerArgs => [],
+ LogLevel => 'WARN'
}
};
}
@@ -221,7 +220,6 @@
unshift @Jifty::Server::ISA, 'Test::HTTP::Server::Simple';
}
- Log::Log4perl->get_logger("Jifty::Server")->less_logging(3);
my $server = Jifty::Server->new;
return $server;
@@ -405,11 +403,9 @@
# Remove testing db
if (Jifty->handle) {
Jifty->handle->disconnect();
- Log::Log4perl->get_logger("SchemaTool")->less_logging(3);
my $schema = Jifty::Script::Schema->new;
$schema->{drop_database} = 1;
$schema->run;
- Log::Log4perl->get_logger("SchemaTool")->more_logging(3);
}
# Unlink test files
Modified: jifty/branches/virtual-models/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Web/PageRegion.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Web/PageRegion.pm Sat Feb 10 19:52:40 2007
@@ -15,7 +15,7 @@
=cut
use base qw/Jifty::Object Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors(qw(name default_path default_arguments qualified_name parent region_wrapper));
+__PACKAGE__->mk_accessors(qw(name force_path force_arguments default_path default_arguments qualified_name parent region_wrapper));
use Jifty::JSON;
=head2 new PARAMHASH
@@ -40,6 +40,15 @@
Specifies an optional set of parameter defaults. These should all be
simple scalars, as they might be passed across HTTP if AJAX is used.
+=item force_arguments (optional)
+
+Specifies an optional set of parameter values. They will override anything
+sent by the user or set via AJAX.
+
+=item force_path (optional)
+
+A fixed path to the fragment that this page region contains. Overrides anything set by the user.
+
=item parent (optional)
The parent L<Jifty::Web::PageRegion> that this region is enclosed in.
@@ -50,6 +59,9 @@
HTML region preamble that makes Javascript aware of its presence.
Defaults to true.
+
+=item
+
=back
=cut
@@ -63,6 +75,8 @@
path => "/__jifty/empty",
defaults => {},
parent => undef,
+ force_arguments => {},
+ force_path => undef,
region_wrapper => 1,
@_
);
@@ -84,6 +98,8 @@
$self->qualified_name(Jifty->web->qualified_region($self));
$self->default_path($args{path});
$self->default_arguments($args{defaults});
+ $self->force_arguments($args{force_arguments});
+ $self->force_path($args{force_path});
$self->arguments({});
$self->parent($args{parent} || Jifty->web->current_region);
$self->region_wrapper($args{region_wrapper});
@@ -158,7 +174,7 @@
my $self = shift;
my $name = shift;
$self->{arguments}{$name} = shift if @_;
- return $self->{arguments}{$name} || $self->default_argument($name);
+ return $self->force_arguments->{$name}||$self->{arguments}{$name} || $self->default_argument($name);
}
=head2 arguments [HASHREF]
@@ -171,7 +187,7 @@
sub arguments {
my $self = shift;
$self->{arguments} = shift if @_;
- return { %{$self->{default_arguments}}, %{$self->{arguments}}};
+ return { %{$self->{default_arguments}}, %{$self->{arguments}}, %{$self->force_arguments}};
}
=head2 enter
@@ -179,7 +195,7 @@
Enters the region; this sets the qualified name based on
L<Jifty::Web/qualified_region>, and uses that to pull runtime values
for the L</path> and L</argument>s from the
-L<Jifty::Request/state_variables>.
+L<Jifty::Request/state_variables> before overriding them with the "force" versions.
=cut
@@ -204,6 +220,12 @@
# We should always inherit the state variables from the uplevel request.
Jifty->web->set_variable($key => $value);
}
+
+ for my $argument (keys %{$self->force_arguments}) {
+ $self->argument($argument => $self->force_arguments->{$argument});
+ }
+
+ $self->path($self->force_path) if ($self->force_path);
}
=head2 exit
Modified: jifty/branches/virtual-models/share/po/en.po
==============================================================================
--- jifty/branches/virtual-models/share/po/en.po (original)
+++ jifty/branches/virtual-models/share/po/en.po Sat Feb 10 19:52:40 2007
@@ -94,7 +94,7 @@
msgid "(any)"
msgstr ""
-#: lib/Jifty/Web/Form/Field.pm:549
+#: lib/Jifty/Web/Form/.Field.pm.swp:44 lib/Jifty/Web/Form/Field.pm:549
msgid "@{[$self->current_value]}"
msgstr ""
@@ -102,6 +102,10 @@
msgid "Actions"
msgstr ""
+#: share/web/templates/_elements/nav:5
+msgid "Administration"
+msgstr ""
+
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
msgstr ""
@@ -126,6 +130,10 @@
msgid "Back to the application"
msgstr ""
+#: share/web/templates/__jifty/halo:117
+msgid "Bindings"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
@@ -135,6 +143,10 @@
msgid "Cancel"
msgstr ""
+#: share/web/templates/__jifty/halo:81
+msgid "Children"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr ""
@@ -172,7 +184,7 @@
msgid "Done?"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:40
+#: share/web/templates/__jifty/admin/fragments/list/view:40 share/web/templates/__jifty/halo:20
msgid "Edit"
msgstr ""
@@ -190,6 +202,10 @@
msgid "Hiya, %1."
msgstr ""
+#: share/web/templates/_elements/nav:3
+msgid "Home"
+msgstr ""
+
#: share/web/templates/__jifty/admin/index.html:1
msgid "Jifty Administrative Console"
msgstr ""
@@ -235,7 +251,7 @@
msgid "No items found"
msgstr ""
-#: lib/Jifty/Web.pm:299
+#: lib/Jifty/Web.pm:300
msgid "No request to handle"
msgstr ""
@@ -243,12 +259,24 @@
msgid "Online Documentation"
msgstr ""
+#: share/web/templates/_elements/nav:6
+msgid "Online docs"
+msgstr ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr ""
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
+#: share/web/templates/__jifty/halo:1
+msgid "Page info"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:72
+msgid "Parent"
+msgstr ""
+
+#: lib/Jifty/Record.pm:264 lib/Jifty/Record.pm:343 lib/Jifty/Record.pm:68
msgid "Permission denied"
msgstr ""
@@ -256,6 +284,11 @@
msgid "Previous Page"
msgstr ""
+#: share/web/templates/__jifty/halo:69
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr ""
+
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
msgstr ""
@@ -296,7 +329,7 @@
msgid "The passwords you typed didn't match each other"
msgstr ""
-#: lib/Jifty/Web.pm:362
+#: lib/Jifty/Web.pm:363
msgid "There was an error completing the request. Please try again later."
msgstr ""
@@ -320,6 +353,10 @@
msgid "Updated"
msgstr ""
+#: share/web/templates/__jifty/halo:93
+msgid "Variables"
+msgstr ""
+
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
msgstr ""
@@ -348,3 +385,11 @@
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr ""
Modified: jifty/branches/virtual-models/share/po/fr.po
==============================================================================
--- jifty/branches/virtual-models/share/po/fr.po (original)
+++ jifty/branches/virtual-models/share/po/fr.po Sat Feb 10 19:52:40 2007
@@ -94,7 +94,7 @@
msgid "(any)"
msgstr ""
-#: lib/Jifty/Web/Form/Field.pm:549
+#: lib/Jifty/Web/Form/.Field.pm.swp:44 lib/Jifty/Web/Form/Field.pm:549
msgid "@{[$self->current_value]}"
msgstr ""
@@ -102,6 +102,10 @@
msgid "Actions"
msgstr ""
+#: share/web/templates/_elements/nav:5
+msgid "Administration"
+msgstr ""
+
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
msgstr "Mode d'administration activé."
@@ -126,6 +130,10 @@
msgid "Back to the application"
msgstr "Retour à l'application"
+#: share/web/templates/__jifty/halo:117
+msgid "Bindings"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
@@ -135,6 +143,10 @@
msgid "Cancel"
msgstr "Annuler"
+#: share/web/templates/__jifty/halo:81
+msgid "Children"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "Fermer la fenêtre"
@@ -172,7 +184,7 @@
msgid "Done?"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:40
+#: share/web/templates/__jifty/admin/fragments/list/view:40 share/web/templates/__jifty/halo:20
msgid "Edit"
msgstr "Editer"
@@ -190,6 +202,10 @@
msgid "Hiya, %1."
msgstr "Bonjour, %1"
+#: share/web/templates/_elements/nav:3
+msgid "Home"
+msgstr ""
+
#: share/web/templates/__jifty/admin/index.html:1
msgid "Jifty Administrative Console"
msgstr ""
@@ -235,7 +251,7 @@
msgid "No items found"
msgstr "Aucun enregistrement"
-#: lib/Jifty/Web.pm:299
+#: lib/Jifty/Web.pm:300
msgid "No request to handle"
msgstr "Aucune requête à traiter"
@@ -243,12 +259,24 @@
msgid "Online Documentation"
msgstr "Documentation en ligne"
+#: share/web/templates/_elements/nav:6
+msgid "Online docs"
+msgstr ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "Page %1 / %2"
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
+#: share/web/templates/__jifty/halo:1
+msgid "Page info"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:72
+msgid "Parent"
+msgstr ""
+
+#: lib/Jifty/Record.pm:264 lib/Jifty/Record.pm:343 lib/Jifty/Record.pm:68
msgid "Permission denied"
msgstr "Autorisation refusée"
@@ -260,6 +288,11 @@
msgid "Record created"
msgstr "Enregistrement créé"
+#: share/web/templates/__jifty/halo:69
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr ""
+
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
msgstr "Exécuter l'action"
@@ -300,7 +333,7 @@
msgid "The passwords you typed didn't match each other"
msgstr "Les mots de passe tapés ne sont pas identiques"
-#: lib/Jifty/Web.pm:362
+#: lib/Jifty/Web.pm:363
msgid "There was an error completing the request. Please try again later."
msgstr "Problème lors de l'exécution de cette requête. Ré-essayez plus tard."
@@ -324,6 +357,10 @@
msgid "Updated"
msgstr "Modification"
+#: share/web/templates/__jifty/halo:93
+msgid "Variables"
+msgstr ""
+
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
msgstr "Bienvenue sur votre nouvelle application Jifty"
@@ -352,3 +389,11 @@
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr ""
Modified: jifty/branches/virtual-models/share/po/ja.po
==============================================================================
--- jifty/branches/virtual-models/share/po/ja.po (original)
+++ jifty/branches/virtual-models/share/po/ja.po Sat Feb 10 19:52:40 2007
@@ -94,7 +94,7 @@
msgid "(any)"
msgstr "（指定なし）"
-#: lib/Jifty/Web/Form/Field.pm:549
+#: lib/Jifty/Web/Form/.Field.pm.swp:44 lib/Jifty/Web/Form/Field.pm:549
msgid "@{[$self->current_value]}"
msgstr ""
@@ -102,6 +102,10 @@
msgid "Actions"
msgstr "操作"
+#: share/web/templates/_elements/nav:5
+msgid "Administration"
+msgstr ""
+
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
msgstr "管理モードが有効になっています"
@@ -126,6 +130,10 @@
msgid "Back to the application"
msgstr "アプリケーションに戻る"
+#: share/web/templates/__jifty/halo:117
+msgid "Bindings"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
@@ -135,6 +143,10 @@
msgid "Cancel"
msgstr "キャンセル"
+#: share/web/templates/__jifty/halo:81
+msgid "Children"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "閉じる"
@@ -172,7 +184,7 @@
msgid "Done?"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:40
+#: share/web/templates/__jifty/admin/fragments/list/view:40 share/web/templates/__jifty/halo:20
msgid "Edit"
msgstr "編集"
@@ -190,6 +202,10 @@
msgid "Hiya, %1."
msgstr "%1 さん、こんにちは"
+#: share/web/templates/_elements/nav:3
+msgid "Home"
+msgstr ""
+
#: share/web/templates/__jifty/admin/index.html:1
msgid "Jifty Administrative Console"
msgstr ""
@@ -235,7 +251,7 @@
msgid "No items found"
msgstr "見つかりませんでした"
-#: lib/Jifty/Web.pm:299
+#: lib/Jifty/Web.pm:300
msgid "No request to handle"
msgstr "処理できるリクエストがありません"
@@ -243,12 +259,24 @@
msgid "Online Documentation"
msgstr "オンラインドキュメント"
+#: share/web/templates/_elements/nav:6
+msgid "Online docs"
+msgstr ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "%1 / %2 ページ"
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
+#: share/web/templates/__jifty/halo:1
+msgid "Page info"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:72
+msgid "Parent"
+msgstr ""
+
+#: lib/Jifty/Record.pm:264 lib/Jifty/Record.pm:343 lib/Jifty/Record.pm:68
msgid "Permission denied"
msgstr "権限がありません"
@@ -256,6 +284,11 @@
msgid "Previous Page"
msgstr "前のページ"
+#: share/web/templates/__jifty/halo:69
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr ""
+
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
msgstr "実行"
@@ -296,7 +329,7 @@
msgid "The passwords you typed didn't match each other"
msgstr "パスワードが一致しません"
-#: lib/Jifty/Web.pm:362
+#: lib/Jifty/Web.pm:363
msgid "There was an error completing the request. Please try again later."
msgstr "リクエストの処理中にエラーが発生しました。しばらく待ってから再度試してみてください"
@@ -320,6 +353,10 @@
msgid "Updated"
msgstr "更新しました"
+#: share/web/templates/__jifty/halo:93
+msgid "Variables"
+msgstr ""
+
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
msgstr "Jifty の新規アプリケーションです"
@@ -348,3 +385,11 @@
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
msgstr "降順"
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr ""
Modified: jifty/branches/virtual-models/share/po/zh_cn.po
==============================================================================
--- jifty/branches/virtual-models/share/po/zh_cn.po (original)
+++ jifty/branches/virtual-models/share/po/zh_cn.po Sat Feb 10 19:52:40 2007
@@ -93,7 +93,7 @@
msgid "(any)"
msgstr "(任意)"
-#: lib/Jifty/Web/Form/Field.pm:549
+#: lib/Jifty/Web/Form/.Field.pm.swp:44 lib/Jifty/Web/Form/Field.pm:549
msgid "@{[$self->current_value]}"
msgstr ""
@@ -101,6 +101,10 @@
msgid "Actions"
msgstr "操作"
+#: share/web/templates/_elements/nav:5
+msgid "Administration"
+msgstr "管理接口"
+
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
msgstr "系统管理模式开启中."
@@ -125,6 +129,10 @@
msgid "Back to the application"
msgstr "回到应用程序"
+#: share/web/templates/__jifty/halo:117
+msgid "Bindings"
+msgstr "快速键"
+
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
@@ -134,6 +142,10 @@
msgid "Cancel"
msgstr "取消"
+#: share/web/templates/__jifty/halo:81
+msgid "Children"
+msgstr "子组件"
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "关闭窗口"
@@ -175,7 +187,7 @@
msgid "Done?"
msgstr "已完成？"
-#: share/web/templates/__jifty/admin/fragments/list/view:40
+#: share/web/templates/__jifty/admin/fragments/list/view:40 share/web/templates/__jifty/halo:20
msgid "Edit"
msgstr "编辑"
@@ -193,6 +205,10 @@
msgid "Hiya, %1."
msgstr "您好，%1。"
+#: share/web/templates/_elements/nav:3
+msgid "Home"
+msgstr "首页"
+
#: share/web/templates/__jifty/admin/index.html:1
msgid "Jifty Administrative Console"
msgstr "Jifty 管理界面"
@@ -238,7 +254,7 @@
msgid "No items found"
msgstr "未找到记录"
-#: lib/Jifty/Web.pm:299
+#: lib/Jifty/Web.pm:300
msgid "No request to handle"
msgstr "没有可处理的请求"
@@ -246,12 +262,24 @@
msgid "Online Documentation"
msgstr "线上文件"
+#: share/web/templates/_elements/nav:6
+msgid "Online docs"
+msgstr "线上文件"
+
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "第 %1 页, 共 %2 页"
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
+#: share/web/templates/__jifty/halo:1
+msgid "Page info"
+msgstr "页面信息"
+
+#: share/web/templates/__jifty/halo:72
+msgid "Parent"
+msgstr "上层组件"
+
+#: lib/Jifty/Record.pm:264 lib/Jifty/Record.pm:343 lib/Jifty/Record.pm:68
msgid "Permission denied"
msgstr "权限不足"
@@ -263,6 +291,11 @@
msgid "Record created"
msgstr "成功建立记录."
+#: share/web/templates/__jifty/halo:69
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr "页面绘制时间: %1 秒"
+
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
msgstr "执行动作"
@@ -303,7 +336,7 @@
msgid "The passwords you typed didn't match each other"
msgstr "两组口令不匹配."
-#: lib/Jifty/Web.pm:362
+#: lib/Jifty/Web.pm:363
msgid "There was an error completing the request. Please try again later."
msgstr "系统执行错误, 请稍候再试."
@@ -327,6 +360,10 @@
msgid "Updated"
msgstr "成功更新项目."
+#: share/web/templates/__jifty/halo:93
+msgid "Variables"
+msgstr "变項"
+
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
msgstr "欢迎光临您的崭新的 Jifty 应用程序"
@@ -355,3 +392,11 @@
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
msgstr "降序"
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr "连结文字"
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr "隐藏连结文字"
Modified: jifty/branches/virtual-models/share/po/zh_tw.po
==============================================================================
--- jifty/branches/virtual-models/share/po/zh_tw.po (original)
+++ jifty/branches/virtual-models/share/po/zh_tw.po Sat Feb 10 19:52:40 2007
@@ -36,7 +36,7 @@
#: share/web/templates/__jifty/admin/fragments/list/list:87
#. ($collection-> count)
msgid "%1 entries"
-msgstr ""
+msgstr "共 %1 筆"
#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
@@ -93,7 +93,7 @@
msgid "(any)"
msgstr "(不限)"
-#: lib/Jifty/Web/Form/Field.pm:549
+#: lib/Jifty/Web/Form/.Field.pm.swp:44 lib/Jifty/Web/Form/Field.pm:549
msgid "@{[$self->current_value]}"
msgstr ""
@@ -101,6 +101,10 @@
msgid "Actions"
msgstr "操作"
+#: share/web/templates/_elements/nav:5
+msgid "Administration"
+msgstr "管理介面"
+
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
msgstr "系統管理模式開啟中."
@@ -119,12 +123,16 @@
#: share/web/templates/__jifty/admin/action/dhandler:25 share/web/templates/__jifty/admin/model/dhandler:21
msgid "Back to the admin console"
-msgstr "回到管理界面"
+msgstr "回到管理介面"
#: share/web/templates/__jifty/admin/index.html:29
msgid "Back to the application"
msgstr "回到應用程式"
+#: share/web/templates/__jifty/halo:117
+msgid "Bindings"
+msgstr "快速鍵"
+
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
@@ -134,13 +142,17 @@
msgid "Cancel"
msgstr "取消"
+#: share/web/templates/__jifty/halo:81
+msgid "Children"
+msgstr "子元件"
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "關閉視窗"
#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
-msgstr "確定要刪除?"
+msgstr "是否確定刪除?"
#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
@@ -173,9 +185,9 @@
#: share/web/templates/__jifty/admin/index.html:28 share/web/templates/__jifty/admin/model/dhandler:20
msgid "Done?"
-msgstr "已完成？"
+msgstr "設定完畢?"
-#: share/web/templates/__jifty/admin/fragments/list/view:40
+#: share/web/templates/__jifty/admin/fragments/list/view:40 share/web/templates/__jifty/halo:20
msgid "Edit"
msgstr "編輯"
@@ -193,6 +205,10 @@
msgid "Hiya, %1."
msgstr "%1 您好."
+#: share/web/templates/_elements/nav:3
+msgid "Home"
+msgstr "首頁"
+
#: share/web/templates/__jifty/admin/index.html:1
msgid "Jifty Administrative Console"
msgstr "Jifty 管理介面"
@@ -238,7 +254,7 @@
msgid "No items found"
msgstr "未找到記錄"
-#: lib/Jifty/Web.pm:299
+#: lib/Jifty/Web.pm:300
msgid "No request to handle"
msgstr "沒有可處理的要求"
@@ -246,12 +262,24 @@
msgid "Online Documentation"
msgstr "線上文件"
+#: share/web/templates/_elements/nav:6
+msgid "Online docs"
+msgstr "線上文件"
+
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "第 %1 頁, 共 %2 頁"
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
+#: share/web/templates/__jifty/halo:1
+msgid "Page info"
+msgstr "頁面資訊"
+
+#: share/web/templates/__jifty/halo:72
+msgid "Parent"
+msgstr "上層元件"
+
+#: lib/Jifty/Record.pm:264 lib/Jifty/Record.pm:343 lib/Jifty/Record.pm:68
msgid "Permission denied"
msgstr "權限不足."
@@ -263,6 +291,11 @@
msgid "Record created"
msgstr "成功建立項目."
+#: share/web/templates/__jifty/halo:69
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr "頁面繪製時間: %1 秒"
+
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
msgstr "執行動作"
@@ -303,17 +336,17 @@
msgid "The passwords you typed didn't match each other"
msgstr "兩組密碼不符合."
-#: lib/Jifty/Web.pm:362
+#: lib/Jifty/Web.pm:363
msgid "There was an error completing the request. Please try again later."
msgstr "系統執行錯誤, 請稍候再試."
#: share/web/templates/__jifty/admin/index.html:5
msgid "This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records."
-msgstr "您可利用此界面來管理資料庫的內容. 請點選表格名稱, 進行增刪及編輯."
+msgstr "您可利用此介面來管理資料庫的內容. 請點選表格名稱, 進行增刪及編輯."
#: share/web/templates/__jifty/admin/index.html:7
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
-msgstr "如欲停用管理界面, 請在設定檔 (etc/config.yml) 的 \"framework:\" 設定內加上 \"AdminMode: 0\" 即可."
+msgstr "如欲停用管理介面, 請在設定檔 (etc/config.yml) 的 \"framework:\" 設定內加上 \"AdminMode: 0\" 即可."
#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
@@ -327,6 +360,10 @@
msgid "Updated"
msgstr "成功更新項目."
+#: share/web/templates/__jifty/halo:93
+msgid "Variables"
+msgstr "變數"
+
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
msgstr "歡迎光臨您嶄新的 Jifty 應用程式"
@@ -355,3 +392,11 @@
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
msgstr "降冪"
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr "連結文字"
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr "隱藏連結文字"
Modified: jifty/branches/virtual-models/share/web/templates/__jifty/halo
==============================================================================
--- jifty/branches/virtual-models/share/web/templates/__jifty/halo (original)
+++ jifty/branches/virtual-models/share/web/templates/__jifty/halo Sat Feb 10 19:52:40 2007
@@ -1,4 +1,4 @@
-<div><a href="#" id="render_info" onclick="Element.toggle('render_info_tree'); return false">Page info</a></div>
+<div><a href="#" id="render_info" onclick="Element.toggle('render_info_tree'); return false"><%_('Page info')%></a></div>
<div style="display: none" id="render_info_tree">
% foreach my $item (@stack) {
% if ( $item->{depth} > $depth ) {
@@ -17,7 +17,7 @@
onclick="halo_toggle('<% $item->{id} %>'); return false;">
<% $item->{'name'} %> - <% $item->{'render_time'} %></a>
% unless ($item->{subcomponent}) {
-<% Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$item->{'path'}, label => 'Edit') %>
+<% Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$item->{'path'}, label => _('Edit')) %>
% }
% $depth = $item->{'depth'};
% }
@@ -66,10 +66,10 @@
<div class="body">
<div class="path"><% $frame->{path} %></div>
-<div class="time">Rendered in <% $frame->{'render_time'} %>s</div>
+<div class="time"><%_('Rendered in %1s', $frame->{'render_time'})%></div>
</div>
% if ($frame->{parent}) {
-<div class="section">Parent</div>
+<div class="section"><%_('Parent')%></div>
<div class="body"><ul>
<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $frame->{parent}{id} %>')"
onmouseout="halo_out('<% $frame->{parent}{id} %>')"
@@ -78,7 +78,7 @@
</ul></div>
% }
% if (@{$frame->{kids}}) {
-<div class="section">Children</div>
+<div class="section"><%_('Children')%></div>
<div class="body"><ul>
% for my $item (@{$frame->{kids}}) {
<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $item->{id} %>')"
@@ -90,7 +90,7 @@
</div>
% }
% if (@args) {
-<div class="section">Variables</div>
+<div class="section"><%_('Variables')%></div>
<div class="body"><ul class="fixed">
% for my $e (@args) {
<li><b><% $e->[0] %></b>:
@@ -114,7 +114,7 @@
<li>
<span class="fixed"><% $_->[1] %></span><br />
% if (@{$_->[2]}) {
-<b>Bindings:</b> <tt><% join(',', map {defined $_ ? ($_ =~ /[^[:space:][:graph:]]/ ? "*BLOB*" : $_ ) : "undef"} @{$_->[2]}) %></tt><br />
+<b><%_('Bindings')%>:</b> <tt><% join(',', map {defined $_ ? ($_ =~ /[^[:space:][:graph:]]/ ? "*BLOB*" : $_ ) : "undef"} @{$_->[2]}) %></tt><br />
% }
<i><% _('%1 seconds', $_->[3]) %></i>
</li>
@@ -123,7 +123,7 @@
% }
<div class="section">
% unless ($frame->{subcomponent}) {
-<% Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$frame->{'path'}, label => 'Edit') %>
+<% Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$frame->{'path'}, label => _('Edit')) %>
% } else {
% }
Modified: jifty/branches/virtual-models/share/web/templates/_elements/nav
==============================================================================
--- jifty/branches/virtual-models/share/web/templates/_elements/nav (original)
+++ jifty/branches/virtual-models/share/web/templates/_elements/nav Sat Feb 10 19:52:40 2007
@@ -1,9 +1,9 @@
<%init>
my $top = Jifty->web->navigation;
-$top->child(Home => url => "/", sort_order => 1);
+$top->child(Home => label => _('Home'), url => "/", sort_order => 1);
if (Jifty->config->framework('AdminMode') ) {
- $top->child(Administration => url => "/__jifty/admin/", sort_order => 998);
- $top->child(OnlineDocs => url => "/__jifty/online_docs/", label => 'Online docs', sort_order => 999);
+ $top->child(Administration => url => "/__jifty/admin/", label => _('Administration'), sort_order => 998);
+ $top->child(OnlineDocs => url => "/__jifty/online_docs/", label => _('Online docs'), sort_order => 999);
}
return();
</%init>
More information about the Jifty-commit
mailing list