diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
| commit | 8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c (patch) | |
| tree | 04add36aa35ce8cda58c5594a783737b25346175 /include/text.php | |
| parent | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (diff) | |
| parent | 866dc9a9b3ca1cd98fc032afe0aec14ccdb86ba0 (diff) | |
| download | volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.gz volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.bz2 volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.zip | |
Merge branch 'master' into tagging
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/text.php b/include/text.php index dafb6f131..16391bbc9 100644 --- a/include/text.php +++ b/include/text.php @@ -1789,21 +1789,21 @@ function layout_select($channel_id, $current = '') { function mimetype_select($channel_id, $current = 'text/bbcode', $choices = null, $element = 'mimetype') { $x = (($choices) ? $choices : [ - 'text/bbcode', - 'text/html', - 'text/markdown', - 'text/plain', - 'application/x-pdl' + 'text/bbcode' => t('BBcode'), + 'text/html' => t('HTML'), + 'text/markdown' => t('Markdown'), + 'text/plain' => t('Text'), + 'application/x-pdl' => t('Comanche Layout') ]); if((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())){ - $x[] = 'application/x-php'; + $x['application/x-php'] = t('PHP'); } - foreach($x as $y) { + foreach($x as $y => $z) { $selected = (($y == $current) ? ' selected="selected" ' : ''); - $options .= '<option name="' . $y . '"' . $selected . '>' . $y . '</option>'; + $options .= '<option value="' . $y . '"' . $selected . '>' . $z . '</option>'; } $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( |