diff options
| author | Max Kostikov <max@kostikov.co> | 2019-10-14 11:16:12 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-10-14 11:16:12 +0200 |
| commit | aa330bc8c77946b076a6365f7f5c5e34a37d5997 (patch) | |
| tree | f87f24ff26bd83918bf7389f46bfe4527f7b7536 | |
| parent | e7e8a2ca5f09737b27377188794d18fc992febb2 (diff) | |
| parent | b4de492e0df562cac7955453161848f297d160b8 (diff) | |
| download | volse-hubzilla-aa330bc8c77946b076a6365f7f5c5e34a37d5997.tar.gz volse-hubzilla-aa330bc8c77946b076a6365f7f5c5e34a37d5997.tar.bz2 volse-hubzilla-aa330bc8c77946b076a6365f7f5c5e34a37d5997.zip | |
Merge branch 'dev' into 'dev'
Better plural function detection
See merge request hubzilla/core!1753
| -rw-r--r-- | util/po2php.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/po2php.php b/util/po2php.php index 73d9b454e..535e5567c 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -52,7 +52,7 @@ function po2php_run($argc,$argv) { if ($l[0]=="#") $l=""; if (substr($l,0,15)=='"Plural-Forms: '){ $match=Array(); - preg_match("|nplurals=([0-9]*);\s*plural=(.*)[;\\\\]|", $l, $match); + preg_match("|nplurals=([0-9]*);\s*plural=([^;\\\\]*)|", $l, $match); $cond = str_replace('n','$n',$match[2]); $out .= 'if(! function_exists("' . 'string_plural_select_' . $lang .'")) {' . "\n"; $out .= 'function string_plural_select_' . $lang . '($n){'."\n"; |