From 091ef33f18e4c9af8980ef1e8a4513c40e58b4b3 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 23 Jul 2018 19:55:00 +0200 Subject: Merge branch 'patch-2' into 'dev' Escape internal quotes in translation on export See merge request hubzilla/core!1237 (cherry picked from commit 84e57d040b6b7df4b7673d3f6f4974225117e3a4) 64efd07f Escape internal quotes in translation on export 87857fe5 Update hmessages.po 3342fc22 Update hstrings.php --- util/php2po.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/php2po.php') diff --git a/util/php2po.php b/util/php2po.php index c47dcac1b..c165006a1 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -32,17 +32,17 @@ if ($k!="" && substr($l,0,7)=="msgstr "){ $ink = False; - $v = '""'; + $v = ''; //echo "DBG: k:'$k'\n"; if (isset(App::$strings[$k])) { - $v= '"'.App::$strings[$k].'"'; + $v= App::$strings[$k]; //echo "DBG\n"; //var_dump($k, $v, App::$strings[$k], $v); //echo "/DBG\n"; } //echo "DBG: v:'$v'\n"; - $l = "msgstr ".$v."\n"; + $l = "msgstr \"".str_replace('"','\"',$v)."\"\n"; } if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[" )$ink = False;; -- cgit v1.2.3