diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-27 11:27:49 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-27 11:27:49 +0000 |
| commit | a091ad71bf715f64c53f08b99aadc143284ec0c3 (patch) | |
| tree | 2d660fa5085bb2072e7a0cca3b1645d39492a9e5 /app | |
| parent | 940a98e7e431b451886d9b7b7848fe41adfedaed (diff) | |
| parent | afd9741a35c2d1b5791359a4f9eaf0e1188a85c4 (diff) | |
Merge branch 'welsh-fixes' into wdtk
Conflicts:
locale/cy/app.po
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/general/_localised_datepicker.html.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/general/_localised_datepicker.html.erb b/app/views/general/_localised_datepicker.html.erb index ec6593ea0..ee3206957 100644 --- a/app/views/general/_localised_datepicker.html.erb +++ b/app/views/general/_localised_datepicker.html.erb @@ -1,16 +1,16 @@ <script type="text/javascript"> $(function() { $(".use-datepicker").datepicker( - {closeText: '<%= _("Done") %>', - prevText: '<%= _("Prev") %>', - nextText: '<%= _("Next") %>', - currentText: '<%= _("Today") %>', + {closeText: '<%= j _("Done") %>', + prevText: '<%= j _("Prev") %>', + nextText: '<%= j _("Next") %>', + currentText: '<%= j _("Today") %>', monthNames: <%= raw I18n.translate('date.month_names')[1..-1].to_json %>, monthNamesShort: <%= raw I18n.translate('date.abbr_month_names')[1..-1].to_json %>, dayNames: <%= raw I18n.translate('date.day_names').to_json %>, dayNamesShort: <%= raw I18n.translate('date.abbr_day_names').to_json %>, dayNamesMin: <%= raw I18n.translate('date.abbr_day_names').collect{|x| x[0..0]}.to_json %>, - weekHeader: '<%= _("Wk") %>', + weekHeader: '<%= j _("Wk") %>', dateFormat: '<%= I18n.translate('date.formats.default').sub("%Y", "yy").sub("%m", "mm").sub("%d", "dd").gsub("-", "/") %>'} ); }); |