Changeset 5720

Timestamp:

03/24/08 10:05:09 (2 years ago)

Author:

uta

Message:

2008/03/24 sync

Files:

• rubricks_core/trunk/languages/chinese.rb (modified) (5 diffs)
• rubricks_core/trunk/languages/english.rb (modified) (3 diffs)
• rubricks_core/trunk/languages/japanese.rb (modified) (2 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_realtime_validator_helper.rb (modified) (3 diffs)

rubricks_core/trunk/languages/chinese.rb

@@ -17 +17 @@
-      '_Common_Admit_Return_Confirm'            => '确实芁退回吗',
-      '_Common_Admit_Confirm'                   => '确实芁批准吗',
-升级
+äžŠäŒ 
-      '_Common_Application'                     => '应甚',
-      '_Common_Approval_Return_Failed'          => '%s退回倱莥。',
@@ -59 +59 @@
-      '_Common_DateTime'                        => '时闎',
-      '_Common_Date_Format'                     => '%Y/%m/%d',
+      '_Common_Date_FormatForJS'                => '/(^[0-9]{4}[/][0-9]{2}[/][0-9]{2}$)/',
-      '_Common_Date_FormatWithoutYear'          => '%m/%d',
-      '_Common_Date_HourMinSec_Format'          => '%Y/%m/%d %H:%M:%S',
-      '_Common_Date_HourMin_Format'             => '%Y/%m/%d %H:%M',
-      '_Common_Day'                             => '日',
+      '_Common_DayAfter'                        => '已过%d倩',
+      '_Common_DayBefore'                       => '%d倩之后',
-      '_Common_Deactive'                        => '已经停止',
-      '_Common_Decide'                          => '决定',
@@ -305 +308 @@
-      '_Common_Stop'                            => '停止',
-      '_Common_Stop_Confirm'                    => '确实芁停止吗',
-发送邮件
+提亀
-      '_Common_Sunday'                          => '日',
-      '_Common_SundayFull'                      => '星期日',
@@ -312 +315 @@
-      '_Common_Tab'                             => 'æ ‡ç­Ÿé¡µ',
-      '_Common_Target'                          => '对象',
+      '_Common_ThatDay'                         => '圓倩',
-      '_Common_ThemeName'                       => '星瀺䞻题',
-      '_Common_Thursday'                        => '四',
@@ -407 +411 @@
-      '_Common_Validate_NumericRange'           => '请蟓å
-¥%s%s之闎的倌。',
-#      '_Common_Validate_PleaseInputBy'          => '请蟓å
-¥ã€‚',
-#      '_Common_Validate_PleaseInputIn'          => '请蟓å
-¥ã€‚',
-      '_Common_Validate_Regulation'             => '请同意规定。',
-      '_Common_Validate_Required'               => 'å¿

rubricks_core/trunk/languages/english.rb

@@ -49 +49 @@
-      '_Common_DataMismatch'                    => 'Data has been updated. Please update it reloading the screen.',
-      '_Common_Date'                            => 'Date',
-Y%m%d
-yyyy/MM/dd
+m%d%Y
+MM/dd/yyyy
-      '_Common_DateTime'                        => 'Date and hour',
-      '_Common_Date_Format'                     => '%m/%d/%Y',
+      '_Common_Date_FormatForJS'                => '/(^[0-9]{2}[/][0-9]{2}[/][0-9]{4}$)/',
-      '_Common_Date_FormatWithoutYear'          => '%m/%d',
-      '_Common_Date_HourMinSec_Format'          => '%m/%d/%Y %H:%M:%S',
-      '_Common_Date_HourMin_Format'             => '%m/%d/%Y %H:%M',
-      '_Common_Day'                             => 'Day',
+      '_Common_DayAfter'                        => '%d day(s) after',
+      '_Common_DayBefore'                       => '%d day(s) before',
-      '_Common_Deactive'                        => 'Deactive',
-      '_Common_Decide'                          => 'Decide',
@@ -280 +283 @@
-      '_Common_Tab'                             => 'Tab',
-      '_Common_Target'                          => 'Target',
+      '_Common_ThatDay'                         => 'That Day',
-      '_Common_ThemeName'                       => 'Theme',
-      '_Common_Thursday'                        => 'Thu',
@@ -333 +337 @@
-      '_Common_Validate_CheckboxLessThan'       => 'plz check more than %d.',
-      '_Common_Validate_Checking'               => 'now checking',
-yyyy/MM/dd
+mm/dd/yyyy
-      '_Common_Validate_FileFormat'             => 'Plz input %s file.',
-      '_Common_Validate_InvalidDate'            => 'invalid date.',

rubricks_core/trunk/languages/japanese.rb

@@ -61 +61 @@
-      '_Common_DateTime'                        => '日時',
-      '_Common_Date_Format'                     => '%Y/%m/%d',
+      '_Common_Date_FormatForJS'                => '/(^[0-9]{4}[/][0-9]{2}[/][0-9]{2}$)/',
-      '_Common_Date_FormatWithoutYear'          => '%m/%d',
-      '_Common_Date_HourMinSec_Format'          => '%Y/%m/%d %H:%M:%S',
-      '_Common_Date_HourMin_Format'             => '%Y/%m/%d %H:%M',
-      '_Common_Day'                             => '日',
+      '_Common_DayAfter'                        => '%d日埌',
+      '_Common_DayBefore'                       => '%d日前',
-      '_Common_Deactive'                        => '停止䞭',
-      '_Common_Decide'                          => '決定',
@@ -311 +314 @@
-      '_Common_Tab'                             => 'タブ',
-      '_Common_Target'                          => '察象',
+      '_Common_ThatDay'                         => '圓日',
-      '_Common_ThemeName'                       => '衚瀺テヌマ',
-      '_Common_Thursday'                        => '朚',

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_realtime_validator_helper.rb

@@ -242 +242 @@
-        msg_format = (value.class == Hash) ? value[:msg_format] : '[_Common_Validate_DateFormat]'
-        msg_invalid_date = (value.class == Hash) ? value[:msg_invalid_date] : '[_Common_Validate_InvalidDate]'
-'/(^[0-9][0-9][0-9][0-9][/][0-9][0-9][/][0-9][0-9]$)/'
+l('[_Common_Date_FormatForJS]')
-        res = <<-"EOS"
-          if(element.value != ''){
@@ -249 +249 @@
-            }
-            date_array = element.value.split('/');
-
-
-
+
+
+
+
+
+
+
+
+
-            check_date = new Date(year, month - 1, day);
-            if(check_date.getFullYear() != year || check_date.getMonth() + 1 != month || check_date.getDate() != day || check_date.getFullYear() < 1000){
@@ -275 +281 @@
-          if(min_field_value != '' || max_field_value != ''){
-            min_date_array = $('#{min_field_id}').value.split('/');
-
-
-
+
+
+
+
+
+
+
+
+
-            min_date = new Date(min_year, min_month -1, min_day);
-            max_date_array = $('#{max_field_id}').value.split('/');
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            if(min_date > max_date){
-              return _box['validates_#{@validator_name}_error']('#{css_id}', element) + '#{msg}';