From a7d34d49ada5bb2dea982a36537bfccdcee27da2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 18 Jan 2020 23:22:35 +0100
Subject: [PATCH] Add is to available locales (#12882)

Fix #12869
---
 app/helpers/settings_helper.rb | 1 +
 config/application.rb          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 39eb4180ef..10aaf3acaa 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -32,6 +32,7 @@ module SettingsHelper
     hy: 'Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶',
     id: 'Bahasa Indonesia',
     io: 'Ido',
+    is: 'Íslenska',
     it: 'Italiano',
     ja: '日本語',
     ka: 'ქართული',
diff --git a/config/application.rb b/config/application.rb
index 58e59fd51b..c1bc18a303 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,6 +70,7 @@ module Mastodon
       :hy,
       :id,
       :io,
+      :is,
       :it,
       :ja,
       :ka,
-- 
GitLab