diff options
author | Thierry Vignaud <tv@mandriva.org> | 2007-08-13 19:22:49 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2007-08-13 19:22:49 +0000 |
commit | 2f8258805f5cdacea83eb42feccb15e706b659ba (patch) | |
tree | 32d98d6dc0b235dc6f3ec8c4ccd97c985230b032 | |
parent | b8e9ad1890359272045040424ebe5c9c4619e91a (diff) | |
download | drakx-2f8258805f5cdacea83eb42feccb15e706b659ba.tar drakx-2f8258805f5cdacea83eb42feccb15e706b659ba.tar.gz drakx-2f8258805f5cdacea83eb42feccb15e706b659ba.tar.bz2 drakx-2f8258805f5cdacea83eb42feccb15e706b659ba.tar.xz drakx-2f8258805f5cdacea83eb42feccb15e706b659ba.zip |
(translate_real) fix translating plural forms by comparing the gettext
string to both the singular & the plural templates (#32505)
(bug spoted by pixel)
-rw-r--r-- | perl-install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/common.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index fc509308b..27b672770 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- fix plural translations (#32505) - 'ibm_acpi' driver was replaced by 'thinkpad_acpi (#31606) Version 10.4.166 - 11 August 2007, by Pascal "Pixel" Rigaux diff --git a/perl-install/common.pm b/perl-install/common.pm index 0b75b996c..3be4dfb39 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -54,7 +54,7 @@ sub translate_real { } # when utf8 pragma is in use, Locale::gettext() returns an utf8 string not tagged as such: c::set_tagged_utf8($s2) if !utf8::is_utf8($s2) && utf8::is_utf8($s); - return $s2 if $s ne $s2; + return $s2 if $s ne $s2 && $s2 ne $o_plural; } $s; } |