diff options
| author | Mario <mario@mariovavti.com> | 2020-03-11 10:35:05 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-03-11 10:35:05 +0000 |
| commit | d54ff4fae5db65f94d7c936be89984e6674f0501 (patch) | |
| tree | 4f16ef8190f61cdf24c4f9f3920bd142066be714 /include | |
| parent | ba566fd64bbb57fb52779a3f29f30e730cab7744 (diff) | |
| parent | 720d3dcedc96c7aaf6c4444c8b45acd46b8718b0 (diff) | |
| download | volse-hubzilla-d54ff4fae5db65f94d7c936be89984e6674f0501.tar.gz volse-hubzilla-d54ff4fae5db65f94d7c936be89984e6674f0501.tar.bz2 volse-hubzilla-d54ff4fae5db65f94d7c936be89984e6674f0501.zip | |
Merge branch 'dev' into z6connect
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 1475ff334..5d1cf6eff 100644 --- a/include/text.php +++ b/include/text.php @@ -1881,7 +1881,7 @@ function format_poll($item,$s,$opts) { } } if ($item['comments_closed'] > NULL_DATE) { - $t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d h:i'); + $t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d H:i'); $closed = ((datetime_convert() > $item['comments_closed']) ? true : false); if ($closed) { $message = t('Poll has ended.'); @@ -1892,7 +1892,7 @@ function format_poll($item,$s,$opts) { $output .= EOL . '<div>' . $message . '</div>'; } if ($activated and $commentable) { - $output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="vote" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>'; + $output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="' . t("Vote") . '" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>'; } } |