Commit 4f435412 authored by xjm's avatar xjm

Issue #2568793 by joelpittet, alexpott, Cottser, klausi: Replace remaining...

Issue #2568793 by joelpittet, alexpott, Cottser, klausi: Replace remaining !placeholder for Non-URL HTML when format_size() is involved
parent e7a7de9f
...@@ -180,7 +180,7 @@ function template_preprocess_file_upload_help(&$variables) { ...@@ -180,7 +180,7 @@ function template_preprocess_file_upload_help(&$variables) {
} }
} }
if (isset($upload_validators['file_validate_size'])) { if (isset($upload_validators['file_validate_size'])) {
$descriptions[] = t('!size limit.', array('!size' => format_size($upload_validators['file_validate_size'][0]))); $descriptions[] = t('@size limit.', array('@size' => format_size($upload_validators['file_validate_size'][0])));
} }
if (isset($upload_validators['file_validate_extensions'])) { if (isset($upload_validators['file_validate_extensions'])) {
$descriptions[] = t('Allowed types: @extensions.', array('@extensions' => $upload_validators['file_validate_extensions'][0])); $descriptions[] = t('Allowed types: @extensions.', array('@extensions' => $upload_validators['file_validate_extensions'][0]));
......
...@@ -426,10 +426,10 @@ protected function memoryExceeded() { ...@@ -426,10 +426,10 @@ protected function memoryExceeded() {
} }
if ($pct_memory > $threshold) { if ($pct_memory > $threshold) {
$this->message->display( $this->message->display(
$this->t('Memory usage is !usage (!pct% of limit !limit), reclaiming memory.', $this->t('Memory usage is @usage (@pct% of limit @limit), reclaiming memory.',
array('!pct' => round($pct_memory*100), array('@pct' => round($pct_memory*100),
'!usage' => $this->formatSize($usage), '@usage' => $this->formatSize($usage),
'!limit' => $this->formatSize($this->memoryLimit))), '@limit' => $this->formatSize($this->memoryLimit))),
'warning'); 'warning');
$usage = $this->attemptMemoryReclaim(); $usage = $this->attemptMemoryReclaim();
$pct_memory = $usage / $this->memoryLimit; $pct_memory = $usage / $this->memoryLimit;
...@@ -437,19 +437,19 @@ protected function memoryExceeded() { ...@@ -437,19 +437,19 @@ protected function memoryExceeded() {
// coming back here and trimming a tiny amount // coming back here and trimming a tiny amount
if ($pct_memory > (0.90 * $threshold)) { if ($pct_memory > (0.90 * $threshold)) {
$this->message->display( $this->message->display(
$this->t('Memory usage is now !usage (!pct% of limit !limit), not enough reclaimed, starting new batch', $this->t('Memory usage is now @usage (@pct% of limit @limit), not enough reclaimed, starting new batch',
array('!pct' => round($pct_memory*100), array('@pct' => round($pct_memory*100),
'!usage' => $this->formatSize($usage), '@usage' => $this->formatSize($usage),
'!limit' => $this->formatSize($this->memoryLimit))), '@limit' => $this->formatSize($this->memoryLimit))),
'warning'); 'warning');
return TRUE; return TRUE;
} }
else { else {
$this->message->display( $this->message->display(
$this->t('Memory usage is now !usage (!pct% of limit !limit), reclaimed enough, continuing', $this->t('Memory usage is now @usage (@pct% of limit @limit), reclaimed enough, continuing',
array('!pct' => round($pct_memory*100), array('@pct' => round($pct_memory*100),
'!usage' => $this->formatSize($usage), '@usage' => $this->formatSize($usage),
'!limit' => $this->formatSize($this->memoryLimit))), '@limit' => $this->formatSize($this->memoryLimit))),
'warning'); 'warning');
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment