mirror of
https://github.com/humhub/humhub.git
synced 2025-04-20 23:21:54 +02:00
Merge branch 'master' into develop
This commit is contained in:
commit
04eea8e818
@ -103,4 +103,40 @@ class Formatter extends \yii\i18n\Formatter
|
||||
return Yii::t('base', '{nFormatted}B', $params, $this->language); // Billion
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix unicode chars
|
||||
*
|
||||
* @param string $value
|
||||
* @return string
|
||||
*/
|
||||
private function fixUnicodeChars($value): string
|
||||
{
|
||||
// Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible.
|
||||
return str_replace(' ', ' ', $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function asDate($value, $format = null)
|
||||
{
|
||||
return $this->fixUnicodeChars(parent::asDate($value, $format));
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function asTime($value, $format = null)
|
||||
{
|
||||
return $this->fixUnicodeChars(parent::asTime($value, $format));
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function asDatetime($value, $format = null)
|
||||
{
|
||||
return $this->fixUnicodeChars(parent::asDatetime($value, $format));
|
||||
}
|
||||
}
|
||||
|
@ -79,7 +79,7 @@ class RequestMembershipCest
|
||||
$I->waitForText('Members', null, '.controls-header');
|
||||
$I->click('Members', '.controls-header');
|
||||
|
||||
$I->waitForText('Manage members');
|
||||
$I->waitForText('Member since');
|
||||
$I->see('Pending Approvals');
|
||||
$I->click('Pending Approvals');
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user