fix: language filter

This commit is contained in:
2025-04-30 21:39:41 -05:00
parent 8970ca0f8f
commit f10168a1a7
7 changed files with 180 additions and 14 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Torrentio\Result;
use App\Util\CountryCodes;
use App\Util\CountryLanguages;
use Nihilarr\PTN;
class ResultFactory
@@ -89,13 +90,14 @@ class ResultFactory
});
$languages = array_map(function ($flag) {
return CountryCodes::convertFromAbbr(strtoupper(substr($flag['short_name'], strlen('flag-'))));
return CountryLanguages::fromCountryCode(strtoupper(substr($flag['short_name'], strlen('flag-'))));
},
$flags);
if (count($languages) > 0) {
return array_values($languages);
} else {
return ["English"];
return ["English (US)"];
}
}

View File

@@ -11,6 +11,7 @@ use App\User\Framework\Entity\User;
use App\User\Framework\Entity\UserPreference;
use App\User\Framework\Repository\PreferencesRepository;
use App\Util\CountryCodes;
use App\Util\CountryLanguages;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\Response;
@@ -36,11 +37,14 @@ class PreferencesController extends AbstractController
$userPreferences = Map::from($userPreferences)
->rekey(fn($preference) => $preference->getPreference()->getId());
$languages = CountryLanguages::$languages;
sort($languages);
return $this->render(
'user/preferences.html.twig',
[
'preferences' => $this->preferencesRepository->findEnabled(),
'languages' => CountryCodes::$countries,
'languages' => $languages,
'providers' => ['test' => 'Test'],
'userPreferences' => $userPreferences->toArray(),
]
@@ -55,11 +59,14 @@ class PreferencesController extends AbstractController
$userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
$userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
$languages = CountryLanguages::$languages;
sort($languages);
return $this->render(
'user/preferences.html.twig',
[
'preferences' => $this->preferencesRepository->findEnabled(),
'languages' => CountryCodes::$countries,
'languages' => $languages,
'providers' => ['test' => 'Test'],
'userPreferences' => $userPreferences->toArray(),
]

View File

@@ -0,0 +1,140 @@
<?php
namespace App\Util;
class CountryLanguages
{
public static $languages = [
'English (US)',
'English',
'French',
'German',
'Italian',
'Spanish',
'Portuguese',
'Mandarin',
'Japanese',
'Korean',
'Russian',
'Hindi',
'Arabic',
'Dutch',
'Swedish',
'Norwegian',
'Danish',
'Finnish',
'Polish',
'Turkish',
'Persian',
'Thai',
'Vietnamese',
'Indonesian',
'Urdu',
'Bengali',
'Ukrainian',
'Greek',
'Hebrew',
'Malay',
'Filipino'
];
public static function fromCountryCode(string $countryCode): string
{
$countryLanguages = [
'US' => 'English (US)',
'GB' => 'English',
'CA' => 'English', // Note: French is also official in parts of Canada
'FR' => 'French',
'DE' => 'German',
'IT' => 'Italian',
'ES' => 'Spanish',
'MX' => 'Spanish',
'BR' => 'Portuguese',
'PT' => 'Portuguese',
'CN' => 'Mandarin',
'JP' => 'Japanese',
'KR' => 'Korean',
'RU' => 'Russian',
'IN' => 'Hindi', // Note: India has multiple official languages
'SA' => 'Arabic',
'EG' => 'Arabic',
'ZA' => 'English', // South Africa has 11 official languages
'NG' => 'English',
'AU' => 'English',
'AR' => 'Spanish',
'CH' => 'German', // Also French, Italian, Romansh
'BE' => 'Dutch', // Also French and German
'NL' => 'Dutch',
'SE' => 'Swedish',
'NO' => 'Norwegian',
'DK' => 'Danish',
'FI' => 'Finnish',
'PL' => 'Polish',
'TR' => 'Turkish',
'IR' => 'Persian',
'TH' => 'Thai',
'VN' => 'Vietnamese',
'ID' => 'Indonesian',
'PK' => 'Urdu',
'BD' => 'Bengali',
'UA' => 'Ukrainian',
'GR' => 'Greek',
'IL' => 'Hebrew',
'MY' => 'Malay',
'PH' => 'Filipino',
'KE' => 'English', // Also Swahili
];
return $countryLanguages[$countryCode];
}
public static function fromCountryName(string $countryName): string
{
$countryLanguages = [
'United States' => 'English (US)',
'United Kingdom' => 'English',
'Canada' => 'English', // French is also official
'France' => 'French',
'Germany' => 'German',
'Italy' => 'Italian',
'Spain' => 'Spanish',
'Mexico' => 'Spanish',
'Brazil' => 'Portuguese',
'Portugal' => 'Portuguese',
'China' => 'Mandarin',
'Japan' => 'Japanese',
'South Korea' => 'Korean',
'Russia' => 'Russian',
'India' => 'Hindi', // Also English and many regional languages
'Saudi Arabia' => 'Arabic',
'Egypt' => 'Arabic',
'South Africa' => 'English', // One of 11 official languages
'Nigeria' => 'English',
'Australia' => 'English',
'Argentina' => 'Spanish',
'Switzerland' => 'German', // Also French, Italian, Romansh
'Belgium' => 'Dutch', // Also French and German
'Netherlands' => 'Dutch',
'Sweden' => 'Swedish',
'Norway' => 'Norwegian',
'Denmark' => 'Danish',
'Finland' => 'Finnish',
'Poland' => 'Polish',
'Turkey' => 'Turkish',
'Iran' => 'Persian',
'Thailand' => 'Thai',
'Vietnam' => 'Vietnamese',
'Indonesia' => 'Indonesian',
'Pakistan' => 'Urdu',
'Bangladesh' => 'Bengali',
'Ukraine' => 'Ukrainian',
'Greece' => 'Greek',
'Israel' => 'Hebrew',
'Malaysia' => 'Malay',
'Philippines' => 'Filipino',
'Kenya' => 'English', // Also Swahili
];
return $countryLanguages[$countryName];
}
}