X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Fpo2php.php;h=1a86bb38d07708e26bcf7790cacded8c4889fb7f;hb=3f59f632241d14b43ba8861033aac27dfcfbc9e3;hp=171e9f29768bc0882b6d320d5bb1f956286899a8;hpb=e1766b829f059e6e6a288178ee5b72dbd454dbae;p=friendica.git

diff --git a/util/po2php.php b/util/po2php.php
index 171e9f2976..1a86bb38d0 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -1,5 +1,6 @@
 <?php
 
+
 function po2php_run($argv, $argc) {
 
 	if ($argc!=2) {
@@ -21,46 +22,88 @@ function po2php_run($argv, $argc) {
 	
 	$infile = file($pofile);
 	$k="";
+	$v="";
 	$arr = False;
-	
+	$ink = False;
+	$inv = False;
+	$escape_s_exp = '|[^\\\\]\$[a-z]|';
+	function escape_s($match){
+		return str_replace('$','\$',$match[0]);
+	}
 	foreach ($infile as $l) {
 		$len = strlen($l);
+		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 .= '	return '.$cond.';'."\n";
 			$out .= '}'."\n";
 		}
 		
-		if (substr($l,0,6)=="msgid "){
-			if ($k!="") $out .= $arr?");\n":";\n";
-			$arr=False;
-			$k = substr($l,6, $len-7);
-			if ($k != '""' ) {
-				$out .= '$a->strings['.$k.'] = ';
-			} else {
-				$k = "";
-			}
-		}
+
+
 
 		if ($k!="" && substr($l,0,7)=="msgstr "){
-			$v = substr($l,7,$len-8);
-			$out .= $v;
+			if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; }
+			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
+			
+			$v = substr($l,8,$len-10);
+			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
+			$inv = True;
+			//$out .= $v;
 		}
 		if ($k!="" && substr($l,0,7)=="msgstr["){
+			if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; }
+			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
+						
 			if (!$arr) {
 				$arr=True;
 				$out .= "array(\n";
 			}
 			$match=Array();
 			preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
-			$out .= "\t". $match[1]." => ". $match[2] .",\n";
+			$out .= "\t". 
+				preg_replace_callback($escape_s_exp,'escape_s',$match[1])
+				." => "
+				.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
+		}
+	
+		if (substr($l,0,6)=="msgid_") { $ink = False; $out .= '$a->strings["'.$k.'"] = '; };
+
+
+		if ($ink) {
+			$k .= trim($l,"\"\r\n"); 
+			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
+			//$out .= '$a->strings['.$k.'] = ';
 		}
 		
-	}
+		if (substr($l,0,6)=="msgid "){
+			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
+			if ($k!="") $out .= $arr?");\n":";\n";
+			$arr=False;
+			$k = str_replace("msgid ","",$l);
+			if ($k != '""' ) {
+				$k = trim($k,"\"\r\n");
+			} else {
+				$k = "";
+			}
+			
+			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
+			$ink = True;
+		}
+		
+		if ($inv && substr($l,0,6)!="msgstr") {
+			$v .= trim($l,"\"\r\n"); 
+			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
+			//$out .= '$a->strings['.$k.'] = ';
+		}
 	
+		
+	}
+
+	if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
 	if ($k!="") $out .= $arr?");\n":";\n";
 	
 	file_put_contents($outfile, $out);
@@ -69,4 +112,4 @@ function po2php_run($argv, $argc) {
 
 if (array_search(__file__,get_included_files())===0){
   po2php_run($argv,$argc);
-}
\ No newline at end of file
+}