Merge pull request #10190 from annando/api-attached

[friendica.git] / src / Console / PoToPhp.php

diff --git a/src/Console/PoToPhp.php b/src/Console/PoToPhp.php
index ef2e2f73853c036811b4102fe8a416e07caf7c3e..35d87165c12c934787414af2a5be672f1921616d 100644 (file)
--- a/src/Console/PoToPhp.php
+++ b/src/Console/PoToPhp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -115,19 +115,15 @@ HELP;
                        }
 
                        if ($k != '' && substr($l, 0, 7) == 'msgstr ') {
-                               if ($ink) {
-                                       $ink = false;
-                                       $out .= '$a->strings["' . $k . '"] = ';
-                               }
-
-                               if ($inv) {
-                                       $out .= '"' . $v . '"';
-                               }
-
                                $v = substr($l, 8, $len - 10);
                                $v = preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $v);
 
-                               $inv = true;
+                               if ($v != '') {
+                                       $out .= '$a->strings["' . $k . '"] = "' . $v . '"';
+                               } else {
+                                       $k = '';
+                                       $ink = false;
+                               }
                        }
 
                        if ($k != "" && substr($l, 0, 7) == 'msgstr[') {
@@ -147,11 +143,13 @@ HELP;
 
                                $match = [];
                                preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
-                               $out .= "\t"
-                                       . preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $match[1])
-                                       . ' => '
-                                       . preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $match[2])
-                                       . ",\n";
+                               if ($match[2] !== '""') {
+                                       $out .= "\t"
+                                               . preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $match[1])
+                                               . ' => '
+                                               . preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $match[2])
+                                               . ",\n";
+                               }
                        }
 
                        if (substr($l, 0, 6) == 'msgid_') {