diff --git a/include/class.i18n.php b/include/class.i18n.php index 160de51a84045aebe1d22f15f1b007b868c1f52b..8ef01332112f600105d8cbade1c332d57bd2afbd 100644 --- a/include/class.i18n.php +++ b/include/class.i18n.php @@ -333,9 +333,9 @@ class Internationalization { TextDomain::lookup()->setPath(I18N_DIR); // User-specific translations - function _N($msgid, $plural, $count) { - return TextDomain::lookup()->getTranslation(LC_MESSAGES) - ->ngettext($msgid, $plural, $count); + function _N($msgid, $plural, $n) { + return TextDomain::lookup()->getTranslation() + ->ngettext($msgid, $plural, is_numeric($n) ? $n : 1); } // System-specific translations @@ -354,7 +354,7 @@ class Internationalization { } function _NP($context, $singular, $plural, $n) { return TextDomain::lookup()->getTranslation() - ->npgettext($context, $singular, $plural, $n); + ->npgettext($context, $singular, $plural, is_numeric($n) ? $n : 1); } // Language-specific translations @@ -364,7 +364,7 @@ class Internationalization { } function _NL($msgid, $plural, $n, $locale) { return TextDomain::lookup()->getTranslation($locale) - ->ngettext($msgid, $plural, $n); + ->ngettext($msgid, $plural, is_numeric($n) ? $n : 1); } } } diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php index 5a063d3eab5541c79afdace435f80e6268a24030..76a62a107b0a868d1dcadf1131cae562c8110561 100644 --- a/include/staff/filters.inc.php +++ b/include/staff/filters.inc.php @@ -38,7 +38,7 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC'); $query="$sql ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit(); $res=db_query($query); if($res && ($num=db_num_rows($res))) - $showing=$pageNav->showing().' '._N('filter', 'filters', $count); + $showing=$pageNav->showing().' '._N('filter', 'filters', $num); else $showing=__('No filters found!');