From 91eb64474346a514e27586b831e171b5f08a1a65 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 24 Mar 2018 16:08:56 -0400
Subject: [PATCH 1/2] Fix formatting in Console\PoToPhp

---
 src/Core/Console/PoToPhp.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Core/Console/PoToPhp.php b/src/Core/Console/PoToPhp.php
index 0a7224503a..1cfc1ec7fd 100644
--- a/src/Core/Console/PoToPhp.php
+++ b/src/Core/Console/PoToPhp.php
@@ -98,7 +98,7 @@ HELP;
 				$out .= '}}' . "\n";
 			}
 
-			if ($k != "" && substr($l, 0, 7) == 'msgstr ') {
+			if ($k != '' && substr($l, 0, 7) == 'msgstr ') {
 				if ($ink) {
 					$ink = false;
 					$out .= '$a->strings["' . $k . '"] = ';
@@ -114,6 +114,7 @@ HELP;
 
 				$inv = true;
 			}
+
 			if ($k != "" && substr($l, 0, 7) == 'msgstr[') {
 				if ($ink) {
 					$ink = false;
@@ -125,9 +126,10 @@ HELP;
 				}
 
 				if (!$arr) {
-					$arr = True;
+					$arr = true;
 					$out .= "[\n";
 				}
+
 				$match = [];
 				preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
 				$out .= "\t"
@@ -152,9 +154,11 @@ HELP;
 					$inv = false;
 					$out .= '"' . $v . '"';
 				}
+
 				if ($k != "") {
 					$out .= ($arr) ? "];\n" : ";\n";
 				}
+
 				$arr = false;
 				$k = str_replace("msgid ", "", $l);
 				if ($k != '""') {

From 11e68b70bb6fb1ec05843e5cae2059536a09b84e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 24 Mar 2018 16:09:19 -0400
Subject: [PATCH 2/2] Fix number constant used in Console\PoToPhp

---
 src/Core/Console/PoToPhp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Console/PoToPhp.php b/src/Core/Console/PoToPhp.php
index 1cfc1ec7fd..62ff24bd55 100644
--- a/src/Core/Console/PoToPhp.php
+++ b/src/Core/Console/PoToPhp.php
@@ -109,7 +109,7 @@ HELP;
 					$out .= '"' . $v . '"';
 				}
 
-				$v = substr($l, 8, $len - 11);
+				$v = substr($l, 8, $len - 10);
 				$v = preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $v);
 
 				$inv = true;