jan
/
miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve HTML escaping for translations

This commit is contained in:
Frédéric Guillot 2014-02-25 18:00:36 -05:00
parent dfcc574530
commit 99c933e283
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/feed_items.php
View File

@ -1,6 +1,6 @@
<?php if (empty($items)): ?>
<p class="alert">
<?= t('This subscription is empty, <a href="?action=unread">go back to unread items</a>') ?>
<?= tne('This subscription is empty, <a href="?action=unread">go back to unread items</a>') ?>
</p>
<?php else: ?>
@ -8,7 +8,7 @@
<h2><?= Helper\escape($feed['title']) ?> (<?= $nb_items ?>)</h2>
<ul>
<li>
<a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older first') : t('most recent first')) ?></a>
<a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= tne('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older first') : t('most recent first')) ?></a>
</li>
<li>
<a href="?action=mark-feed-as-read&amp;feed_id=<?= $feed['id'] ?>" data-action="mark-feed-read" data-feed-id="<?= $feed['id'] ?>"><?= t('mark all as read') ?></a>

2
templates/feeds.php
View File

@ -15,7 +15,7 @@
<?php else: ?>
<?php if ($nothing_to_read): ?>
<p class="alert"><?= t('Nothing to read, do you want to <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>') ?></p>
<p class="alert"><?= tne('Nothing to read, do you want to <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>') ?></p>
<?php endif ?>
<section class="items">

4
templates/unread_items.php
View File

@ -3,10 +3,10 @@
<?php else: ?>
<div class="page-header">
<h2><?= t('<span id="page-counter">%s</span>unread items', isset($nb_items) ? $nb_items.' ' : '') ?></h2>
<h2><?= tne('<span id="page-counter">%s</span>unread items', isset($nb_items) ? $nb_items.' ' : '') ?></h2>
<ul>
<li>
<a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older first') : t('most recent first')) ?></a>
<a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= tne('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older first') : t('most recent first')) ?></a>
</li>
<li>
<a href="?action=mark-as-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>

7
vendor/PicoTools/Helper.php vendored
View File

@ -208,4 +208,9 @@ function form_email($name, $values = array(), array $errors = array(), array $at
function form_date($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
{
return form_input('date', $name, $values, $errors, $attributes, $class);
}
}
function form_number($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
{
return form_input('number', $name, $values, $errors, $attributes, $class);
}

29
vendor/PicoTools/Translator.php vendored
View File

@ -21,6 +21,24 @@ namespace PicoTools\Translator {
\array_shift($args);
\array_unshift($args, get($identifier, $identifier));
foreach ($args as &$arg) {
$arg = htmlspecialchars($arg, ENT_QUOTES, 'UTF-8', false);
}
return \call_user_func_array(
'sprintf',
$args
);
}
function translate_no_escaping($identifier)
{
$args = \func_get_args();
\array_shift($args);
\array_unshift($args, get($identifier, $identifier));
return \call_user_func_array(
'sprintf',
$args
@ -122,26 +140,23 @@ namespace PicoTools\Translator {
namespace {
function t() {
function tne() {
return call_user_func_array('\PicoTools\Translator\translate_no_escaping', func_get_args());
}
function t() {
return call_user_func_array('\PicoTools\Translator\translate', func_get_args());
}
function c() {
return call_user_func_array('\PicoTools\Translator\currency', func_get_args());
}
function n() {
return call_user_func_array('\PicoTools\Translator\number', func_get_args());
}
function dt() {
return call_user_func_array('\PicoTools\Translator\datetime', func_get_args());
}
}