From 5f69067d35cd868ccd3010642d42dbb596bb14bd Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 23 Nov 2017 10:17:59 +0200
Subject: [PATCH] Extract available languages

#640
---
 app/controllers/application_controller.rb | 8 ++++++++
 app/helpers/form_helper.rb                | 2 +-
 app/views/admin/settings/index.haml       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fac9d29f4..ff1e8eb26 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,6 +16,8 @@ class ApplicationController < ActionController::Base
   end
 
   helper_method :registrant_request?, :registrar_request?, :admin_request?, :current_root_url
+  helper_method :available_languages
+
   def registrant_request?
     request.path.match(/^\/registrant/)
   end
@@ -79,4 +81,10 @@ class ApplicationController < ActionController::Base
     return if params[parent_key][key].blank?
     params[parent_key][key].sub!(/,/, '.')
   end
+
+  private
+
+  def available_languages
+    { en: 'English', et: 'Estonian' }.invert
+  end
 end
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index 5cd5998eb..f82fee682 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -14,7 +14,7 @@ module FormHelper
   end
 
   def language_select(object, method, choices = nil, options = {}, html_options = {}, &block)
-    choices = options_for_select({ en: 'English', et: 'Estonian' }.invert, options[:selected])
+    choices = options_for_select(available_languages, options[:selected])
     select(object, method, choices, options, html_options, &block)
   end
 end
diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index 9c302cc53..c41f5cd6b 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -54,7 +54,7 @@
             %td.col-md-6= label_tag :default_language
             %td.col-md-6
               = select_tag '[settings][default_language]',
-              options_for_select({ en: 'English', et: 'Estonian' }.invert, Setting.default_language),
+              options_for_select(available_languages, Setting.default_language),
               class: 'form-control'
 
   .panel.panel-default