ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-14 13:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix country for undefined

Browse source
This commit is contained in:
Ari Timonen 2020-03-16 03:12:22 +02:00
parent 0e64bb9333
commit 9952bf52b5
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Gemfile.lock
View file

@ -1,9 +1,3 @@
GIT
remote: git://github.com/anton-zaytsev/acts_as_rateable.git
revision: 01066eceb2d16e35be437b7392cc3375f1f377f7
specs:
acts_as_rateable (3.0.0)
GIT GIT
remote: https://github.com/koraktor/steam-condenser-ruby.git remote: https://github.com/koraktor/steam-condenser-ruby.git
revision: 2cb441f0518a0b8d20a017dfcc42783ae878311a revision: 2cb441f0518a0b8d20a017dfcc42783ae878311a
@ -333,7 +327,6 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
active_link_to (~> 1.0.2) active_link_to (~> 1.0.2)
active_record_union active_record_union
acts_as_rateable!
annotate annotate
bbcoder (~> 1.0.1) bbcoder (~> 1.0.1)
better_errors better_errors

4
app/models/user.rb
View file

@ -145,7 +145,11 @@ class User < ActiveRecord::Base
def country_s def country_s
country_object = ISO3166::Country[country] country_object = ISO3166::Country[country]
if country_object
country_object.translations[I18n.locale.to_s] || country_object.name country_object.translations[I18n.locale.to_s] || country_object.name
else
"Unknown"
end
end end
def realname def realname