[Libreoffice-commits] online.git: loleaflet/util

[Henry Castro (via logerrit)]

 loleaflet/util/create-l10n-all-js.pl |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c9cc637cd508107cece09c03c87c8ec346fff52f
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Apr 7 19:59:53 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Apr 20 21:17:57 2020 +0200

    android: fix create-l10n-all-js.pl paths
    
    builddir != srcdir
    
    Change-Id: I42668bec84efeefae445416eac03321ca02b5aba
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91862
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/util/create-l10n-all-js.pl b/loleaflet/util/create-l10n-all-js.pl
index 949ff3421..eb88af715 100644
--- a/loleaflet/util/create-l10n-all-js.pl
+++ b/loleaflet/util/create-l10n-all-js.pl
@@ -1,6 +1,9 @@
 #!/bin/perl -w
 
 use strict;
+use File::Basename;
+
+my $path = dirname(dirname($0)) . "/";
 
 sub readwhole($) {
     my ($file) = @_;
@@ -11,11 +14,11 @@ sub readwhole($) {
 
 sub insert($) {
     my ($locale) = @_;
-    my $ui = readwhole("po/ui-$locale.po.json");
+    my $ui = readwhole($path . "po/ui-$locale.po.json");
     # Different convention: Change underscore to hyphen.
     $locale =~ s/_/-/;
-    my $uno = readwhole("l10n/uno/$locale.json");
-    my $locore = readwhole("l10n/locore/$locale.json");
+    my $uno = readwhole($path . "l10n/uno/$locale.json");
+    my $locore = readwhole($path . "l10n/locore/$locale.json");
     # Merge the fields of all three objects into one. The result of
     # po2json.py starts with "{" not followed by a newline and ends
     # with a "}" without any final newline. The json files that are in