nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2392

Browse source
This commit is contained in:
Jonne Hass 2011-11-13 22:37:18 +01:00
parent 4013335be9
commit 6526e2f305
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users_controller.rb
View file

@ -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]

6
config/locale_settings.yml
View file

@ -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"