Skip to content

Fix jquery ui datetime picker CSS and I18n #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix jquery ui datetime picker CSS and I18n #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/assets/stylesheets/active_scaffold.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
ActiveScaffold is freely distributable under the terms of an MIT-style license.

For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
*= require_self
*= require "active_scaffold_jquery_ui"
*= require "active_scaffold_extensions"
*/
@import 'active_scaffold_jquery_ui';
@import 'active_scaffold_extensions';

@import 'active_scaffold_layout';
@import 'active_scaffold_images';
Expand Down
7 changes: 7 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,10 @@ en:
time:
formats:
picker: "%a, %d %b %Y %H:%M:%S"
datetime:
prompts:
hour: Hour
minute: Minute
second: Second
millisec: Millisecond
microsec: Microsecond
4 changes: 3 additions & 1 deletion lib/active_scaffold/bridges/date_picker/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def self.datetime_options(locale)
ampm: false,
hourText: I18n.translate!('datetime.prompts.hour', locale: locale),
minuteText: I18n.translate!('datetime.prompts.minute', locale: locale),
secondText: I18n.translate!('datetime.prompts.second', locale: locale)
secondText: I18n.translate!('datetime.prompts.second', locale: locale),
millisecText: I18n.translate!('datetime.prompts.millisec', locale: locale),
microsecText: I18n.translate!('datetime.prompts.microsec', locale: locale)
}

as_datetime_picker_options = I18n.translate! :datetime_picker_options, scope: :active_scaffold, locale: locale, default: ''
Expand Down
Loading