Permalink
Browse files

Swap calendar_date_select with jQuery's datepicker.

  • Loading branch information...
1 parent 90d23a6 commit d7cf909f33498118163b4cc724236a23753d9dc8 @steveyken steveyken committed Aug 3, 2012
Showing with 2,504 additions and 1,954 deletions.
  1. +2 −1 app/assets/javascripts/application.js.erb
  2. +0 −26 app/assets/javascripts/crm.js
  3. +21 −0 app/assets/javascripts/datepicker.js.coffee
  4. +5 −1 app/controllers/application_controller.rb
  5. +0 −9 app/helpers/application_helper.rb
  6. +3 −12 app/models/polymorphic/task.rb
  7. +2 −2 app/views/campaigns/_top_section.html.haml
  8. +0 −2 app/views/campaigns/create.js.rjs
  9. +0 −2 app/views/campaigns/edit.js.rjs
  10. +0 −2 app/views/campaigns/new.js.rjs
  11. +0 −2 app/views/campaigns/update.js.rjs
  12. +3 −8 app/views/layouts/application.html.haml
  13. +1 −1 app/views/opportunities/_top_section.html.haml
  14. +0 −1 app/views/tasks/_pending.html.haml
  15. +3 −2 app/views/tasks/_top_section.html.haml
  16. +1 −3 config/environments/production.rb
  17. +0 −10 config/locales/cz_fat_free_crm.yml
  18. +0 −6 config/locales/de_fat_free_crm.yml
  19. +0 −10 config/locales/en-GB_fat_free_crm.yml
  20. +0 −10 config/locales/en-US_fat_free_crm.yml
  21. +0 −6 config/locales/es_fat_free_crm.yml
  22. +0 −6 config/locales/fr-CA_fat_free_crm.yml
  23. +0 −11 config/locales/fr_fat_free_crm.yml
  24. +0 −11 config/locales/it_fat_free_crm.yml
  25. +0 −10 config/locales/ja_fat_free_crm.yml
  26. +0 −6 config/locales/pl_fat_free_crm.yml
  27. +0 −6 config/locales/pt-BR_fat_free_crm.yml
  28. +0 −9 config/locales/ru_fat_free_crm.yml
  29. +0 −10 config/locales/sv-SE_fat_free_crm.yml
  30. +0 −6 config/locales/th_fat_free_crm.yml
  31. +0 −10 config/locales/zh-CN_fat_free_crm.yml
  32. +0 −2 public/blank_iframe.html
  33. +14 −102 spec/models/polymorphic/task_spec.rb
  34. +0 −446 vendor/assets/javascripts/calendar_date_select/calendar_date_select.js
  35. +0 −35 vendor/assets/javascripts/calendar_date_select/format_american.js
  36. +0 −31 vendor/assets/javascripts/calendar_date_select/format_danish.js
  37. +0 −27 vendor/assets/javascripts/calendar_date_select/format_db.js
  38. +0 −7 vendor/assets/javascripts/calendar_date_select/format_euro_24hr.js
  39. +0 −7 vendor/assets/javascripts/calendar_date_select/format_euro_24hr_ymd.js
  40. +0 −32 vendor/assets/javascripts/calendar_date_select/format_finnish.js
  41. +0 −24 vendor/assets/javascripts/calendar_date_select/format_french.js
  42. +0 −37 vendor/assets/javascripts/calendar_date_select/format_hyphen_ampm.js
  43. +0 −29 vendor/assets/javascripts/calendar_date_select/format_iso_date.js
  44. +0 −24 vendor/assets/javascripts/calendar_date_select/format_italian.js
  45. +0 −10 vendor/assets/javascripts/calendar_date_select/locale/ar.js
  46. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/da.js
  47. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/de.js
  48. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/es.js
  49. +0 −10 vendor/assets/javascripts/calendar_date_select/locale/fi.js
  50. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/fr.js
  51. +0 −9 vendor/assets/javascripts/calendar_date_select/locale/it.js
  52. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/ja.js
  53. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/nl.js
  54. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/pl.js
  55. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/pt.js
  56. +0 −10 vendor/assets/javascripts/calendar_date_select/locale/ru.js
  57. +0 −11 vendor/assets/javascripts/calendar_date_select/locale/sl.js
  58. +0 −9 vendor/assets/javascripts/calendar_date_select/locale/sv.js
  59. +1,530 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-addon.js
  60. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-af.js
  61. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ca.js
  62. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-cz.js
  63. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-de.js
  64. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-el.js
  65. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-es.js
  66. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-et.js
  67. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-fi.js
  68. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-fr-CA.js
  69. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-fr.js
  70. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-gl.js
  71. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-he.js
  72. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-hu.js
  73. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-id.js
  74. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-it.js
  75. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ja.js
  76. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ko.js
  77. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-lt.js
  78. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-nl.js
  79. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-no.js
  80. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-pl.js
  81. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-pt-BR.js
  82. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-pt.js
  83. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ro.js
  84. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ru.js
  85. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-sk.js
  86. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-sv.js
  87. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-tr.js
  88. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-vi.js
  89. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-zh-CN.js
  90. +20 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-zh-TW.js
  91. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-cz.js
  92. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-de.js
  93. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-en-GB.js
  94. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-es.js
  95. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-fr.js
  96. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-it.js
  97. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-ja.js
  98. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-pl.js
  99. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-pt-BR.js
  100. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-ru.js
  101. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-sv-SE.js
  102. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-th.js
  103. +23 −0 vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-zh-CN.js
  104. +0 −130 vendor/assets/stylesheets/calendar_date_select/blue.css
  105. +0 −135 vendor/assets/stylesheets/calendar_date_select/default.css
  106. +0 −142 vendor/assets/stylesheets/calendar_date_select/green.css
  107. +0 −128 vendor/assets/stylesheets/calendar_date_select/plain.css
  108. +0 −135 vendor/assets/stylesheets/calendar_date_select/red.css
  109. +0 −133 vendor/assets/stylesheets/calendar_date_select/silver.css
