diff options
author | Jonne Hass <mrzyx@mrzyx.de> | 2011-11-14 01:37:18 +0400 |
---|---|---|
committer | Jonne Hass <mrzyx@mrzyx.de> | 2011-11-14 01:37:18 +0400 |
commit | 6526e2f3058da2e900f77c32dfab38085b19273b (patch) | |
tree | 95e5eeae6e81a2243f897270c0fc623b128bb7d9 | |
parent | 4013335be94c40cfd2600ffce15357328787768d (diff) |
fix #2392
-rw-r--r-- | app/controllers/users_controller.rb | 4 | ||||
-rw-r--r-- | config/locale_settings.yml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 018b4df76..c1215bdad 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -56,9 +56,9 @@ class UsersController < ApplicationController elsif u[:language] if @user.update_attributes(u) I18n.locale = @user.language - flash[:notice] = I18n.t 'users.update.language_updated' + flash[:notice] = I18n.t 'users.update.language_changed' else - flash[:error] = I18n.t 'users.update.language_not_updated' + flash[:error] = I18n.t 'users.update.language_not_changed' end elsif u[:email] @user.unconfirmed_email = u[:email] diff --git a/config/locale_settings.yml b/config/locale_settings.yml index 58c6700a4..1cd255340 100644 --- a/config/locale_settings.yml +++ b/config/locale_settings.yml @@ -15,9 +15,9 @@ available: en_pirate: "English (Pirate)" en_shaw: "š¦šš¤š¦š" eo: "Esperanto" - es: "EspaƱol" - es-AR: "Castellano" - es-CL: "EspaƱol Chileno" + es: "Castellano" + es-AR: "Argentino" + es-CL: "Chileno" eu: "Euskara" fi: "Suomi" fr: "FranƧais" |