diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/simple_form.rb | 8 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index e0c22e0c2..065999d0b 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -5,8 +5,7 @@ SimpleForm.setup do |config| # wrapper, change the order or even add your own to the # stack. The options given below are used to wrap the # whole input. - config.wrappers :default, class: :input, - hint_class: :field_with_hint, error_class: :field_with_errors do |b| + config.wrappers :default, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b| ## Extensions enabled by default # Any of these extensions can be disabled for a # given input by passing: `f.input EXTENSION_NAME => false`. @@ -51,12 +50,11 @@ SimpleForm.setup do |config| # b.use :full_error, wrap_with: { tag: :span, class: :error } end - config.wrappers :with_label, class: :input, - hint_class: :field_with_hint, error_class: :field_with_errors do |b| + config.wrappers :with_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b| b.use :html5 + b.use :label_input b.use :hint, wrap_with: { tag: :span, class: :hint } b.use :error, wrap_with: { tag: :span, class: :error } - b.use :label_input end # The default wrapper to be used by the FormBuilder. diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 516d79b08..deecff3fd 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -15,6 +15,7 @@ en: note: Bio password: Password username: Username + locked: Make account private interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow @@ -23,6 +24,9 @@ en: follow: Send e-mail when someone follows you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone reblogs your status + hints: + defaults: + locked: Requires you to approve followers, defaults post privacy to followers-only and disables federation 'no': 'No' required: mark: "*" |