From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 1 Feb 2013 13:18:13 +0000 (+0100)
Subject: Locales.pl: bei Templatefiles auch nach .json und .js suchen
X-Git-Tag: release-3.1.0beta1~648
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2d6a42eea58c70578fa6f540c3b80417cb7ea37b;p=kivitendo-erp.git

Locales.pl: bei Templatefiles auch nach .json und .js suchen
---

diff --git a/scripts/locales.pl b/scripts/locales.pl
index 23940425c..5e6a8a532 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -360,15 +360,23 @@ sub scanfile {
 
       # is this a template call?
       if (/(?:parse_html_template2?|render)\s*\(\s*[\"\']([\w\/]+)\s*[\"\']/) {
-        my $newfile = "$basedir/templates/webpages/$1.html";
+        my $new_file_base = "$basedir/templates/webpages/$1.";
         if (/parse_html_template2/) {
-          print "E: " . strip_base($file) . " is still using 'parse_html_template2' for " . strip_base($newfile) . ".\n";
+          print "E: " . strip_base($file) . " is still using 'parse_html_template2' for " . strip_base("${new_file_base}html") . ".\n";
         }
-        if (-f $newfile) {
-           $cached{$file}{scanh}{$newfile} = 1;
-          print "." if $opt_v;
-        } elsif ($opt_c) {
-          print "W: missing HTML template: " . strip_base($newfile) . " (referenced from " . strip_base($file) . ")\n";
+
+        my $found_one = 0;
+        foreach my $ext (qw(html js json)) {
+          my $new_file = "${new_file_base}${ext}";
+          if (-f $new_file) {
+            $cached{$file}{scanh}{$new_file} = 1;
+            print "." if $opt_v;
+            $found_one = 1;
+          }
+        }
+
+        if ($opt_c && !$found_one) {
+          print "W: missing HTML template: " . strip_base($new_file_base) . "{html,json,js} (referenced from " . strip_base($file) . ")\n";
         }
       }