Merge https://github.com/friendica/friendica into pull

[friendica.git] / util / po2php.php

diff --git a/util/po2php.php b/util/po2php.php
index eed126e32a5cc966c2398c837c64536112d4c166..c703172af76acedc30ab5d87928af5d8282e9090 100644 (file)
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -10,7 +10,14 @@ function po2php_run($argv, $argc) {
        
        $pofile = $argv[1];
        $outfile = dirname($pofile)."/strings.php";
-       
+
+       if(strstr($outfile,'util'))
+               $lang = 'en';
+       else
+               $lang = str_replace('-','_',basename(dirname($pofile)));
+
+
+
        if (!file_exists($pofile)){
                print "Unable to find '$pofile'\n";
                return;
@@ -35,9 +42,9 @@ function po2php_run($argv, $argc) {
                if ($l[0]=="#") $l="";
                if (substr($l,0,15)=='"Plural-Forms: '){
                        $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]);
-                       $out .= 'function string_plural_select($n){'."\n";
+                       $out .= 'function string_plural_select_' . $lang . '($n){'."\n";
                        $out .= '       return '.$cond.';'."\n";
                        $out .= '}'."\n";
                }
@@ -102,7 +109,7 @@ function po2php_run($argv, $argc) {
        
                
        }
-       
+
        if ($inv) {     $inv = False; $out .= '"'.$v.'"'; }
        if ($k!="") $out .= $arr?");\n":";\n";
        
@@ -112,4 +119,4 @@ function po2php_run($argv, $argc) {
 
 if (array_search(__file__,get_included_files())===0){
   po2php_run($argv,$argc);
-}
\ No newline at end of file
+}