diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cd010f9..d04b380 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -17,15 +17,10 @@ redirect_to root_url, alert: _('You need to sign in or sign up before continuing.') end - before_filter :get_languages before_filter :set_gettext_locale after_filter :store_location - def get_languages - @languages = Language.sorted_by_abbreviation - end - # Sets FastGettext locale for every request made def set_gettext_locale FastGettext.locale = session[:locale] || FastGettext.default_locale diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index e355bf6..4ed662d 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -52,20 +52,22 @@
  • > <%= link_to _('Public DMPs'), public_plans_path %>
  • - - + <% if MANY_LANGUAGES %> + + + <% end %> <% end %> diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb new file mode 100644 index 0000000..46e70f4 --- /dev/null +++ b/config/initializers/constants.rb @@ -0,0 +1,2 @@ +LANGUAGES = Language.sorted_by_abbreviation +MANY_LANGUAGES = Language.many? \ No newline at end of file diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 2e0a2de..393eb4d 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,5 +1,5 @@ def get_available_locales - languages = Language.sorted_by_abbreviation() + languages = LANGUAGES # LANGUAGES is defined in config/initializers/constants.rb locales = [] languages.each do |l| locales << l.abbreviation