diff --git a/composer.json b/composer.json index e69ece495d558dfa997d92926fdeb1f18c74ca0c..6665f8ea277e176a98a873b05cc01c22c3057cca 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "symfony/http-kernel": "^5.4||^6", "symfony/intl": "^5.4||^6", "symfony/routing": "^5.4||^6", - "symfony/translation-contracts": "^2.5", + "symfony/translation-contracts": "^2.5||^3", "symfony/twig-bridge": "^5.4||^6", "symfony/var-exporter": "^5.4||^6", "symfony/yaml": "^5.4||^6", diff --git a/composer.lock b/composer.lock index b767a5a4f9e2443311b22709060d28958a330671..ab9488760f17a671bbd5f8ab15889475f4545f29 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f344a9e5ad324e3d1f9c0b01a1dad30b", + "content-hash": "e390f66c66616d117c9f23bbe564a497", "packages": [ { "name": "composer/ca-bundle", @@ -3628,20 +3628,20 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" + "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282", + "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282", "shasum": "" }, "require": { - "php": ">=7.2.5" + "php": ">=8.0.2" }, "suggest": { "symfony/translation-implementation": "" @@ -3649,7 +3649,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -3686,7 +3686,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2" }, "funding": [ { @@ -3702,7 +3702,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2022-06-27T17:10:44+00:00" }, { "name": "symfony/twig-bridge", diff --git a/src/SimpleSAML/Locale/TwigTranslator.php b/src/SimpleSAML/Locale/TwigTranslator.php index c326cc62c3e85948ef804781416e806e192a515e..45149236ebac09f17bb9daa9b96731a2d9282dd9 100644 --- a/src/SimpleSAML/Locale/TwigTranslator.php +++ b/src/SimpleSAML/Locale/TwigTranslator.php @@ -36,10 +36,18 @@ class TwigTranslator implements TranslatorInterface * @param string|null $domain * @param string|null $locale */ - public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null) + public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string { $this->locale = $locale; return call_user_func_array($this->translator, func_get_args()); } + + /** + * Returns the default locale. + */ + public function getLocale(): string + { + return Language::FALLBACKLANGUAGE; + } }