From 9e14f93186d40830dd8e0243f2288dffb28b3390 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Sun, 20 Jul 2025 16:18:46 +0530
Subject: [PATCH] Properly handle when system language is selected

---
 .../org/schabi/newpipe/settings/ContentSettingsFragment.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index b98b8cb6c..ec217db3d 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -53,8 +53,9 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         } else {
             appLanguagePref.setOnPreferenceChangeListener((preference, newValue) -> {
                 final String language = (String) newValue;
-                final Locale locale = Locale.forLanguageTag(language);
-                AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(locale));
+                final String systemLang = getString(R.string.default_localization_key);
+                final String tag = systemLang.equals(language) ? null : language;
+                AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(tag));
                 return true;
             });
         }