diff --git a/frappe/public/build.json b/frappe/public/build.json index 55cdc9c91d..fb9f6b1d7c 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -66,6 +66,7 @@ "public/js/lib/moment/moment-timezone-with-data.min.js", "public/js/lib/socket.io.min.js", "public/js/lib/markdown.js", + "public/js/frappe/translate.js", "public/js/lib/datepicker/datepicker.min.js", "public/js/lib/datepicker/datepicker.en.js" ], @@ -75,7 +76,6 @@ "public/js/frappe/assets.js", "public/js/frappe/format.js", "public/js/frappe/form/formatters.js", - "public/js/frappe/translate.js", "public/js/frappe/ui/modal.html", "public/js/frappe/dom.js", "public/js/frappe/ui/messages.js", diff --git a/frappe/public/js/lib/datepicker/datepicker.en.js b/frappe/public/js/lib/datepicker/datepicker.en.js index 32072f6c4e..1eaebc70b4 100644 --- a/frappe/public/js/lib/datepicker/datepicker.en.js +++ b/frappe/public/js/lib/datepicker/datepicker.en.js @@ -1,11 +1,11 @@ ;(function ($) { $.fn.datepicker.language['en'] = { - days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], - daysShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], - daysMin: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'], - months: ['January','February','March','April','May','June', 'July','August','September','October','November','December'], - monthsShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], - today: 'Today', - clear: 'Clear', + days: [__('Sunday'), __('Monday'), __('Tuesday'), __('Wednesday'), __('Thursday'), __('Friday'), __('Saturday')], + daysShort: [__('Sun'), __('Mon'), __('Tue'), __('Wed'), __('Thu'), __('Fri'), __('Sat')], + daysMin: [__('Su'), __('Mo'), __('Tu'), __('We'), __('Th'), __('Fr'), __('Sa')], + months: [__('January'),__('February'),__('March'),__('April'),__('May'),__('June'), __('July'),__('August'),__('September'),__('October'),__('November'),__('December')], + monthsShort: [__('Jan'), __('Feb'), __('Mar'), __('Apr'), __('May'), __('Jun'), __('Jul'), __('Aug'), __('Sep'), __('Oct'), __('Nov'), __('Dec')], + today: __('Today'), + clear: __('Clear'), dateFormat: 'mm/dd/yyyy', timeFormat: 'hh:ii aa', firstDay: 0