projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XML basiertes Menue, siehe Bug #771
[kivitendo-erp.git]
/
locale
/
de
/
locales.pl
diff --git
a/locale/de/locales.pl
b/locale/de/locales.pl
index
c568467
..
70ca6d2
100755
(executable)
--- a/
locale/de/locales.pl
+++ b/
locale/de/locales.pl
@@
-277,7
+277,7
@@
sub extract_text_between_parenthesis {
} elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
$inside_string = $cur_char;
} elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
$inside_string = $cur_char;
- } elsif (
$cur_char eq ")"
) {
+ } elsif (
($cur_char eq ")") || ($cur_char eq ',')
) {
return ($text, substr($line, $pos + 1));
}
return ($text, substr($line, $pos + 1));
}
@@
-336,7
+336,7
@@
sub scanfile {
}
# is this a template call?
}
# is this a template call?
- if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) {
+ if (/parse_html_template
2?
\s*\(\s*[\"\']([\w\/]+)/) {
my $newfile = "$basedir/templates/webpages/$1_master.html";
if (-f $newfile) {
# &scanhtmlfile($newfile);
my $newfile = "$basedir/templates/webpages/$1_master.html";
if (-f $newfile) {
# &scanhtmlfile($newfile);