Merge pull request #3909 from wikimedia/NorwegianAdjustments

Ensure ISO code 'nb' becomes wiki language code 'no' within the app
wikimedia · Apr 7, 2021 · 6ec68e6 · 6ec68e6
2 parents 9da096c + de19547
commit 6ec68e6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -79,5 +79,10 @@
         "latn": {
             "default": "uz-latin",
         }
+    },
+    "nb": {
+        "default": {
+            "default": "no",
+        }
     }
 }
diff --git 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"