@@ -30,13 +30,14 @@
//= require crm_fields
//= require textarea_autocomplete
//= require crm_textarea_autocomplete
-//= require calendar_date_select/calendar_date_select
//= require event.simulate
//= require ajax-chosen-prototype
//= require crm_chosen
//= require search
//= require lists
//= require autocomplete-rails
+//= require datepicker
+//= require jquery_ui_datepicker/jquery-ui-timepicker-addon
//= require_self
<%
@@ -24,32 +24,6 @@ var crm = {
base_url : "",
//----------------------------------------------------------------------------
- date_select_popup: function(id, dropdown_id, show_time) {
- $(id).observe("focus", function() {
- if (!$(id).calendar_was_shown) { // The field recieved initial focus, show the calendar.
- var calendar = new CalendarDateSelect(this, { month_year: "label", year_range: 10, time: show_time, before_close: function() { this.calendar_was_shown = true } });
- if (dropdown_id) {
- calendar.buttons_div.build("span", { innerHTML: " | ", className: "button_seperator" });
- calendar.buttons_div.build("a", { innerHTML: "Back to List", href: "#", onclick: function() {
- calendar.close(); // Hide calendar popup.
- $(id).hide(); // Hide date edit field.
- $(dropdown_id).show(); // Show dropdown.
- $(dropdown_id).selectedIndex = 0; // Select first dopdown item.
- $(id).update(""); // Reset date field value.
- return false;
- }.bindAsEventListener(this) });
- }
- } else {
- $(id).calendar_was_shown = null; // Focus is back from the closed calendar, make it show up again.
- }
- });
-
- $(id).observe("blur", function() {
- $(id).calendar_was_shown = null; // Get the calendar ready if we loose focus.
- });
- },
-
- //----------------------------------------------------------------------------
find_form: function(class_name) {
var forms = $$('form.' + class_name);
return (forms.length > 0 ? forms[0].id : null);
@@ -0,0 +1,21 @@
+(($) ->
+
+ $('.datepicker').live 'click focus', ->
+ $(this).datepicker({
+ showOn: 'focus',
+ changeMonth: true,
+ dateFormat: $(this).data('datepicker-format') || 'yy-mm-dd'})
+
+ $('.datetimepicker').live 'click focus', ->
+ $(this).datetimepicker({
+ showOn: 'focus',
+ changeMonth: true,
+ dateFormat: $(this).data('datetimepicker-format') || 'yy-mm-dd'})
+
+ $('.timepicker').live 'click focus', ->
+ $(this).timepicker({
+ showOn: 'focus',
+ changeMonth: true,
+ dateFormat: $(this).data('timepicker-format') || 'HH:MM'})
+
+) jQuery
@@ -66,7 +66,11 @@ def clear_setting_cache
#----------------------------------------------------------------------------
def set_context
Time.zone = ActiveSupport::TimeZone[session[:timezone_offset]] if session[:timezone_offset]
- I18n.locale = Setting.locale if Setting.locale
+ if (locale = current_user.preference[:locale]).present?
+ I18n.locale = locale
+ elsif Setting.locale.present?
+ I18n.locale = Setting.locale
+ end
end
#----------------------------------------------------------------------------
@@ -299,15 +299,6 @@ def get_browser_timezone_offset
end
end
- #----------------------------------------------------------------------------
- def localize_calendar_date_select
- update_page_tag do |page|
- page.assign '_translations', { 'OK' => t('calendar_date_select.ok'), 'Now' => t('calendar_date_select.now'), 'Today' => t('calendar_date_select.today'), 'Clear' => t('calendar_date_select.clear') }
- page.assign 'Date.weekdays', t('date.abbr_day_names')
- page.assign 'Date.months', t('date.month_names')[1..-1]
- end
- end
-
# Users can upload their avatar, and if it's missing we're going to use
# gravatar. For leads and contacts we always use gravatars.
#----------------------------------------------------------------------------
@@ -247,17 +247,8 @@ def specific_time
#----------------------------------------------------------------------------
def parse_calendar_date
- translate_month_and_day_names!(self.calendar) unless I18n.locale == :"en-US"
-
- DateTime.strptime(self.calendar,
- I18n.t(Setting.task_calendar_with_time ? 'time.formats.mmddyyyy_hhmm' : 'date.formats.mmddyyyy')).utc
- end
-
- # Translates month and day names of a given datetime string.
- #----------------------------------------------------------------------------
- def translate_month_and_day_names!(date_string)
- translated = I18n.t([:month_names, :abbr_month_names, :day_names, :abbr_day_names], :scope => :date).flatten.compact
- original = (Date::MONTHNAMES + Date::ABBR_MONTHNAMES + Date::DAYNAMES + Date::ABBR_DAYNAMES).compact
- translated.each_with_index { |name, i| date_string.gsub!(name, original[i]) }
+ # always in 2012-10-28 06:28 format regardless of language
+ Time.parse(self.calendar)
end
+
end
@@ -8,11 +8,11 @@
%tr
%td
.label #{t :start_date}:
- = f.text_field :starts_on, :value => f.object.starts_on ? l(f.object.starts_on, :format => :mmddyyyy) : "", :style => "width:110px", :autocomplete => :off
+ = f.text_field :starts_on, :value => f.object.starts_on, :style => "width:110px", :autocomplete => :off, :class => 'datepicker'
%td= spacer
%td
.label #{t :end_date}:
- = f.text_field :ends_on, :value => f.object.ends_on ? l(f.object.ends_on, :format => :mmddyyyy) : "", :style => "width:110px", :autocomplete => :off
+ = f.text_field :ends_on, :value => f.object.ends_on, :style => "width:110px", :autocomplete => :off, :class => 'datepicker'
%td= spacer
%td
.label #{t :status}:
@@ -10,8 +10,6 @@ if @campaign.valid?
else
page[:create_campaign].replace_html :partial => "new"
page.call "crm.init_chosen_fields"
- page.call "crm.date_select_popup", :campaign_starts_on
- page.call "crm.date_select_popup", :campaign_ends_on
page[:create_campaign].visual_effect :shake, :duration => 0.25, :distance => 6
if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
page[:campaign_ends_on].focus
@@ -31,8 +31,6 @@ else # <---------------------------------------- Show [Edit Campaign] form.
page.call "crm.set_title", :edit_campaign, "#{t :edit} #{@campaign.name}"
end
- page.call "crm.date_select_popup", :campaign_starts_on
- page.call "crm.date_select_popup", :campaign_ends_on
page[:campaign_name].focus
end
@@ -6,8 +6,6 @@ unless params[:cancel].true?
page[:create_campaign].replace_html :partial => "new"
page.call "crm.init_chosen_fields"
page.call "crm.set_title", :create_campaign, t(:create_campaign)
- page.call "crm.date_select_popup", :campaign_starts_on
- page.call "crm.date_select_popup", :campaign_ends_on
else
page.call "crm.set_title", :create_campaign, t(:campaigns)
end
@@ -12,8 +12,6 @@ if @campaign.errors.empty?
end
else
page[id].replace_html :partial => "edit"
- page.call "crm.date_select_popup", :campaign_starts_on
- page.call "crm.date_select_popup", :campaign_ends_on
page[id].visual_effect :shake, :duration => 0.25, :distance => 6
if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
page[:campaign_ends_on].focus
@@ -6,14 +6,13 @@
== <!-- #{controller.controller_name} : #{controller.action_name} -->
= stylesheet_link_tag :application
= stylesheet_link_tag :print, :media => 'print'
- - unless tabless_layout?
- = stylesheet_link_tag 'calendar_date_select/default'
%style= yield :styles
= javascript_include_tag :application
- - unless tabless_layout?
- = javascript_include_tag "calendar_date_select/format_#{t(:calendar_date_select_format, :default => 'american')}"
+ - unless tabless_layout? || %w(en-US en-GB).include?(I18n.locale.to_s)
+ = javascript_include_tag "jquery_ui_datepicker/jquery.ui.datepicker-#{I18n.locale}"
+ = javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
= csrf_meta_tag
= hook(:javascript_includes, self)
@@ -35,12 +34,8 @@
= render "layouts/tabbed"
= render "layouts/footer"
- - unless tabless_layout? || I18n.locale == "en-US"
- = localize_calendar_date_select
-
%script{:type => "text/javascript"}
= "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
= get_browser_timezone_offset
= content_for :javascript_epilogue
= hook(:javascript_epilogue, self)
-
@@ -14,7 +14,7 @@
%tr
%td
.label #{t :close_date}:
- = f.text_field :closes_on, :value => f.object.closes_on ? l(f.object.closes_on, :format => :mmddyyyy) : "", :style => "width:110px;", :autocomplete => :off
+ = f.text_field :closes_on, :value => f.object.closes_on, :style => "width:110px;", :autocomplete => :off, :class => 'datepicker'
%td= spacer
%td
.label #{t :probability} (%):
@@ -49,4 +49,3 @@
- unless pending.background_info.blank?
%div
%dt= h(pending.background_info)
-
@@ -10,10 +10,11 @@
- bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap"
- if @task.bucket != "specific_time"
= f.select :bucket, @bucket, { :selected => bucket.to_sym }, { :style => "width:160px;", :onchange => "crm.flip_calendar(this.value)" }
- = f.text_field :calendar, :style => "width:160px; display:none;", :autocomplete => :off
+ = f.text_field :calendar, :style => "width:160px; display:none;", :autocomplete => :off, :class => 'datetimepicker'
- else
= f.select :bucket, @bucket, { :selected => :specific_time }, { :style => "width:160px; display:none;", :onchange => "crm.flip_calendar(this.value)" }
- = f.text_field :calendar, :value => (Setting.task_calendar_with_time ? l(f.object.due_at.localtime, :format => :mmddyyyy_hhmm) : l(f.object.due_at.to_date, :format => :mmddyyyy)), :style => "width:160px;", :autocomplete => :off
+ - fmt = Setting.task_calendar_with_time ? '%Y-%m-%d %H:%M' : '%Y-%m-%d'
+ = f.text_field :calendar, :value => f.object.due_at.strftime(fmt), :style => "width:160px;", :autocomplete => :off, :class => 'datetimepicker'
%td= spacer
%td
.label.req #{t :assign_to}:
@@ -46,9 +46,7 @@
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
# config.assets.precompile += %w( search.js )
- config.assets.precompile += ['print.css',
- 'calendar_date_select/default.css',
- /calendar_date_select\/[^\/]*\.js/]
+ config.assets.precompile += ['print.css']
# Enable threaded mode
# config.threadsafe!
@@ -663,16 +663,6 @@ cz:
mmddhhss: "%e %b v %H:%M"
mmddyyyy_hhmm: "%Y-%m-%d %H:%M"
- calendar_date_select:
- ok: OK
- now: Nyní
- today: Dnes
- clear: Smazat
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: iso_date
-
# will_paginate translations copied for 'en-US'
#----------------------------------------------------------------------------
will_paginate:
@@ -304,11 +304,6 @@ de:
completed: "Erledigt"
rejected: "Abgelehnt"
msg_password_changed: "Ihr Passwort wurde geändert."
- calendar_date_select:
- clear: "Zurücksetzen"
- now: "Jetzt"
- ok: "OK"
- today: "Heute"
pluralize:
comment:
other: "%{count} Kommentare"
@@ -608,7 +603,6 @@ de:
lead_permissions_intro_private: "Standardmäßig werden die Zugriffsregeln aus der Kampagne kopiert oder auf privat gesetzt. Dies kann auch später durchgeführt werden."
remember_me: "Erinnere mich"
edit_comment: "Kommentar bearbeiten"
- calendar_date_select_format: "euro_24hr"
no_tasks_pending: "wartend"
lead_summary: "Anfrage-Zusammenfassung"
task_small: "Aufgabe"
@@ -740,16 +740,6 @@ en-GB:
mmddhhss: "%e %b at %l:%M%p"
mmddyyyy_hhmm: "%Y-%m-%d %H:%M"
- calendar_date_select:
- ok: OK
- now: Now
- today: Today
- clear: Clear
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: iso_date
-
# will_paginate translations copied from 'en-US'
#----------------------------------------------------------------------------
will_paginate:
@@ -756,16 +756,6 @@ en-US:
mmddhhss: "%b %e at %l:%M%p"
mmddyyyy_hhmm: "%m/%d/%Y %l:%M %p"
- calendar_date_select:
- ok: OK
- now: Now
- today: Today
- clear: Clear
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: american
-
# will_paginate translations copied for 'en-US'
#----------------------------------------------------------------------------
will_paginate:
@@ -634,9 +634,3 @@
time:
formats:
mmddhhss: "%b %e at %l:%M%p"
-
- calendar_date_select:
- ok: Cancelar
- now: Ahora
- today: Hoy
- clear: Limpiar
@@ -627,9 +627,3 @@ fr-CA:
time:
formats:
mmddhhss: "%e %b à %l:%M%p"
-
- calendar_date_select:
- ok: OK
- now: Maintenant
- today: "Aujourd'hui"
- clear: Vider
@@ -718,16 +718,6 @@ fr:
mmddhhss: "%b %e à %H:%M%"
mmddyyyy_hhmm: "%d/%m/%Y à %H:%M"
- calendar_date_select:
- ok: OK
- now: Maintenant
- today: "Aujourd'hui"
- clear: Vider
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: french
-
# will_paginate translations copied for 'fr'
#----------------------------------------------------------------------------
will_paginate:
@@ -845,4 +835,3 @@ fr:
one: "Impossible d'enregistrer ce %{model} : 1 erreur"
other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
body: "Veuillez vérifier les champs suivants : "
-
@@ -652,14 +652,3 @@ it:
formats:
mmddhhss: "%b %e at %l:%M%p"
mmddyyyy_hhmm: "%d/%m/%Y %H:%M"
-
- calendar_date_select:
- ok: OK
- now: Ora
- today: Oggi
- clear: Pulisci
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: italian
-
@@ -624,13 +624,3 @@ ja:
formats:
mmddhhss: "%b %e at %l:%M%p"
mmddyyyy_hhmm: "%m/%d/%Y %l:%M %p"
-
- calendar_date_select:
- ok: OK
- now: Now
- today: Today
- clear: Clear
-
- # If you need custom format look at
- # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
- calendar_date_select_format: american
@@ -638,9 +638,3 @@ pl:
time:
formats:
mmddhhss: "%e %b o %H:%M"
-
- calendar_date_select:
- ok: OK
- now: Teraz
- today: Dziś
- clear: Wyczyść
Oops, something went wrong.

0 comments on commit d7cf909

Please sign in to comment.