Merge branch 'develop' into 1.7

This commit is contained in:
Andy Miller
2020-07-09 10:32:02 -06:00
2 changed files with 3 additions and 3 deletions

View File

@@ -652,7 +652,7 @@ class Page implements PageInterface
return $content;
}
return mb_strimwidth($content, 0, $size, '...', 'UTF-8');
return mb_strimwidth($content, 0, $size, '', 'UTF-8');
}
$summary = Utils::truncateHtml($content, $size);

View File

@@ -69,7 +69,7 @@ class Cron
'name_year' => 'année',
'text_period' => 'Chaque %s',
'text_mins' => 'à %s minutes',
'text_time' => 'à %s:%s',
'text_time' => 'à %02s:%02s',
'text_dow' => 'le %s',
'text_month' => 'de %s',
'text_dom' => 'le %s',
@@ -86,7 +86,7 @@ class Cron
'name_year' => 'year',
'text_period' => 'Every %s',
'text_mins' => 'at %s minutes past the hour',
'text_time' => 'at %s:%s',
'text_time' => 'at %02s:%02s',
'text_dow' => 'on %s',
'text_month' => 'of %s',
'text_dom' => 'on the %s',