Fixing the nearbyController default language

Also fixes the settingsFragment to select different primary and secondary description labels.

Author: Adith101

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

@@ -147,7 +147,8 @@ public String getPlacesAsGPX(LatLng currentLocation) throws Exception {
      */
     public List<Place> getPlaces(List<Place> placeList) throws Exception {
         String secondaryLanguages = defaultKvStore.getString(Prefs.SECONDARY_LANGUAGES, "");
-        return nearbyPlaces.getPlaces(placeList, Locale.getDefault().getLanguage(), secondaryLanguages);
+        String primaryLanguage = defaultKvStore.getString(Prefs.DESCRIPTION_LANGUAGE, "");
+        return nearbyPlaces.getPlaces(placeList, primaryLanguage, secondaryLanguages);
     }
 
     public static LatLng calculateNorthEast(double latitude, double longitude, double distance) {

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt

@@ -309,14 +309,23 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     private fun prepareSecondaryLanguagesDialog() {
         val languageCode = getCurrentLanguageCode("descriptionSecondaryLanguagesPref")
+        val defaultCode = getCurrentLanguageCode("descriptionDefaultLanguagePref")
         val selectedLanguages = hashMapOf<Int, String>()
+
+        var deflocale = Locale.getDefault()
+
+
+        if (defaultCode != null){
+            deflocale = createLocale(defaultCode)
+        }
+
         languageCode?.let {
-            selectedLanguages[0] = Locale.getDefault().language
+            selectedLanguages[0] = deflocale.language
         }
 
         val savedLanguages = arrayListOf<Language>()
         languageCode?.split(",\\s*".toRegex())?.forEach { code ->
-            if (code != Locale.getDefault().language) {
+            if (code != deflocale.language) {
                 val locale = Locale(code)
                 savedLanguages.add(Language(locale.displayLanguage, code))
             }