[Jifty-commit] r2235 - in jifty/branches/template-declare: .
lib/Jifty lib/Jifty/Action/Record
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Nov 30 21:48:33 EST 2006
Author: audreyt
Date: Thu Nov 30 21:48:33 2006
New Revision: 2235
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/lib/Jifty/Action/Record/Search.pm
jifty/branches/template-declare/lib/Jifty/Web.pm
jifty/branches/template-declare/share/po/en.po
jifty/branches/template-declare/share/po/fr.po
jifty/branches/template-declare/share/po/ja.po
jifty/branches/template-declare/share/po/zh_cn.po
jifty/branches/template-declare/share/po/zh_tw.po
Log:
* mergedown to t-d branch again
Modified: jifty/branches/template-declare/lib/Jifty/Action/Record/Search.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action/Record/Search.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Action/Record/Search.pm Thu Nov 30 21:48:33 2006
@@ -86,24 +86,24 @@
next if($field =~ /^(.*)_id$/ && $self->record->column($1));
my $label = $info->{label} || $field;
- $args->{"${field}_not"} = {%$info, label => "$label is not"};
+ $args->{"${field}_not"} = { %$info, label => _("%1 is not", $label) };
my $type = lc($column->type);
if($type =~ /(?:text|char)/) {
$info->{render_as} = 'text';
- $args->{"${field}_contains"} = {%$info, label => "$label contains"};
- $args->{"${field}_lacks"} = {%$info, label => "$label lacks"};
+ $args->{"${field}_contains"} = { %$info, label => _("%1 contains", $label) };
+ $args->{"${field}_lacks"} = { %$info, label => _("%1 lacks", $label) };
} elsif($type =~ /(?:date|time)/) {
- $args->{"${field}_after"} = {%$info, label => "$label after"};
- $args->{"${field}_before"} = {%$info, label => "$label before"};
+ $args->{"${field}_after"} = { %$info, label => _("%1 after", $label) };
+ $args->{"${field}_before"} = { %$info, label => _("%1 before", $label) };
} elsif( $type =~ /(?:int|float|double)/
&& !$column->refers_to) {
- $args->{"${field}_gt"} = {%$info, label => "$label greater than"};
- $args->{"${field}_lt"} = {%$info, label => "$label less than"};
+ $args->{"${field}_gt"} = { %$info, label => _("%1 greater than", $label) };
+ $args->{"${field}_lt"} = { %$info, label => _("%1 less than", $label) };
}
}
- $args->{contains} = {type => 'text', label => 'Any field contains'};
- $args->{lacks} = {type => 'text', label => 'No field contains'};
+ $args->{contains} = { type => 'text', label => _('Any field contains') };
+ $args->{lacks} = { type => 'text', label => _('No field contains') };
return $self->_cached_arguments($args);
}
Modified: jifty/branches/template-declare/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web.pm Thu Nov 30 21:48:33 2006
@@ -601,7 +601,7 @@
# To submit a Jifty::Action::Redirect, we don't need to serialize a continuation,
# unlike any other kind of actions.
if ( (grep { not $_->action_class->isa('Jifty::Action::Redirect') }
- values %{{ $self->response->results }})
+ values %{ { $self->response->results } })
or $self->request->state_variables
or $self->{'state_variables'}
or $self->request->continuation
Modified: jifty/branches/template-declare/share/po/en.po
==============================================================================
--- jifty/branches/template-declare/share/po/en.po (original)
+++ jifty/branches/template-declare/share/po/en.po Thu Nov 30 21:48:33 2006
@@ -15,8 +15,39 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/Jifty/Web.pm:572 lib/Jifty/Web.pm~:572
-msgid " $self->response->results "
+#: lib/Jifty/Action/Record/Search.pm:96
+#. ($label)
+msgid "%1 after"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:97
+#. ($label)
+msgid "%1 before"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:93
+#. ($label)
+msgid "%1 contains"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:100
+#. ($label)
+msgid "%1 greater than"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:89
+#. ($label)
+msgid "%1 is not"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:94
+#. ($label)
+msgid "%1 lacks"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:101
+#. ($label)
+msgid "%1 less than"
msgstr ""
#: share/web/templates/__jifty/halo:119
@@ -24,7 +55,11 @@
msgid "%1 seconds"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:49
+#: lib/Jifty/Web/Form/Field.pm:517
+msgid "@{[$self->current_value]}"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
msgstr ""
@@ -36,35 +71,43 @@
msgid "Alert"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:74 lib/Jifty/Action/Record/Create.pm~:74
+#: lib/Jifty/Action/Record/Create.pm:82
msgid "An error occurred. Try again later"
msgstr ""
+#: lib/Jifty/Action/Record/Search.pm:105
+msgid "Any field contains"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/update:28
+msgid "Cancel"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:75 lib/Jifty/Action/Record/Create.pm~:75
+#: share/web/templates/__jifty/admin/fragments/list/view:29
+msgid "Confirm delete?"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
msgid "Create of %1 failed: %2"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:97 lib/Jifty/Action/Record/Create.pm~:97
+#: lib/Jifty/Action/Record/Create.pm:105
msgid "Created"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:34
+#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
msgstr ""
-#: lib/Jifty/Action/Record/Delete.pm:75
+#: lib/Jifty/Action/Record/Delete.pm:76
msgid "Deleted"
msgstr ""
-#: lib/Jifty/Web.pm:769 lib/Jifty/Web.pm~:768
-msgid "Dismiss"
-msgstr ""
-
#: lib/Jifty/Mason/Halo.pm:104
#. ($comp_name)
msgid "Edit %1"
@@ -74,8 +117,8 @@
msgid "Go back home..."
msgstr ""
-#: share/web/templates/_elements/sidebar:3
-#. (Jifty->web->current_user->user_object->name)
+#: share/web/templates/_elements/sidebar:5
+#. ($u->$method()
msgid "Hiya, %1."
msgstr ""
@@ -91,11 +134,15 @@
msgid "Loading..."
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:40
+#: share/web/templates/__jifty/admin/index.html:9
msgid "Models"
msgstr ""
-#: lib/Jifty/Web.pm:273 lib/Jifty/Web.pm~:273
+#: lib/Jifty/Action/Record/Search.pm:106
+msgid "No field contains"
+msgstr ""
+
+#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr ""
@@ -103,18 +150,18 @@
msgid "Online Documentation"
msgstr ""
-#: lib/Jifty/Record.pm:223 lib/Jifty/Record.pm:282 lib/Jifty/Record.pm:61
+#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
msgstr ""
-#: lib/Jifty/Record.pm:84
-msgid "Record created"
-msgstr ""
-
#: share/web/templates/__jifty/halo:111
msgid "SQL Statements"
msgstr ""
+#: share/web/templates/__jifty/admin/fragments/list/update:18
+msgid "Save"
+msgstr ""
+
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
msgstr ""
@@ -127,11 +174,27 @@
msgid "Table of Contents"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:36
+#: lib/Jifty/Action.pm:874
+msgid "That doesn't look like a correct value"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:247
+msgid "That doesn't look right, but I don't know why"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:179
+msgid "The passwords you typed didn't match each other"
+msgstr ""
+
+#: lib/Jifty/Web.pm:360
+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 ""
-#: lib/Jifty/Action/Record/Update.pm:152
+#: lib/Jifty/Action/Record/Update.pm:156
msgid "Updated"
msgstr ""
@@ -143,6 +206,10 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr ""
+#: lib/Jifty/Action.pm:861
+msgid "You need to fill in this field"
+msgstr ""
+
#: share/web/templates/index.html:3
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
Modified: jifty/branches/template-declare/share/po/fr.po
==============================================================================
--- jifty/branches/template-declare/share/po/fr.po (original)
+++ jifty/branches/template-declare/share/po/fr.po Thu Nov 30 21:48:33 2006
@@ -15,8 +15,39 @@
"Content-Type: text/plain; charset=ISO8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/Jifty/Web.pm:583
-msgid " $self->response->results "
+#: lib/Jifty/Action/Record/Search.pm:96
+#. ($label)
+msgid "%1 after"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:97
+#. ($label)
+msgid "%1 before"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:93
+#. ($label)
+msgid "%1 contains"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:100
+#. ($label)
+msgid "%1 greater than"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:89
+#. ($label)
+msgid "%1 is not"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:94
+#. ($label)
+msgid "%1 lacks"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:101
+#. ($label)
+msgid "%1 less than"
msgstr ""
#: share/web/templates/__jifty/halo:119
@@ -24,6 +55,10 @@
msgid "%1 seconds"
msgstr "%1 secondes"
+#: lib/Jifty/Web/Form/Field.pm:517
+msgid "@{[$self->current_value]}"
+msgstr ""
+
#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
msgstr ""
@@ -40,10 +75,22 @@
msgid "An error occurred. Try again later"
msgstr "Erreur. Ré-essayez plus tard"
+#: lib/Jifty/Action/Record/Search.pm:105
+msgid "Any field contains"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/update:28
+msgid "Cancel"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "Fermer la fenêtre"
+#: share/web/templates/__jifty/admin/fragments/list/view:29
+msgid "Confirm delete?"
+msgstr ""
+
#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
msgid "Create of %1 failed: %2"
@@ -91,7 +138,11 @@
msgid "Models"
msgstr "Modèles"
-#: lib/Jifty/Web.pm:276
+#: lib/Jifty/Action/Record/Search.pm:106
+msgid "No field contains"
+msgstr ""
+
+#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "Aucune requête à traiter"
@@ -99,7 +150,7 @@
msgid "Online Documentation"
msgstr "Documentation en ligne"
-#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:316 lib/Jifty/Record.pm:60
+#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
msgstr "Autorisation refusée"
@@ -111,6 +162,10 @@
msgid "SQL Statements"
msgstr ""
+#: share/web/templates/__jifty/admin/fragments/list/update:18
+msgid "Save"
+msgstr ""
+
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
msgstr "Schéma"
@@ -123,19 +178,19 @@
msgid "Table of Contents"
msgstr "Table des matières"
-#: lib/Jifty/Action.pm:854
+#: lib/Jifty/Action.pm:874
msgid "That doesn't look like a correct value"
msgstr "Valeur incorecte"
-#: lib/Jifty/Action/Record.pm:249
+#: lib/Jifty/Action/Record.pm:247
msgid "That doesn't look right, but I don't know why"
msgstr "Problème"
-#: lib/Jifty/Action/Record.pm:181
+#: lib/Jifty/Action/Record.pm:179
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:339
+#: lib/Jifty/Web.pm:360
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."
@@ -155,7 +210,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "Cette page n'existe pas."
-#: lib/Jifty/Action.pm:841
+#: lib/Jifty/Action.pm:861
msgid "You need to fill in this field"
msgstr "Information obligatoire"
@@ -163,4 +218,3 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-
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 Thu Nov 30 21:48:33 2006
@@ -15,8 +15,39 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/Jifty/Web.pm:572 lib/Jifty/Web.pm~:572
-msgid " $self->response->results "
+#: lib/Jifty/Action/Record/Search.pm:96
+#. ($label)
+msgid "%1 after"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:97
+#. ($label)
+msgid "%1 before"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:93
+#. ($label)
+msgid "%1 contains"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:100
+#. ($label)
+msgid "%1 greater than"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:89
+#. ($label)
+msgid "%1 is not"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:94
+#. ($label)
+msgid "%1 lacks"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:101
+#. ($label)
+msgid "%1 less than"
msgstr ""
#: share/web/templates/__jifty/halo:119
@@ -24,7 +55,11 @@
msgid "%1 seconds"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:49
+#: lib/Jifty/Web/Form/Field.pm:517
+msgid "@{[$self->current_value]}"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
msgstr ""
@@ -36,35 +71,43 @@
msgid "Alert"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:74 lib/Jifty/Action/Record/Create.pm~:74
+#: lib/Jifty/Action/Record/Create.pm:82
msgid "An error occurred. Try again later"
msgstr ""
+#: lib/Jifty/Action/Record/Search.pm:105
+msgid "Any field contains"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/update:28
+msgid "Cancel"
+msgstr ""
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:75 lib/Jifty/Action/Record/Create.pm~:75
+#: share/web/templates/__jifty/admin/fragments/list/view:29
+msgid "Confirm delete?"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
msgid "Create of %1 failed: %2"
msgstr ""
-#: lib/Jifty/Action/Record/Create.pm:97 lib/Jifty/Action/Record/Create.pm~:97
+#: lib/Jifty/Action/Record/Create.pm:105
msgid "Created"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:34
+#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
msgstr ""
-#: lib/Jifty/Action/Record/Delete.pm:75
+#: lib/Jifty/Action/Record/Delete.pm:76
msgid "Deleted"
msgstr ""
-#: lib/Jifty/Web.pm:769 lib/Jifty/Web.pm~:768
-msgid "Dismiss"
-msgstr ""
-
#: lib/Jifty/Mason/Halo.pm:104
#. ($comp_name)
msgid "Edit %1"
@@ -74,8 +117,8 @@
msgid "Go back home..."
msgstr ""
-#: share/web/templates/_elements/sidebar:3
-#. (Jifty->web->current_user->user_object->name)
+#: share/web/templates/_elements/sidebar:5
+#. ($u->$method()
msgid "Hiya, %1."
msgstr ""
@@ -91,11 +134,15 @@
msgid "Loading..."
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:40
+#: share/web/templates/__jifty/admin/index.html:9
msgid "Models"
msgstr ""
-#: lib/Jifty/Web.pm:273 lib/Jifty/Web.pm~:273
+#: lib/Jifty/Action/Record/Search.pm:106
+msgid "No field contains"
+msgstr ""
+
+#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr ""
@@ -103,18 +150,18 @@
msgid "Online Documentation"
msgstr ""
-#: lib/Jifty/Record.pm:223 lib/Jifty/Record.pm:282 lib/Jifty/Record.pm:61
+#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
msgstr ""
-#: lib/Jifty/Record.pm:84
-msgid "Record created"
-msgstr ""
-
#: share/web/templates/__jifty/halo:111
msgid "SQL Statements"
msgstr ""
+#: share/web/templates/__jifty/admin/fragments/list/update:18
+msgid "Save"
+msgstr ""
+
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
msgstr ""
@@ -127,11 +174,27 @@
msgid "Table of Contents"
msgstr ""
-#: share/web/templates/__jifty/admin/index.html:36
+#: lib/Jifty/Action.pm:874
+msgid "That doesn't look like a correct value"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:247
+msgid "That doesn't look right, but I don't know why"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:179
+msgid "The passwords you typed didn't match each other"
+msgstr ""
+
+#: lib/Jifty/Web.pm:360
+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 ""
-#: lib/Jifty/Action/Record/Update.pm:152
+#: lib/Jifty/Action/Record/Update.pm:156
msgid "Updated"
msgstr ""
@@ -143,6 +206,10 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr ""
+#: lib/Jifty/Action.pm:861
+msgid "You need to fill in this field"
+msgstr ""
+
#: share/web/templates/index.html:3
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
Modified: jifty/branches/template-declare/share/po/zh_cn.po
==============================================================================
--- jifty/branches/template-declare/share/po/zh_cn.po (original)
+++ jifty/branches/template-declare/share/po/zh_cn.po Thu Nov 30 21:48:33 2006
@@ -9,17 +9,56 @@
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Audrey Tang <audreyt at audreyt.org>\n"
-"Language-Team: simplified Chinese\n"
+"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. ($_->[3])
+#: lib/Jifty/Action/Record/Search.pm:96
+#. ($label)
+msgid "%1 after"
+msgstr "%1 æäº"
+
+#: lib/Jifty/Action/Record/Search.pm:97
+#. ($label)
+msgid "%1 before"
+msgstr "%1 æ©äº"
+
+#: lib/Jifty/Action/Record/Search.pm:93
+#. ($label)
+msgid "%1 contains"
+msgstr "%1 å
å«"
+
+#: lib/Jifty/Action/Record/Search.pm:100
+#. ($label)
+msgid "%1 greater than"
+msgstr "%1 大äº"
+
+#: lib/Jifty/Action/Record/Search.pm:89
+#. ($label)
+msgid "%1 is not"
+msgstr "%1 ä¸çäº"
+
+#: lib/Jifty/Action/Record/Search.pm:94
+#. ($label)
+msgid "%1 lacks"
+msgstr "%1 ä¸å
å«"
+
+#: lib/Jifty/Action/Record/Search.pm:101
+#. ($label)
+msgid "%1 less than"
+msgstr "%1 å°äº"
+
#: share/web/templates/__jifty/halo:119
+#. ($_->[3])
msgid "%1 seconds"
msgstr "%1 ç§"
-#: share/web/templates/__jifty/admin/index.html:49
+#: lib/Jifty/Web/Form/Field.pm:517
+msgid "@{[$self->current_value]}"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
msgstr "æä½"
@@ -31,37 +70,49 @@
msgid "Alert"
msgstr "请注æ"
-#: lib/Jifty/Action/Record/Create.pm:74 lib/Jifty/Action/Record/Create.pm~:74
+#: lib/Jifty/Action/Record/Create.pm:82
msgid "An error occurred. Try again later"
msgstr "ç³»ç»æ æ³æ§è¡æ¤é¡¹æä½, 请ç¨ååè¯"
+#: lib/Jifty/Action/Record/Search.pm:105
+msgid "Any field contains"
+msgstr "ä»»æå段å
å«"
+
+#: share/web/templates/__jifty/admin/fragments/list/update:28
+msgid "Cancel"
+msgstr "åæ¶"
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "å
³éçªå£"
+#: share/web/templates/__jifty/admin/fragments/list/view:29
+msgid "Confirm delete?"
+msgstr "ç¡®å®è¦å é¤?"
+
+#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
-#: lib/Jifty/Action/Record/Create.pm:75 lib/Jifty/Action/Record/Create.pm~:75
msgid "Create of %1 failed: %2"
msgstr "æ æ³å»ºç« %1: %2"
-#: lib/Jifty/Action/Record/Create.pm:97 lib/Jifty/Action/Record/Create.pm~:97
+#: lib/Jifty/Action/Record/Create.pm:105
msgid "Created"
msgstr "æå建ç«é¡¹ç®."
-#: share/web/templates/__jifty/admin/index.html:34
+#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
msgstr "æ°æ®ç¤ç®¡ç"
-#: lib/Jifty/Action/Record/Delete.pm:75
+#: lib/Jifty/Action/Record/Delete.pm:76
msgid "Deleted"
msgstr "æåå é¤é¡¹ç®."
-#: lib/Jifty/Web.pm:769 lib/Jifty/Web.pm~:768
+#:
msgid "Dismiss"
msgstr "å
³é"
-#. ($comp_name)
#: lib/Jifty/Mason/Halo.pm:104
+#. ($comp_name)
msgid "Edit %1"
msgstr "ç¼è¾ %1"
@@ -69,8 +120,8 @@
msgid "Go back home..."
msgstr "åé¦é¡µ..."
-#. (Jifty->web->current_user->user_object->name)
-#: share/web/templates/_elements/sidebar:3
+#: share/web/templates/_elements/sidebar:5
+#. ($u->$method()
msgid "Hiya, %1."
msgstr "%1 æ¨å¥½."
@@ -86,11 +137,15 @@
msgid "Loading..."
msgstr "请ç¨å..."
-#: share/web/templates/__jifty/admin/index.html:40
+#: share/web/templates/__jifty/admin/index.html:9
msgid "Models"
msgstr "模å"
-#: lib/Jifty/Web.pm:273 lib/Jifty/Web.pm~:273
+#: lib/Jifty/Action/Record/Search.pm:106
+msgid "No field contains"
+msgstr "没æå段å
å«"
+
+#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "没æå¯å¤ççè¦æ±"
@@ -98,11 +153,11 @@
msgid "Online Documentation"
msgstr "线ä¸æ件"
-#: lib/Jifty/Record.pm:223 lib/Jifty/Record.pm:282 lib/Jifty/Record.pm:61
+#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
msgstr "æéä¸è¶³."
-#: lib/Jifty/Record.pm:84
+#:
msgid "Record created"
msgstr "æå建ç«é¡¹ç®."
@@ -110,6 +165,10 @@
msgid "SQL Statements"
msgstr "SQL éè¿°å¼"
+#: share/web/templates/__jifty/admin/fragments/list/update:18
+msgid "Save"
+msgstr "å¨å"
+
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
msgstr "纲è¦"
@@ -118,19 +177,31 @@
msgid "Something's not quite right"
msgstr "ç³»ç»é误"
-#: share/web/templates/__jifty/online_docs/index.html:16
-#: share/web/templates/__jifty/online_docs/index.html:18
+#: share/web/templates/__jifty/online_docs/index.html:16 share/web/templates/__jifty/online_docs/index.html:18
msgid "Table of Contents"
msgstr "ç®å½"
-#: share/web/templates/__jifty/admin/index.html:36
-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."
+#: lib/Jifty/Action.pm:874
+msgid "That doesn't look like a correct value"
+msgstr "åæ®µæ ¼å¼é误."
+
+#: lib/Jifty/Action/Record.pm:247
+msgid "That doesn't look right, but I don't know why"
+msgstr "å段å
容é误."
+
+#: lib/Jifty/Action/Record.pm:179
+msgid "The passwords you typed didn't match each other"
+msgstr "两ç»å£ä»¤ä¸ç¬¦å."
+
+#: lib/Jifty/Web.pm:360
+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 "æ¨å¯å©ç¨æ¤çé¢æ¥ç®¡çæ°æ®åºçå
容. 请ç¹éè¡¨æ ¼å称, è¿è¡å¢å åç¼è¾."
-#: lib/Jifty/Action/Record/Update.pm:152
+#: lib/Jifty/Action/Record/Update.pm:156
msgid "Updated"
msgstr "æåæ´æ°é¡¹ç®."
@@ -139,13 +210,14 @@
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."
+msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "æ±æ, æ¤é¡µé¢ä¸åå¨, ç³»ç»å·²çä¸çºªå½."
-#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
+#: lib/Jifty/Action.pm:861
+msgid "You need to fill in this field"
+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 "æ¨å¯ä¸æ£æ¯æ³è¦ä¸å¹å°é©¬å? (åè§ %1)"
-
Modified: jifty/branches/template-declare/share/po/zh_tw.po
==============================================================================
--- jifty/branches/template-declare/share/po/zh_tw.po (original)
+++ jifty/branches/template-declare/share/po/zh_tw.po Thu Nov 30 21:48:33 2006
@@ -14,12 +14,51 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. ($_->[3])
+#: lib/Jifty/Action/Record/Search.pm:96
+#. ($label)
+msgid "%1 after"
+msgstr "%1 ææ¼"
+
+#: lib/Jifty/Action/Record/Search.pm:97
+#. ($label)
+msgid "%1 before"
+msgstr "%1 æ©æ¼"
+
+#: lib/Jifty/Action/Record/Search.pm:93
+#. ($label)
+msgid "%1 contains"
+msgstr "%1 å
å«"
+
+#: lib/Jifty/Action/Record/Search.pm:100
+#. ($label)
+msgid "%1 greater than"
+msgstr "%1 大æ¼"
+
+#: lib/Jifty/Action/Record/Search.pm:89
+#. ($label)
+msgid "%1 is not"
+msgstr "%1 ä¸çæ¼"
+
+#: lib/Jifty/Action/Record/Search.pm:94
+#. ($label)
+msgid "%1 lacks"
+msgstr "%1 ä¸å
å«"
+
+#: lib/Jifty/Action/Record/Search.pm:101
+#. ($label)
+msgid "%1 less than"
+msgstr "%1 å°æ¼"
+
#: share/web/templates/__jifty/halo:119
+#. ($_->[3])
msgid "%1 seconds"
msgstr "%1 ç§"
-#: share/web/templates/__jifty/admin/index.html:49
+#: lib/Jifty/Web/Form/Field.pm:517
+msgid "@{[$self->current_value]}"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/index.html:19
msgid "Actions"
msgstr "æä½"
@@ -31,37 +70,49 @@
msgid "Alert"
msgstr "è«æ³¨æ"
-#: lib/Jifty/Action/Record/Create.pm:74 lib/Jifty/Action/Record/Create.pm~:74
+#: lib/Jifty/Action/Record/Create.pm:82
msgid "An error occurred. Try again later"
msgstr "系統ç¡æ³å·è¡æ¤é
æä½, è«ç¨å¾å試"
+#: lib/Jifty/Action/Record/Search.pm:105
+msgid "Any field contains"
+msgstr "ä»»ææ¬ä½å
å«"
+
+#: share/web/templates/__jifty/admin/fragments/list/update:28
+msgid "Cancel"
+msgstr "åæ¶"
+
#: share/web/templates/helpers/calendar.html:4
msgid "Close window"
msgstr "ééè¦çª"
+#: share/web/templates/__jifty/admin/fragments/list/view:29
+msgid "Confirm delete?"
+msgstr "確å®è¦åªé¤?"
+
+#: lib/Jifty/Action/Record/Create.pm:81
#. (ref($record)
-#: lib/Jifty/Action/Record/Create.pm:75 lib/Jifty/Action/Record/Create.pm~:75
msgid "Create of %1 failed: %2"
msgstr "ç¡æ³å»ºç« %1: %2"
-#: lib/Jifty/Action/Record/Create.pm:97 lib/Jifty/Action/Record/Create.pm~:97
+#: lib/Jifty/Action/Record/Create.pm:105
msgid "Created"
msgstr "æå建ç«é
ç®."
-#: share/web/templates/__jifty/admin/index.html:34
+#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
msgstr "è³æç¤ç®¡ç"
-#: lib/Jifty/Action/Record/Delete.pm:75
+#: lib/Jifty/Action/Record/Delete.pm:76
msgid "Deleted"
msgstr "æååªé¤é
ç®."
-#: lib/Jifty/Web.pm:769 lib/Jifty/Web.pm~:768
+#:
msgid "Dismiss"
msgstr "éé"
-#. ($comp_name)
#: lib/Jifty/Mason/Halo.pm:104
+#. ($comp_name)
msgid "Edit %1"
msgstr "編輯 %1"
@@ -69,8 +120,8 @@
msgid "Go back home..."
msgstr "åé¦é ..."
-#. (Jifty->web->current_user->user_object->name)
-#: share/web/templates/_elements/sidebar:3
+#: share/web/templates/_elements/sidebar:5
+#. ($u->$method()
msgid "Hiya, %1."
msgstr "%1 æ¨å¥½."
@@ -86,11 +137,15 @@
msgid "Loading..."
msgstr "è«ç¨å..."
-#: share/web/templates/__jifty/admin/index.html:40
+#: share/web/templates/__jifty/admin/index.html:9
msgid "Models"
msgstr "模å"
-#: lib/Jifty/Web.pm:273 lib/Jifty/Web.pm~:273
+#: lib/Jifty/Action/Record/Search.pm:106
+msgid "No field contains"
+msgstr "æ²ææ¬ä½å
å«"
+
+#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "æ²æå¯èççè¦æ±"
@@ -98,11 +153,11 @@
msgid "Online Documentation"
msgstr "ç·ä¸æ件"
-#: lib/Jifty/Record.pm:223 lib/Jifty/Record.pm:282 lib/Jifty/Record.pm:61
+#: lib/Jifty/Record.pm:240 lib/Jifty/Record.pm:319 lib/Jifty/Record.pm:60
msgid "Permission denied"
msgstr "æ¬éä¸è¶³."
-#: lib/Jifty/Record.pm:84
+#:
msgid "Record created"
msgstr "æå建ç«é
ç®."
@@ -110,6 +165,10 @@
msgid "SQL Statements"
msgstr "SQL é³è¿°å¼"
+#: share/web/templates/__jifty/admin/fragments/list/update:18
+msgid "Save"
+msgstr "å²å"
+
#: share/web/templates/__jifty/online_docs/content.html:50
msgid "Schema"
msgstr "綱è¦"
@@ -118,19 +177,31 @@
msgid "Something's not quite right"
msgstr "系統é¯èª¤"
-#: share/web/templates/__jifty/online_docs/index.html:16
-#: share/web/templates/__jifty/online_docs/index.html:18
+#: share/web/templates/__jifty/online_docs/index.html:16 share/web/templates/__jifty/online_docs/index.html:18
msgid "Table of Contents"
msgstr "ç®é"
-#: share/web/templates/__jifty/admin/index.html:36
-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."
+#: lib/Jifty/Action.pm:874
+msgid "That doesn't look like a correct value"
+msgstr "æ¬ä½æ ¼å¼é¯èª¤."
+
+#: lib/Jifty/Action/Record.pm:247
+msgid "That doesn't look right, but I don't know why"
+msgstr "æ¬ä½å
§å®¹é¯èª¤."
+
+#: lib/Jifty/Action/Record.pm:179
+msgid "The passwords you typed didn't match each other"
+msgstr "å
©çµå¯ç¢¼ä¸ç¬¦å."
+
+#: lib/Jifty/Web.pm:360
+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 "æ¨å¯å©ç¨æ¤çé¢ä¾ç®¡çè³æ庫çå
§å®¹. è«é»é¸è¡¨æ ¼å稱, é²è¡å¢åªå編輯."
-#: lib/Jifty/Action/Record/Update.pm:152
+#: lib/Jifty/Action/Record/Update.pm:156
msgid "Updated"
msgstr "æåæ´æ°é
ç®."
@@ -139,13 +210,14 @@
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."
+msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "æ±æ, æ¤é é¢ä¸åå¨, 系統已çä¸ç´é."
-#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
+#: lib/Jifty/Action.pm:861
+msgid "You need to fill in this field"
+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 "æ¨å¯ä¸æ£æ¯æ³è¦ä¸å¹å°é¦¬å? (åè¦ %1)"
-
More information about the Jifty-commit
mailing list