From 6beab0566e397ba4411fd802261d909793fa9dc6 Mon Sep 17 00:00:00 2001
From: James Dempsey <dempsey@tapas-software.net>
Date: Wed, 7 Apr 2021 13:30:44 -0700
Subject: [PATCH] Ensure ISO code 'nb' becomes wiki language code 'no' within
 the app - Add mapping from locale 'nb' to wikimedia language code 'no' - Add
 mapping from 'nb' to 'no' as part of language variant settings migration -
 Fix typo in description string of MWKLangaugeLink.m

---
 .../MWKDataStore+LanguageVariantMigration.swift        | 10 +++++++---
 WMF Framework/MediaWikiAcceptLanguageMapping.json      |  5 +++++
 Wikipedia/Code/MWKLanguageLink.m                       |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WMF Framework/MWKDataStore+LanguageVariantMigration.swift b/WMF Framework/MWKDataStore+LanguageVariantMigration.swift
index b02147b84a5..04587d9378a 100644
--- a/WMF Framework/MWKDataStore+LanguageVariantMigration.swift	
+++ b/WMF Framework/MWKDataStore+LanguageVariantMigration.swift	
@@ -52,9 +52,13 @@ extension MWKDataStore {
             result[languageCode] = languageVariantCode
         }
         
-        languageLinkController.migratePreferredLanguages(toLanguageVariants: migrationMapping, in: moc)
-        feedContentController.migrateExploreFeedSettings(toLanguageVariants: migrationMapping, in: moc)
-        migrateSearchLanguageSetting(toLanguageVariants: migrationMapping)
+        // Ensure any settings that currently use 'nb' are updated to use 'no'
+        var languageCodeMigrationMapping = migrationMapping
+        languageCodeMigrationMapping["nb"] = "no"
+        
+        languageLinkController.migratePreferredLanguages(toLanguageVariants: languageCodeMigrationMapping, in: moc)
+        feedContentController.migrateExploreFeedSettings(toLanguageVariants: languageCodeMigrationMapping, in: moc)
+        migrateSearchLanguageSetting(toLanguageVariants: languageCodeMigrationMapping)
         migrateWikipediaEntities(toLanguageVariants: migrationMapping, in: moc)
     }
     
diff --git a/WMF Framework/MediaWikiAcceptLanguageMapping.json b/WMF Framework/MediaWikiAcceptLanguageMapping.json
index fdde91115e5..1882d12f072 100644
--- a/WMF Framework/MediaWikiAcceptLanguageMapping.json	
+++ b/WMF Framework/MediaWikiAcceptLanguageMapping.json	
@@ -79,5 +79,10 @@
         "latn": {
             "default": "uz-latin",
         }
+    },
+    "nb": {
+        "default": {
+            "default": "no",
+        }
     }
 }
diff --git a/Wikipedia/Code/MWKLanguageLink.m b/Wikipedia/Code/MWKLanguageLink.m
index e04fcd01fe8..a3ec7fe2a9c 100644
--- a/Wikipedia/Code/MWKLanguageLink.m
+++ b/Wikipedia/Code/MWKLanguageLink.m
@@ -55,7 +55,7 @@ - (NSString *)description {
                          @"%@ { \n"
                           "\tlanguageCode: %@, \n"
                           "\tlanguageVariantCode: %@, \n"
-                          "\altISOCode: %@, \n"
+                          "\taltISOCode: %@, \n"
                           "\tpageTitleText: %@, \n"
                           "\tname: %@, \n"
                           "\tlocalizedName: %@ \n"