Skip to content

Commit 997334e

Browse files
authored
Merge pull request #599 from OPUS4/issue598
#598 Trim configured 'supportedLanguages'
2 parents 31134ac + 3b7fb4c commit 997334e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

library/Application/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function getSupportedLanguages()
125125
if (is_null($this->supportedLanguages)) {
126126
$config = $this->getConfig();
127127
if (isset($config->supportedLanguages)) {
128-
$this->supportedLanguages = explode(',', $config->supportedLanguages);
128+
$this->supportedLanguages = array_map('trim', explode(',', $config->supportedLanguages));
129129
/* TODO only used for debugging - remove?
130130
$this->getLogger()->debug(
131131
Zend_Debug::dump(

tests/library/Application/ConfigurationTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ public function testIsLanguageSelectionEnabledTrue()
124124
$this->assertTrue($this->config->isLanguageSelectionEnabled());
125125
}
126126

127+
public function testGetSupportedLanguagesValuesAreTrimmed()
128+
{
129+
$this->adjustConfiguration([
130+
'supportedLanguages' => 'en, de'
131+
]);
132+
133+
$this->assertEquals(['en', 'de'], $this->config->getSupportedLanguages());
134+
}
135+
127136
public function testIsLanguageSelectionEnabledFalse()
128137
{
129138
Config::get()->supportedLanguages = 'de';

0 commit comments

Comments
 (0)