From 6839065ece251f957e214e88b106aac571ce944d Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Tue, 27 Feb 2018 17:10:34 +0100
Subject: [PATCH] [Zanata] Fix bugs in po to nested json toolchain

---
 .po2json.sh     | 2 +-
 .renest_json.pl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.po2json.sh b/.po2json.sh
index 4b090d9..c39517e 100755
--- a/.po2json.sh
+++ b/.po2json.sh
@@ -3,5 +3,5 @@ for i in po/*.po
 do
     j=$(echo $i | cut -d '.' -f 1 | cut -d '/' -f 2)
     po2json -i $i -t locale/en.json --progress none | ./.renest_json.pl > po/$j.json
-    mv po/$j.json locale/$j.json
 done
+mv po/*.json locale/
diff --git a/.renest_json.pl b/.renest_json.pl
index 3c44c38..55bf8d1 100755
--- a/.renest_json.pl
+++ b/.renest_json.pl
@@ -14,11 +14,11 @@ while (defined(my $line = <STDIN>)) {
     $old_json .= $line;
 }
 
-$old_json = decode_json($old_json);
+$old_json = $json->decode($old_json);
 for my $key (keys %{$old_json}) {
-    $key =~ m/^([^.]*)\.(.*)$/;
-    my $real_key = $1;
-    my $trad_key = $2;
+    my $index    = index($key, '.');
+    my $real_key = substr($key, 0, $index++);
+    my $trad_key = substr($key, $index);
 
     $new_json->{$real_key}->{$trad_key} = $old_json->{$key} if $old_json->{$key};
 }