[Jifty-commit] r2267 - in jifty/branches/template-declare: .
lib/Jifty share/web/templates/__jifty/admin
share/web/templates/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Dec 2 20:38:23 EST 2006
Author: audreyt
Date: Sat Dec 2 20:38:23 2006
New Revision: 2267
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/lib/Jifty/Action.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
jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html
jifty/branches/template-declare/share/web/templates/_elements/sidebar
Log:
* Merge down into template-declare branch.
Modified: jifty/branches/template-declare/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Action.pm Sat Dec 2 20:38:23 2006
@@ -982,7 +982,8 @@
my $type = shift;
my $vv_orig = $self->arguments->{$field}{$type .'_values'};
- return $vv_orig unless ref $vv_orig eq 'ARRAY';
+ # available are defer { } creates defered value which ref is 0
+ return $vv_orig unless ( ref $vv_orig eq 'ARRAY' || ref $vv_orig eq 0 );
my $vv = [];
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 Sat Dec 2 20:38:23 2006
@@ -60,7 +60,7 @@
msgid "%1 seconds"
msgstr ""
-#: lib/Jifty/Web/Form/Field.pm:517
+#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
msgstr ""
@@ -249,6 +249,10 @@
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 ""
+#: 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 ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:38
msgid "Toggle search"
msgstr ""
@@ -277,3 +281,7 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
+
+#: share/web/templates/_elements/sidebar:7
+msgid "You're not currently signed in."
+msgstr ""
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 Sat Dec 2 20:38:23 2006
@@ -60,7 +60,7 @@
msgid "%1 seconds"
msgstr "%1 secondes"
-#: lib/Jifty/Web/Form/Field.pm:517
+#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
msgstr ""
@@ -253,6 +253,10 @@
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 "Cette page vous permet de gérer vos enregistrements dans la base. Vous trouverez ci-dessous la listes des tables. Vous pouvez ajouter, effacer ou modifier les enregistements."
+#: 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 ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:38
msgid "Toggle search"
msgstr ""
@@ -281,3 +285,7 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
+
+#: share/web/templates/_elements/sidebar:7
+msgid "You're not currently signed in."
+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 Sat Dec 2 20:38:23 2006
@@ -60,7 +60,7 @@
msgid "%1 seconds"
msgstr ""
-#: lib/Jifty/Web/Form/Field.pm:517
+#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
msgstr ""
@@ -249,6 +249,10 @@
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 ""
+#: 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 ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:38
msgid "Toggle search"
msgstr ""
@@ -277,3 +281,7 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
+
+#: share/web/templates/_elements/sidebar:7
+msgid "You're not currently signed in."
+msgstr ""
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 Sat Dec 2 20:38:23 2006
@@ -59,7 +59,7 @@
msgid "%1 seconds"
msgstr "%1 ç§"
-#: lib/Jifty/Web/Form/Field.pm:517
+#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
msgstr ""
@@ -256,6 +256,10 @@
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 "æ¨å¯å©ç¨æ¤çé¢æ¥ç®¡çæ°æ®åºçå
容. 请ç¹éè¡¨æ ¼å称, è¿è¡å¢å åç¼è¾."
+#: 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 ""
+
#: share/web/templates/__jifty/admin/fragments/list/list:38
msgid "Toggle search"
msgstr "åæ¢æ寻ç»é¢"
@@ -284,3 +288,7 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr "æ¨å¯ä¸æ£æ¯æ³è¦ä¸å¹å°é©¬å? (åè§ %1)"
+
+#: share/web/templates/_elements/sidebar:7
+msgid "You're not currently signed in."
+msgstr ""
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 Sat Dec 2 20:38:23 2006
@@ -59,7 +59,7 @@
msgid "%1 seconds"
msgstr "%1 ç§"
-#: lib/Jifty/Web/Form/Field.pm:517
+#: lib/Jifty/Web/Form/Field.pm:521
msgid "@{[$self->current_value]}"
msgstr ""
@@ -256,6 +256,10 @@
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 "æ¨å¯å©ç¨æ¤çé¢ä¾ç®¡çè³æ庫çå
§å®¹. è«é»é¸è¡¨æ ¼å稱, é²è¡å¢åªå編輯."
+#: 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\" å³å¯."
+
#: share/web/templates/__jifty/admin/fragments/list/list:38
msgid "Toggle search"
msgstr "åææå°ç«é¢"
@@ -284,3 +288,7 @@
#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
msgid "You said you wanted a pony. (Source %1)"
msgstr "æ¨å¯ä¸æ£æ¯æ³è¦ä¸å¹å°é¦¬å? (åè¦ %1)"
+
+#: share/web/templates/_elements/sidebar:7
+msgid "You're not currently signed in."
+msgstr "æ¨ç®åå°æªç»å
¥."
Modified: jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html Sat Dec 2 20:38:23 2006
@@ -4,7 +4,7 @@
<p><%_('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.')%></p>
-<p><%_(q{To disable this administrative console, add "framework: AdminMode: 0" to your application's configuration file.})%></p>
+<p><%_('To disable this administrative console, add "AdminMode: 0" under the "framework:" settings in the config file (etc/config.yml).')%></p>
<h2><%_('Models')%></h2>
<ul>
Modified: jifty/branches/template-declare/share/web/templates/_elements/sidebar
==============================================================================
--- jifty/branches/template-declare/share/web/templates/_elements/sidebar (original)
+++ jifty/branches/template-declare/share/web/templates/_elements/sidebar Sat Dec 2 20:38:23 2006
@@ -4,7 +4,7 @@
% my $method = $u->_brief_description;
<%_('Hiya, %1.',$u->$method())%>
% } else {
-<%_(q{You're not currently signed in.})%>
+<%_("You're not currently signed in.")%>
% }
</div>
<div id="navigation">
More information about the Jifty-commit
mailing list