Commit 7f297561 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Handle plurals in translations



Use ngettext() to handle plurals properly. Also, split pagination
captions into two strings.

Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent b113764b
......@@ -47,9 +47,9 @@ all: ${MOFILES}
update-pot:
pkgname=AUR; \
pkgver=`sed -n 's/.*"AUR_VERSION", "\(.*\)".*/\1/p' ../web/lib/version.inc.php`; \
xgettext --default-domain=aur -L php --keyword=__ --no-location \
--add-comments=TRANSLATORS: --package-name="$$pkgname" \
--package-version="$$pkgver" \
xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \
--no-location --add-comments=TRANSLATORS: \
--package-name="$$pkgname" --package-version="$$pkgver" \
--msgid-bugs-address='${MSGID_BUGS_ADDRESS}' \
--directory ../web --files-from POTFILES -o aur.pot
......
......@@ -70,6 +70,13 @@ function __() {
return $translated;
}
function _n($msgid1, $msgid2, $n) {
global $l10n;
$translated = sprintf($l10n->ngettext($msgid1, $msgid2, $n), $n);
return htmlspecialchars($translated, ENT_QUOTES);
}
# set up the visitor's language
#
function set_lang() {
......
......@@ -12,7 +12,10 @@ if (!$result): ?>
<?php else: ?>
<div id="pkglist-results" class="box">
<div class="pkglist-stats">
<p><?= __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
<p>
<?= _n('%d package found.', '%d packages found.', $total) ?>
<?= __('Page %d of %d.', $current, $pages) ?>
</p>
<?php if (count($templ_pages) > 1): ?>
<p class="pkglist-nav">
<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
......@@ -89,7 +92,10 @@ if (!$result): ?>
</table>
<div class="pkglist-stats">
<p><?= __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
<p>
<?= _n('%d package found.', '%d packages found.', $total) ?>
<?= __('Page %d of %d.', $current, $pages) ?>
</p>
<?php if (count($templ_pages) > 1): ?>
<p class="pkglist-nav">
<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
......
<div id="pkglist-results" class="box">
<div class="pkglist-stats">
<p><?= __('%d package requests found. Page %d of %d.', $total, $current, $pages) ?></p>
<p>
<?= _n('%d package request found.', '%d package requests found.', $total) ?>
<?= __('Page %d of %d.', $current, $pages) ?>
</p>
<?php if (count($templ_pages) > 1): ?>
<p class="pkglist-nav">
<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
......@@ -83,7 +86,10 @@
</table>
<div class="pkglist-stats">
<p><?= __('%d package requests found. Page %d of %d.', $total, $current, $pages) ?></p>
<p>
<?= _n('%d package request found.', '%d package requests found.', $total) ?>
<?= __('Page %d of %d.', $current, $pages) ?>
</p>
<?php if (count($templ_pages) > 1): ?>
<p class="pkglist-nav">
<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
......
Supports Markdown
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