From 689c10b618c6c469ce82a7f09e117567def577de Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 23 Apr 2014 14:58:30 +0200 Subject: simple form: add wrapped and loading... buttons #5542 the loading... text on the buttons was not capitalized before. So in order to change this in a (more or less) single place i added new button types to simple_form: button :wrapped - normal button, with loading and an optional cancel button wrapped in the classical bootstrap action div. cancel option contains the url to go to when canceling. button :loading - simple button with loading text capitalized by using i18n (simple_form.buttons.loading) Conflicts: engines/support/app/views/tickets/new.html.haml --- config/locales/simple_form.en.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config/locales') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 0df11fe..4beeb7d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -10,6 +10,9 @@ en: # html: '*' error_notification: default_message: "Please review the problems below:" + buttons: + cancel: 'Cancel' + loading: 'Loading...' # Labels and hints examples # labels: # defaults: -- cgit v1.2.3 From ed3575856276f25b7c8253e302646dc7684a5da8 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 25 Apr 2014 08:09:10 +0200 Subject: use i18n keys for signup & login buttons --- config/locales/simple_form.en.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/locales') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 4beeb7d..5d0c675 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -26,4 +26,11 @@ en: # defaults: # username: 'User name to sign in.' # password: 'No special characters, please.' + helpers: + submit: + user: + create: "Sign up" + update: "Save" + session: + create: "Log in" -- cgit v1.2.3