From c5e2cb780b43417b73ffc439a6ba0b21c24c4fa5 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Fri, 21 Dec 2018 19:25:51 +0100
Subject: [PATCH] Add Norwegian - prepares 1.50-beta-3

---
 .../gouv/etalab/mastodon/fragments/SettingsFragment.java   | 3 +++
 .../main/java/fr/gouv/etalab/mastodon/helper/Helper.java   | 7 ++++++-
 app/src/main/res/values/strings.xml                        | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index c305a08d9..a5aa6cd89 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -726,6 +726,9 @@ public class SettingsFragment extends Fragment {
                         case 18:
                             editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ru");
                             editor.commit();
+                        case 19:
+                            editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "no");
+                            editor.commit();
                             break;
                     }
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index e0ac18a35..f1e3b3076 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -2956,7 +2956,7 @@ public class Helper {
     }
 
     public static String[] getLocales(Context context){
-        String[] locale = new String[19];
+        String[] locale = new String[20];
         locale[0] = context.getString(R.string.default_language);
         locale[1] = context.getString(R.string.english);
         locale[2] = context.getString(R.string.french);
@@ -2976,6 +2976,7 @@ public class Helper {
         locale[16] = context.getString(R.string.serbian);
         locale[17] = context.getString(R.string.ukrainian);
         locale[18] = context.getString(R.string.russian);
+        locale[19] = context.getString(R.string.norwegian);
         return locale;
     }
 
@@ -3028,6 +3029,8 @@ public class Helper {
                 return "uk";
             case R.string.russian:
                 return "ru";
+            case R.string.norwegian:
+                return "no";
             default:
                 return Locale.getDefault().getLanguage();
         }
@@ -3076,6 +3079,8 @@ public class Helper {
                 return 17;
             case "ru":
                 return 18;
+            case "no":
+                return 19;
             default:
                 return 0;
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fef513d5..9a4a041bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -765,6 +765,7 @@
     <string name="serbian" translatable="false">Српски</string>
     <string name="ukrainian" translatable="false">Українська</string>
     <string name="russian" translatable="false">Русский</string>
+    <string name="norwegian" translatable="false">Norsk</string>
     <string name="show_media_only">Media only</string>
     <string name="show_media_nsfw">Show NSFW</string>
     <!-- end languages -->