Merge branch 'pull'

This commit is contained in:
Friendika 2011-05-10 15:29:16 -07:00
commit 3ae3658411
5 changed files with 5752 additions and 5677 deletions

File diff suppressed because it is too large Load diff

View file

@ -35,7 +35,7 @@ function po2php_run($argv, $argc) {
if ($l[0]=="#") $l=""; if ($l[0]=="#") $l="";
if (substr($l,0,15)=='"Plural-Forms: '){ if (substr($l,0,15)=='"Plural-Forms: '){
$match=Array(); $match=Array();
preg_match("|nplurals=([0-9]*); plural=(.*);|", $l, $match); preg_match("|nplurals=([0-9]*); *plural=(.*)|", $l, $match);
$cond = str_replace('n','$n',$match[2]); $cond = str_replace('n','$n',$match[2]);
$out .= 'function string_plural_select($n){'."\n"; $out .= 'function string_plural_select($n){'."\n";
$out .= ' return '.$cond.';'."\n"; $out .= ' return '.$cond.';'."\n";

View file

@ -31,6 +31,7 @@ sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
sed -i "s/PACKAGE/Friendika/g" "$OUTFILE" sed -i "s/PACKAGE/Friendika/g" "$OUTFILE"
sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
echo "done." echo "done."

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff