[Jifty-commit] r2438 - in jifty/branches/template-declare: . bin
debian examples/MyWeblog/etc lib/Jifty/Manual
lib/Jifty/Script lib/Jifty/Web/Form share/po
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Dec 30 00:43:38 EST 2006
Author: jesse
Date: Sat Dec 30 00:43:37 2006
New Revision: 2438
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/MANIFEST
jifty/branches/template-declare/bin/jifty
jifty/branches/template-declare/debian/README
jifty/branches/template-declare/debian/control
jifty/branches/template-declare/examples/MyWeblog/etc/config.yml
jifty/branches/template-declare/lib/Jifty/Manual/Continuations.pod
jifty/branches/template-declare/lib/Jifty/Manual/Cookbook.pod
jifty/branches/template-declare/lib/Jifty/Manual/Tutorial.pod
jifty/branches/template-declare/lib/Jifty/Script/Po.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Button.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Radio.pm
jifty/branches/template-declare/share/po/ja.po
Log:
Mergedown from trunk
r46377 at pinglin (orig r2416): ishigaki | 2006-12-20 23:42:52 -0500
Jifty::Script::Po: shouldn't update other catalogs if we specify target language with -l
r46378 at pinglin (orig r2417): ishigaki | 2006-12-21 00:49:50 -0500
updated share/po/ja.po (seemingly I committed not-yet-saved po file before...sorry)
r46404 at pinglin (orig r2420): yves | 2006-12-22 10:11:50 -0500
debian packaging
r46413 at pinglin (orig r2422): agentz | 2006-12-22 21:01:47 -0500
reverted an incorrect typo fix.
r46512 at pinglin (orig r2427): jesse | 2006-12-26 23:40:28 -0500
r46510 at pinglin: jesse | 2006-12-26 23:39:58 -0500
* Cookbook typo fixed. thanks to tokuhirom
r46522 at pinglin (orig r2428): jesse | 2006-12-27 01:42:10 -0500
r46521 at pinglin: jesse | 2006-12-27 01:41:51 -0500
* Typo fix in the tutorial from Tokuhiro Matsuno tokuhirom at mobilefactory.jp (prev commit)
r46534 at pinglin (orig r2429): falcone | 2006-12-27 11:28:12 -0500
r14847 at ketch: falcone | 2006-11-30 18:03:45 -0500
* we're always setting the timezone to the user's timezone, even if
new is explicitly called with a timezone. This breaks DateTime->from_epoch
which wants data back in UTC
r46535 at pinglin (orig r2430): falcone | 2006-12-27 11:29:26 -0500
r15372 at ketch: falcone | 2006-12-27 11:25:21 -0500
* Jifty::Param::Schema allows "hints are 'type stuff'" but our Model syntax
uses 'are' to build an arrayref, so "hints are 'type stuff'" in a model would
result in displaying ARRAY(0x123456).
This lets you avoid saying "hints is "type stuff'"
r46551 at pinglin (orig r2433): agentz | 2006-12-27 22:35:58 -0500
[Jifty::Manual::Cookbook]
- applied the "edit" link patch from Peter Wise.
(changed the wording a bit.)
r46552 at pinglin (orig r2434): agentz | 2006-12-27 22:44:44 -0500
Cookbook, minor adjustments.
r46562 at pinglin (orig r2435): alexmv | 2006-12-29 12:00:01 -0500
r15140 at zoq-fot-pik: chmrr | 2006-12-29 11:59:58 -0500
* Clean up MANIFEST (mostly sqlite files)
r46563 at pinglin (orig r2436): alexmv | 2006-12-29 12:25:06 -0500
r15145 at zoq-fot-pik: chmrr | 2006-12-29 12:25:05 -0500
* Need to be able to set an empty hint (which is false!)
r46570 at pinglin (orig r2437): jesse | 2006-12-30 00:39:15 -0500
r46569 at pinglin: jesse | 2006-12-30 00:38:23 -0500
* bin/jifty covered sigterm in a way that could cause zombie processes uner fastcgi
Modified: jifty/branches/template-declare/MANIFEST
==============================================================================
--- jifty/branches/template-declare/MANIFEST (original)
+++ jifty/branches/template-declare/MANIFEST Sat Dec 30 00:43:37 2006
@@ -35,20 +35,17 @@
etc/config.yml
etc/site_config.yml
examples/Chat/bin/jifty
-examples/Chat/chat
examples/Chat/etc/config.yml
examples/Chat/lib/Chat/Action/Send.pm
examples/Chat/lib/Chat/Event/Message.pm
examples/Chat/lib/Chat/Server.pm
examples/Chat/Makefile.PL
-examples/Chat/rwhat
examples/Chat/share/web/templates/fragments/message
examples/Chat/share/web/templates/fragments/sender
examples/Chat/share/web/templates/index.html
examples/Chat/t/00compile.t
examples/Chat/t/01startup.t
examples/Clock/bin/jifty
-examples/Clock/clock
examples/Clock/clockserv.pl
examples/Clock/etc/config.yml
examples/Clock/lib/Clock/Event/Tick.pm
@@ -81,7 +78,6 @@
inc/Module/Install/Share.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
-jifty_trunktest
lib/Email/Send/Jifty/Test.pm
lib/Jifty.pm
lib/Jifty/Action.pm
@@ -491,7 +487,6 @@
t/TestApp-Plugin-REST/t/00-prototype.t
t/TestApp-Plugin-REST/t/01-config.t
t/TestApp-Plugin-REST/t/02-basic-use.t
-t/TestApp-Plugin-REST/testapp_plugin_rest
t/TestApp/bin/jifty
t/TestApp/lib/TestApp/Action/DoSomething.pm
t/TestApp/lib/TestApp/CurrentUser.pm
@@ -525,4 +520,3 @@
t/TestApp/t/config-Record
t/TestApp/t/instance_id.t
t/TestApp/t/regex_meta_in_path_info.t
-t/TestApp/testapp
Modified: jifty/branches/template-declare/bin/jifty
==============================================================================
--- jifty/branches/template-declare/bin/jifty (original)
+++ jifty/branches/template-declare/bin/jifty Sat Dec 30 00:43:37 2006
@@ -11,5 +11,5 @@
}
use Jifty::Script;
-$SIG{INT} = $SIG{TERM} = sub { warn "Stopped\n"; exit; };
+local $SIG{INT} = sub { warn "Stopped\n"; exit; };
Jifty::Script->dispatch();
Modified: jifty/branches/template-declare/debian/README
==============================================================================
--- jifty/branches/template-declare/debian/README (original)
+++ jifty/branches/template-declare/debian/README Sat Dec 30 00:43:37 2006
@@ -2,7 +2,7 @@
There is a debian repository at:
- deb http://ftp.univ-metz.fr/debian sarge jifty
+ deb http://debian.jifty.org/debian sarge jifty
It contains jifty packages as well as some jifty plugins, updates for
sarge and ubuntu 6.06 LTS
Modified: jifty/branches/template-declare/debian/control
==============================================================================
--- jifty/branches/template-declare/debian/control (original)
+++ jifty/branches/template-declare/debian/control Sat Dec 30 00:43:37 2006
@@ -52,8 +52,8 @@
libclass-container-perl, libclass-data-inheritable-perl,
perl-modules, libcgi-cookie-splitter-perl,
libcrypt-cbc-perl, libcrypt-rijndael-perl,
- libcompress-zlib-perl, libcss-squish-perl (>>
- 0.05), libdbd-sqlite3-perl, libdata-page-perl,
+ libcompress-zlib-perl, libcss-squish-perl (>> 0.05),
+ libdbd-sqlite3-perl, libdata-page-perl,
libdatetime-perl, libdate-manip-perl, libemail-folder-perl,
libemail-localdelivery-perl, libemail-mime-perl,
libemail-mime-creator-perl, libemail-mime-contenttype-perl,
@@ -61,11 +61,10 @@
libemail-simple-creator-perl, libexporter-lite-perl,
libfile-find-rule-perl, libfile-mmagic-perl,
libfile-sharedir-perl (>> 0.04), libhtml-parser-perl,
- libhtml-lint-perl, libhtml-mason-perl (>>
- 1.3101), libwww-perl, libhttp-server-simple-perl
- (>> 0.20), libhttp-server-simple-recorder-perl,
- libhash-merge-perl, libhook-lexwrap-perl,
- libipc-pubsub-perl (>> 0.11), libjifty-dbi-perl (>> 0.29),
+ libhtml-lint-perl, libhtml-mason-perl (>> 1.3101),
+ libwww-perl, libhttp-server-simple-perl (>> 0.20),
+ libhttp-server-simple-recorder-perl, libhash-merge-perl, libhook-lexwrap-perl,
+ libipc-pubsub-perl (>> 0.22), libjifty-dbi-perl (>> 0.29),
liblocale-maketext-lexicon-perl, liblog-log4perl-perl,
libmime-types-perl, libmodule-pluggable-perl (>> 2.95),
libmodule-corelist-perl, libmodule-refresh-perl,
@@ -74,15 +73,17 @@
libstring-koremutake-perl, libsql-reservedwords-perl,
libtest-base-perl, libuniversal-require-perl, liburi-perl,
libxml-writer-perl (>> 0.601), libxml-simple-perl,
- libxml-xpath-perl, libversion-perl, libyaml-syck-perl (>>
- 0.71), libyaml-perl (>> 0.35), libjson-perl (>> 0.01),
- libpod-simple-perl
+ libxml-xpath-perl, libversion-perl, libyaml-syck-perl (>> 0.71),
+ libyaml-perl (>> 0.35), libjson-perl (>> 0.01),
+ libpod-simple-perl,
+ libsub-exporter-perl, libcache-memcached-perl liblog-dispatch-perl
Recommends: libmodule-install-perl,
- libtest-pod-coverage-perl, libtest-www-mechanize-perl
- (>> 1.04), libwww-mechanize-perl (>> 1.12),
+ libtest-pod-coverage-perl, libtest-www-mechanize-perl (>> 1.04), libwww-mechanize-perl (>> 1.12),
libclass-accessor-named-perl, libdevel-cover-perl,
libmodule-install-perl, libpar-dist-fromcpan-perl, libtest-mockobject-perl,
- libtest-mockmodule-perl
+ libtest-mockmodule-perl,
+ libcgi-fast-perl, libapache-mod-fastcgi,
+ libjifty-plugin-editinplace-perl, libjifty-plugin-login-perl
Description: Jifty perl libraries
Yet another web framework.
.
Modified: jifty/branches/template-declare/examples/MyWeblog/etc/config.yml
==============================================================================
--- jifty/branches/template-declare/examples/MyWeblog/etc/config.yml (original)
+++ jifty/branches/template-declare/examples/MyWeblog/etc/config.yml Sat Dec 30 00:43:37 2006
@@ -11,7 +11,7 @@
Password: ''
RecordBaseClass: Jifty::DBI::Record::Cachable
User: ''
- Version: 0.0.1
+ Version: 0.0.3
DevelMode: 1
L10N:
PoDir: share/po
@@ -19,7 +19,8 @@
Mailer: Sendmail
MailerArgs: []
- Plugins: []
+ Plugins:
+ - Login: {}
PubSub:
Backend: Memcached
Modified: jifty/branches/template-declare/lib/Jifty/Manual/Continuations.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/Continuations.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/Continuations.pod Sat Dec 30 00:43:37 2006
@@ -10,7 +10,7 @@
that state at any later time, by calling the continuation with, and
evaluation of that interpreter state will resume. They're a concept
that first arose in LISP, but has implementations these days in Ruby,
-Scheme, Haskell, Smalltalk (just to name a few).
+Scheme, Haskell, Smalltalk, to name a few.
Thus, continuations allow you to preserve context, and return to it
later. This is amazingly useful in web programming, which is limited
Modified: jifty/branches/template-declare/lib/Jifty/Manual/Cookbook.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/Cookbook.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/Cookbook.pod Sat Dec 30 00:43:37 2006
@@ -50,7 +50,7 @@
show('/feed');
};
-And of course, you need to put these in your HTML header tempalte
+And of course, you need to put these in your HTML header template
(conventionally that's C</_elements/header>):
<link rel="alternate" type="application/atom+xml" title="Atom" href="/feed/atom" />
@@ -224,3 +224,36 @@
field is changed.
Of course, you can apply the same trick to your own Action classes.
+
+=head2 Get the "Edit" links to work in the "Page info" tool
+
+If you click on "Page info", follow an "Edit" link for a fragment,
+and you get an error message saying something like
+
+ You got to a page that we don't think exists...
+
+then you need to ensure that the C<Jifty::Plugin::EditInPlace> has
+been installed correctly. It should be in the F<Jifty/Plugin> directory
+installed with the rest of the Jifty modules.
+
+ perl -MJifty::Util -e 'print Jifty::Util->jifty_root'
+
+will tell you where to look. If it's not there you will need to install
+it manually. If you still have your build files from installing Jifty
+you can find the module in the F<plugins> directory.
+
+Once you have the modules in place, or if they were already present
+you simply need to enable the plugin in your project config file. Edit
+F<etc/config.yml> and find the "Plugins:" section. It will probably look
+like this
+
+ Plugins: []
+
+Change it to
+
+ Plugins:
+ - EditInPlace: {}
+
+Take care the indentation is significant. Use spaces, not tabs.
+Once you have done that you can restart your Jifty application and the
+edit links should then function correctly.
Modified: jifty/branches/template-declare/lib/Jifty/Manual/Tutorial.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/Tutorial.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/Tutorial.pod Sat Dec 30 00:43:37 2006
@@ -118,12 +118,11 @@
=item share/web/templates
Jifty uses L<HTML::Mason> as its primary templating system. Put
-your application's templates into F<share/web/templates/>. Out of the
-box, Jifty comes with an application I<skeleton> that it installs in
-F<share/web/templates/>. This default application is
-a convenient way to get a basic application up and running quickly,
-but probably needs some customization as you build a more advanced
-application.
+your application's templates into F<share/web/templates/>. Out of
+the box, Jifty comes with an application I<skeleton> that it installs
+in F<share/web/templates/>. This default application is a convenient
+way to get a basic application up and running quickly, but probably
+needs some customization as you build a more advanced application.
You can find where Perl stuck Jifty's default templates with:
Modified: jifty/branches/template-declare/lib/Jifty/Script/Po.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Script/Po.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Script/Po.pm Sat Dec 30 00:43:37 2006
@@ -80,14 +80,15 @@
$self->extract_messages();
my @catalogs = File::Find::Rule->file->in(
Jifty->config->framework('L10N')->{'PoDir'} );
- foreach my $catalog (@catalogs) {
- next if $catalog =~ m{(^|/)\.svn/};
- $self->update_catalog( $catalog );
- }
if ($self->{'language'}) {
$self->update_catalog( File::Spec->catfile( Jifty->config->framework('L10N')->{'PoDir'}, $self->{'language'} . ".po"));
}
-
+ else {
+ foreach my $catalog (@catalogs) {
+ next if $catalog =~ m{(^|/)\.svn/};
+ $self->update_catalog( $catalog );
+ }
+ }
}
=head2 update_catalog FILENAME
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm Sat Dec 30 00:43:37 2006
@@ -244,6 +244,24 @@
}
+=head2 hints [VALUE]
+
+Hints for the user to explain this field
+
+=cut
+
+sub hints {
+ my $self = shift;
+ return $self->_hints_accessor unless @_;
+
+ my $hint = shift;
+ # people sometimes say hints are "foo" rather than hints is "foo"
+ if (ref $hint eq 'ARRAY') {
+ $hint = shift @$hint;
+ }
+ return $self->_hints_accessor($hint);
+}
+
=head2 element_id
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Button.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Button.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Button.pm Sat Dec 30 00:43:37 2006
@@ -6,6 +6,19 @@
use base qw/Jifty::Web::Form::Field/;
__PACKAGE__->mk_accessors(qw/button_as_link/);
+
+=head1 NAME
+
+Jifty::Web::Form::Field::Button
+
+=cut
+
+=head1 SUMMARY
+
+L<Jifty::Web::Form::Field::Button/> is a L<Jifty::Web::Form::Field>
+
+=head1 METHODS
+
=head2 accessors
Provide the C<button_as_link> accessor (in addition to
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Radio.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Radio.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Radio.pm Sat Dec 30 00:43:37 2006
@@ -47,6 +47,7 @@
my $display = $opt->{'display'};
my $value = defined $opt->{'value'} ? $opt->{'value'} : '';
+
my $id = $self->element_id . "-" . $value;
$id =~ s/\s+/_/;
my $field = qq! <input type="radio" !;
@@ -60,6 +61,8 @@
$field .= qq! /><label for="@{[ $id ]}"!;
$field .= $self->_widget_class;
$field .= qq!>$display</label>\n!;
+ $field = qq{<span class="radiooption">$field</span>};
+
Jifty->web->out($field);
'';
}
Modified: jifty/branches/template-declare/share/po/ja.po
==============================================================================
--- jifty/branches/template-declare/share/po/ja.po (original)
+++ jifty/branches/template-declare/share/po/ja.po Sat Dec 30 00:43:37 2006
@@ -9,90 +9,90 @@
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Last-Translator: Kenichi Ishigaki <ishigaki at tcool.org>\n"
+"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: lib/Jifty/Action/Record/Search.pm:125
msgid "!=>< allowed"
-msgstr ""
+msgstr "! = > < は利用できません"
#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
-msgstr ""
+msgstr "%1 より後"
#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
-msgstr ""
+msgstr "%1 より前"
#: lib/Jifty/Action/Record/Search.pm:112
#. ($label)
msgid "%1 contains"
-msgstr ""
+msgstr "%1 を含む"
#: 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)
msgid "%1 greater or equal to"
-msgstr ""
+msgstr "%1 と同じかそれ以上"
#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
-msgstr ""
+msgstr "%1 より大きい"
#: lib/Jifty/Action/Record/Search.pm:108
#. ($label)
msgid "%1 is not"
-msgstr ""
+msgstr "%1 以外"
#: lib/Jifty/Action/Record/Search.pm:113
#. ($label)
msgid "%1 lacks"
-msgstr ""
+msgstr "%1 を含まない"
#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
-msgstr ""
+msgstr "%1 と同じかそれ以下"
#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
-msgstr ""
+msgstr "%1 より小さい"
#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
#. ($file, $line)
msgid "%1 line %2"
-msgstr ""
+msgstr "%1 %2行目"
#: share/web/templates/__jifty/halo:119
#. ($_->[3])
msgid "%1 seconds"
-msgstr ""
+msgstr "%1 秒"
#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
-msgstr ""
+msgstr "%1 と同じかそれ以降"
#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
-msgstr ""
+msgstr "%1 と同じかそれ以前"
#: lib/Jifty/Action/Record/Search.pm:77
msgid "(any)"
-msgstr ""
+msgstr "（指定なし）"
#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
@@ -100,234 +100,234 @@
#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
-msgstr ""
+msgstr "操作"
#: share/web/templates/_elements/wrapper:11
msgid "Administration mode is enabled."
-msgstr ""
+msgstr "管理モードが有効になっています"
#: share/web/templates/_elements/wrapper:11
msgid "Alert"
-msgstr ""
+msgstr "注意"
#: lib/Jifty/Action/Record/Create.pm:82
msgid "An error occurred. Try again later"
-msgstr ""
+msgstr "エラーが発生しました。しばらく待ってから再度試してみてください"
#: lib/Jifty/Action/Record/Search.pm:129
msgid "Any field contains"
-msgstr ""
+msgstr "検索したい文字列"
#: share/web/templates/__jifty/admin/action/dhandler:25 share/web/templates/__jifty/admin/model/dhandler:20
msgid "Back to the admin console"
-msgstr ""
+msgstr "管理画面に戻る"
#: share/web/templates/__jifty/admin/index.html:29
msgid "Back to the application"
-msgstr ""
+msgstr "アプリケーションに戻る"
#: share/web/templates/helpers/calendar.html:4
#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
-msgstr ""
+msgstr "カレンダー"
#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
-msgstr ""
+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"
-msgstr ""
+msgstr "作成"
#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
msgid "Create of %1 failed: %2"
-msgstr ""
+msgstr "%1 の作成に失敗しました: %2"
#: lib/Jifty/Action/Record/Create.pm:105
msgid "Created"
-msgstr ""
+msgstr "作成しました"
#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
-msgstr ""
+msgstr "データベース管理"
#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
-msgstr ""
+msgstr "削除"
#: lib/Jifty/Action/Record/Delete.pm:76
msgid "Deleted"
-msgstr ""
+msgstr "削除しました"
#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
-msgstr ""
+msgstr "編集"
#: lib/Jifty/Mason/Halo.pm:104
#. ($comp_name)
msgid "Edit %1"
-msgstr ""
+msgstr "%1 を編集"
#: share/web/templates/dhandler:7
msgid "Go back home..."
-msgstr ""
+msgstr "ホームページに戻ります…"
#: share/web/templates/_elements/sidebar:5
#. ($u->$method()
msgid "Hiya, %1."
-msgstr ""
+msgstr "%1 さん、こんにちは"
#: share/web/templates/__jifty/online_docs/toc.html:6
msgid "Jifty Developer Documentation Online"
-msgstr ""
+msgstr "開発者向けオンラインドキュメント"
#: share/web/templates/__jifty/online_docs/content.html:6
msgid "Jifty Pod Online"
-msgstr ""
+msgstr "オンラインドキュメント"
#: share/web/templates/_elements/wrapper:18
msgid "Loading..."
-msgstr ""
+msgstr "読込み中…"
#: share/web/templates/__jifty/error/mason_internal_error:1
msgid "Mason error"
-msgstr ""
+msgstr "Mason エラー"
#: share/web/templates/__jifty/admin/index.html:9
msgid "Models"
-msgstr ""
+msgstr "モデル"
#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
-msgstr ""
+msgstr "次のページ"
#: lib/Jifty/Action/Record/Search.pm:130
msgid "No field contains"
-msgstr ""
+msgstr "排除したい文字列"
#: share/web/templates/__jifty/admin/fragments/list/list:85
msgid "No items found"
-msgstr ""
+msgstr "見つかりませんでした"
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
-msgstr ""
+msgstr "処理できるリクエストがありません"
#: share/web/templates/__jifty/online_docs/index.html:5
msgid "Online Documentation"
-msgstr ""
+msgstr "オンラインドキュメント"
#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
-msgstr ""
+msgstr "%1 / %2 ページ"
#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
-msgstr ""
+msgstr "権限がありません"
#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
-msgstr ""
+msgstr "前のページ"
#: share/web/templates/__jifty/admin/action/dhandler:20
msgid "Run the action"
-msgstr ""
+msgstr "実行"
#: share/web/templates/__jifty/halo:111
msgid "SQL Statements"
-msgstr ""
+msgstr "SQL文"
#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
-msgstr ""
+msgstr "保存"
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
-msgstr ""
+msgstr "スキーマ"
#: share/web/templates/__jifty/admin/fragments/list/search:18
msgid "Search"
-msgstr ""
+msgstr "検索"
#: share/web/templates/dhandler:1
msgid "Something's not quite right"
-msgstr ""
+msgstr "原因不明のエラーです"
#: share/web/templates/__jifty/online_docs/index.html:16 share/web/templates/__jifty/online_docs/index.html:18
msgid "Table of Contents"
-msgstr ""
+msgstr "目次"
#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
-msgstr ""
+msgstr "値が不適切なようです"
-#: lib/Jifty/Action/Record.pm:247
+#: lib/Jifty/Action/Record.pm:246
msgid "That doesn't look right, but I don't know why"
-msgstr ""
+msgstr "原因不明のエラーです"
-#: lib/Jifty/Action/Record.pm:179
+#: lib/Jifty/Action/Record.pm:178
msgid "The passwords you typed didn't match each other"
-msgstr ""
+msgstr "パスワードが一致しません"
#: lib/Jifty/Web.pm:360
msgid "There was an error completing the request. Please try again later."
-msgstr ""
+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 "ここでは Jifty データベースのレコードを管理できます。下にデータベースの全テーブルが一覧されているはずですので、自由に表示・作成・削除・修正してください。"
#: 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 ""
+msgstr "この管理画面を無効にするには、設定ファイル（etc/config.yml）の \"framework:\" の項目の下に \"AdminMode: 0\" を追加してください。"
#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
-msgstr ""
+msgstr "検索の切り替え"
#: share/web/templates/__jifty/error/mason_internal_error:6
msgid "Try again"
-msgstr ""
+msgstr "再度試してみてください"
#: lib/Jifty/Action/Record/Update.pm:156
msgid "Updated"
-msgstr ""
+msgstr "更新しました"
#: share/web/templates/index.html:1
msgid "Welcome to your new Jifty application"
-msgstr ""
+msgstr "Jifty の新規アプリケーションです"
#: share/web/templates/dhandler:5
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
-msgstr ""
+msgstr "このページは存在しません。エラーとして記録しておきました。ご不便をお詫びいたします"
#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
-msgstr ""
+msgstr "必須項目です"
#: share/web/templates/index.html:3
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
-msgstr ""
+msgstr "こんなのが欲しかったんでしょう？（出典：%1）"
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
-msgstr ""
+msgstr "ログインしていません"
#: share/web/templates/__jifty/admin/fragments/list/header:22
msgid "asc"
-msgstr ""
+msgstr "昇順"
#: share/web/templates/__jifty/admin/fragments/list/header:41
msgid "desc"
-msgstr ""
+msgstr "降順"
More information about the Jifty-commit
mailing list