Attachment 62333 Details for Bug 15395 – Bug 15395: Search .js files in more directories

[patch] Bug 15395: Search .js files in more directories

Bug-15395-Search-js-files-in-more-directories.patch (text/plain), 1.49 KB, created by Marc Véron on 2017-04-18 19:53:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2017-04-18 19:53:01 UTC

Size: 1.49 KB

patch

obsolete

>From 3965694af186256ec6859d8e7d5153773372bd16 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Tue, 11 Apr 2017 14:47:44 +0200
>Subject: [PATCH] Bug 15395: Search .js files in more directories
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Specifically, koha-tmpl/intranet-tmpl/prog/js and
>koha-tmpl/opac-tmpl/bootstrap/js
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>---
> misc/translator/LangInstaller.pm | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm
>index 8f38c7d..370f459 100644
>--- a/misc/translator/LangInstaller.pm
>+++ b/misc/translator/LangInstaller.pm
>@@ -621,14 +621,20 @@ sub extract_messages {
>         die "system call failed: $xgettext_cmd";
>     }
> 
>+    my @js_dirs = (
>+        "$intranetdir/koha-tmpl/intranet-tmpl/prog/js",
>+        "$intranetdir/koha-tmpl/intranet-tmpl/prog/en/js",
>+        "$intranetdir/koha-tmpl/opac-tmpl/bootstrap/js",
>+    );
>+
>     my @js_files;
>     find(sub {
>-        if ($File::Find::dir =~ m|/en/| && $_ =~ m/\.js$/) {
>+        if ($_ =~ m/\.js$/) {
>             my $filename = $File::Find::name;
>             $filename =~ s|^$intranetdir/||;
>             push @js_files, $filename;
>         }
>-    }, "$intranetdir/koha-tmpl");
>+    }, @js_dirs);
> 
>     $xgettext_cmd = "$self->{xgettext} -L JavaScript $xgettext_common_args "
>         . "-o $Bin/$self->{domain}-js.pot -D $intranetdir";
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15395: 45797 | 45798 | 45799 | 46337 | 50023 | 50024 | 50025 | 50026 | 61873 | 61874 | 61875 | 61876 | 61934 | 61935 | 61977 | 62008 | 62041 | 62326 | 62327 | 62328 | 62329 | 62330 | 62331 | 62332 | 62333 | 62335 | 62709 | 65894 | 70974 | 70975 | 70976 | 71940 | 71941 | 71942 | 71943 | 71944 | 71945 | 71946 | 71947 | 71948 | 71949 | 71950 | 71951 | 71952 | 73901 | 73902 | 73903 | 73904 | 73905 | 73906 | 73907 | 73908 | 73909 | 73910 | 73911 | 73912 | 73913 | 76328 | 76329 | 76330 | 77475 | 77476 | 81152 | 81153 | 81154 | 81155 | 81156 | 81157 | 81158 | 81159 | 81167 | 81734 | 81735 | 81736 | 81737 | 81738 | 81739 | 81741 | 81742 | 81743