aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisha M.-Kupriyanov <kupriyanov@strato.de>2024-03-15 10:40:54 +0100
committerJoas Schilling <coding@schilljs.com>2024-06-21 11:30:02 +0200
commite2676f0fa7901f17d9d51ea95b1db15901950939 (patch)
tree4bfd8958cb1cb8f60c0ee630878332cb171c1b59
parent425e2d0172625443e32b7e7178fc0bca0579d24a (diff)
downloadnextcloud-server-feat/reduce_available_languages_set.tar.gz
nextcloud-server-feat/reduce_available_languages_set.zip
feat: reduce available languages per config value "reduce_to_languages"feat/reduce_available_languages_set
Example: restrict to en, de, es, fr, it' languages ./occ config:system:set reduce_to_languages 0 --value en ./occ config:system:set reduce_to_languages 1 --value de ./occ config:system:set reduce_to_languages 2 --value es ./occ config:system:set reduce_to_languages 3 --value fr ./occ config:system:set reduce_to_languages 4 --value it Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
-rw-r--r--lib/private/L10N/Factory.php4
-rw-r--r--tests/lib/L10N/FactoryTest.php47
2 files changed, 51 insertions, 0 deletions
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
index 1825719fb75..6b6dc5d3b40 100644
--- a/lib/private/L10N/Factory.php
+++ b/lib/private/L10N/Factory.php
@@ -576,6 +576,10 @@ class Factory implements IFactory {
}
$languageCodes = $this->findAvailableLanguages();
+ $reduceToLanguages = $this->config->getSystemValue('reduce_to_languages', []);
+ if (!empty($reduceToLanguages)) {
+ $languageCodes = array_intersect($languageCodes, $reduceToLanguages);
+ }
$commonLanguages = [];
$otherLanguages = [];
diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php
index 771ce75d3e9..16113c0972f 100644
--- a/tests/lib/L10N/FactoryTest.php
+++ b/tests/lib/L10N/FactoryTest.php
@@ -700,6 +700,53 @@ class FactoryTest extends TestCase {
self::assertSame($expected, $result);
}
+ public static function dataTestReduceToLanguages(): array {
+ return [
+ ['en', ['en', 'de', 'fr', 'it', 'es'], ['en', 'fr', 'de'], ['en', 'fr', 'de']],
+ ['en', ['en', 'de', 'fr', 'it', 'es'], ['en', 'de'], ['en', 'de']],
+ ['en', ['en', 'de', 'fr', 'it', 'es'], [], ['de', 'en', 'es', 'fr', 'it']],
+ ];
+ }
+
+ /**
+ * test
+ * - if available languages set can be reduced by configuration
+ * - if available languages set is not reduced to an empty set if
+ * the reduce config is an empty set
+ *
+ * @dataProvider dataTestReduceToLanguages
+ *
+ * @param string $lang
+ * @param array $availableLanguages
+ * @param array $reducedLanguageSet
+ * @param array $expected
+ */
+ public function testReduceLanguagesByConfiguration(string $lang, array $availableLanguages, array $reducedLanguageSet, array $expected): void {
+ $factory = $this->getFactory(['findAvailableLanguages', 'languageExists']);
+ $factory->expects(self::any())
+ ->method('languageExists')->willReturn(true);
+ $factory->expects(self::any())
+ ->method('findAvailableLanguages')
+ ->willReturnCallback(function ($app) use ($availableLanguages) {
+ return $availableLanguages;
+ });
+
+ $this->config
+ ->method('getSystemValue')
+ ->willReturnMap([
+ ['force_language', false, false],
+ ['default_language', false, $lang],
+ ['reduce_to_languages', [], $reducedLanguageSet]
+ ]);
+
+ $result = $this->invokePrivate($factory, 'getLanguages');
+ $commonLanguagesCodes = array_map(function ($lang) {
+ return $lang['code'];
+ }, $result['commonLanguages']);
+
+ self::assertEqualsCanonicalizing($expected, $commonLanguagesCodes);
+ }
+
public function languageIteratorRequestProvider():array {
return [
[ true, $this->createMock(IUser::class)],