diff --git a/lib/the_role/version.rb b/lib/the_role/version.rb index ea30189..fa43a51 100644 --- a/lib/the_role/version.rb +++ b/lib/the_role/version.rb @@ -1,3 +1,3 @@ module TheRole - VERSION = "2.1.0" + VERSION = "2.1.1" end diff --git a/spec/the_role_on_devise/app/assets/stylesheets/app/style.css.scss b/spec/the_role_on_devise/app/assets/stylesheets/app/style.css.scss index 721fdd1..bd53536 100644 --- a/spec/the_role_on_devise/app/assets/stylesheets/app/style.css.scss +++ b/spec/the_role_on_devise/app/assets/stylesheets/app/style.css.scss @@ -16,4 +16,8 @@ padding-bottom: 10px; border-bottom: 1px solid gray; } +} + +.edit_role{ + input{ margin: 0; } } \ No newline at end of file diff --git a/spec/the_role_on_devise/app/controllers/application_controller.rb b/spec/the_role_on_devise/app/controllers/application_controller.rb index a4aa9fc..fb34a02 100644 --- a/spec/the_role_on_devise/app/controllers/application_controller.rb +++ b/spec/the_role_on_devise/app/controllers/application_controller.rb @@ -19,7 +19,7 @@ def access_denied def set_locale locale = 'en' - langs = %w{ en ru es zh_CN } + langs = %w{ en ru es pl zh_CN } if params[:locale] lang = params[:locale] @@ -35,5 +35,6 @@ def set_locale end I18n.locale = locale + redirect_to(:back) if params[:locale] end end \ No newline at end of file diff --git a/spec/the_role_on_devise/app/views/layouts/application.html.haml b/spec/the_role_on_devise/app/views/layouts/application.html.haml index db972c2..dfd0fa3 100644 --- a/spec/the_role_on_devise/app/views/layouts/application.html.haml +++ b/spec/the_role_on_devise/app/views/layouts/application.html.haml @@ -61,6 +61,8 @@ \| = link_to 'zh_CN', '/?locale=zh_CN' \| + = link_to 'pl', '/?locale=pl' + \| %b = t '.current_locale' = I18n.locale \ No newline at end of file