[Jifty-commit] r2304 - in jifty/branches/template-declare: . lib/Jifty/Action/Record share/web/static/js

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Sun Dec 3 10:33:47 EST 2006


Author: audreyt
Date: Sun Dec  3 10:33:47 2006
New Revision: 2304

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/Action/Record/Search.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/static/js/calendar.js

Log:
* Merge down into template-declare branch.

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	Sun Dec  3 10:33:47 2006
@@ -122,7 +122,7 @@
             $args->{"${field}_lt"} = { %$info, label => _("%1 less than", $label) };
             $args->{"${field}_ge"} = { %$info, label => _("%1 greater or equal to", $label) };
             $args->{"${field}_le"} = { %$info, label => _("%1 less or equal to", $label) };
-            $args->{"${field}_dwim"} = { %$info };
+            $args->{"${field}_dwim"} = { %$info, hints => _('!=>< allowed') };
         }
     }
 

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	Sun Dec  3 10:33:47 2006
@@ -15,6 +15,10 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Action/Record/Search.pm:125
+msgid "!=>< allowed"
+msgstr ""
+
 #: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
 #. ($label)
 msgid "%1 after"

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	Sun Dec  3 10:33:47 2006
@@ -15,6 +15,10 @@
 "Content-Type: text/plain; charset=ISO8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Action/Record/Search.pm:125
+msgid "!=>< allowed"
+msgstr ""
+
 #: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
 #. ($label)
 msgid "%1 after"

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	Sun Dec  3 10:33:47 2006
@@ -15,6 +15,10 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Action/Record/Search.pm:125
+msgid "!=>< allowed"
+msgstr ""
+
 #: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
 #. ($label)
 msgid "%1 after"

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	Sun Dec  3 10:33:47 2006
@@ -14,6 +14,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Action/Record/Search.pm:125
+msgid "!=>< allowed"
+msgstr "可使用 !=>< 符号"
+
 #: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
 #. ($label)
 msgid "%1 after"

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	Sun Dec  3 10:33:47 2006
@@ -14,6 +14,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Action/Record/Search.pm:125
+msgid "!=>< allowed"
+msgstr "可使用 !=>< 符號"
+
 #: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
 #. ($label)
 msgid "%1 after"

Modified: jifty/branches/template-declare/share/web/static/js/calendar.js
==============================================================================
--- jifty/branches/template-declare/share/web/static/js/calendar.js	(original)
+++ jifty/branches/template-declare/share/web/static/js/calendar.js	Sun Dec  3 10:33:47 2006
@@ -73,6 +73,7 @@
         cal["onSelect"] = function() {
             input.value = cal.getSelectedDates()[0].formatDate(Jifty.Calendar.dateFormat);
             Jifty.Calendar.hideOpenCalendar();
+            Form.Element.validate(input); // We can't trigger an onBlur, so canonicalize/validate manually
         };
 
         cal["_onChangePage"] = cal["onChangePage"];


More information about the Jifty-commit mailing list