summaryrefslogtreecommitdiff
path: root/core/config
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-08 11:30:35 -0700
committerjessib <jessib@leap.se>2013-07-08 11:30:35 -0700
commitfc3c5994df61de04b8b17b495a638efc0d760126 (patch)
tree644aa93dfd0a6da2ed9b20ba688712fb9082f425 /core/config
parentcfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/disable_account
Conflicts: users/app/controllers/users_controller.rb users/app/helpers/users_helper.rb users/app/views/users/edit.html.haml users/app/views/users/show.html.haml users/config/locales/en.yml
Diffstat (limited to 'core/config')
-rw-r--r--core/config/initializers/simple_form_bootstrap.rb12
-rw-r--r--core/config/locales/en.yml30
2 files changed, 42 insertions, 0 deletions
diff --git a/core/config/initializers/simple_form_bootstrap.rb b/core/config/initializers/simple_form_bootstrap.rb
index 1a22967..c949f5e 100644
--- a/core/config/initializers/simple_form_bootstrap.rb
+++ b/core/config/initializers/simple_form_bootstrap.rb
@@ -37,6 +37,18 @@ SimpleForm.setup do |config|
end
end
+ #
+ # when you don't want any bootstrap "control-group" or "controls" wrappers.
+ #
+ config.wrappers :none, :tag => 'div', :error_class => 'error' do |b|
+ b.use :html5
+ b.use :placeholder
+ b.use :label
+ b.use :input
+ b.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+ b.use :hint, :wrap_with => { :tag => 'p', :class => 'help-block' }
+ end
+
# Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
# Check the Bootstrap docs (http://twitter.github.com/bootstrap)
# to learn about the different styles for forms and inputs,
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
new file mode 100644
index 0000000..25b377a
--- /dev/null
+++ b/core/config/locales/en.yml
@@ -0,0 +1,30 @@
+en:
+ no_such_thing: "No such %{thing}."
+ thing_was_successfully_created: "%{thing} was successfully created."
+ create_thing: "Create %{thing}"
+
+ overview: "Overview"
+ user_control_panel: "user control panel"
+
+ created: "Created"
+ created_by_on: "Created by %{user} on %{time}"
+ updated: "Updated"
+
+ none: "None"
+ unknown: "Unknown"
+ admin: "Admin"
+ anonymous: "Anonymous"
+ save: "Save"
+ add: "Add"
+ remove: "Remove"
+ changes_saved: "Changes saved successfully."
+ are_you_sure: "Are you sure? This change cannot be undone."
+
+ download_client: "Download Bitmask"
+ download_client_info: "The Bitmask application allows you to use %{provider} services. It is available for Linux, Mac, Windows, and Android."
+ login_info: "Log in to change your account settings, create support tickets, and manage payments."
+ signup_info: "Sign up for a new user account via this website (it is better if you use the Bitmask application to sign up, but this website works too)."
+ welcome: "Welcome to %{provider}."
+ get_help: "Get Help"
+ help_info: "Can't login? Create a new support ticket anonymously."
+ example_email: 'user@domain.org'