diff options
| author | zach%zachlipton.com <> | 2002-04-04 17:01:09 +0200 |
|---|---|---|
| committer | zach%zachlipton.com <> | 2002-04-04 17:01:09 +0200 |
| commit | 7f9b581340be60e5017d4387de4048881afcb075 (patch) | |
| tree | 700a88e23277b683215f2bb24c1ed3893772752f | |
| parent | 2cdfeb466e078648201b104f8f3f8fe539e37e02 (diff) | |
| download | bugzilla-7f9b581340be60e5017d4387de4048881afcb075.tar.gz bugzilla-7f9b581340be60e5017d4387de4048881afcb075.tar.xz | |
Fix for bug 135291: add version string to new templates and fix the string for non
xml templates.
r=bbaetz, r2=ddk
| -rw-r--r-- | t/004template.t | 2 | ||||
| -rw-r--r-- | template/default/global/code-error.html.tmpl | 1 | ||||
| -rw-r--r-- | template/default/global/user-error.html.tmpl | 1 | ||||
| -rw-r--r-- | template/default/sidebar/xul.tmpl | 2 | ||||
| -rw-r--r-- | template/default/token/emailchangenew.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/default/token/emailchangeold.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/default/token/tokencancel.txt.tmpl | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/t/004template.t b/t/004template.t index e831e42e4..cf63975d1 100644 --- a/t/004template.t +++ b/t/004template.t @@ -94,7 +94,7 @@ close SAVEERR; foreach my $file(@testitems) { open(TMPL,"$include_path/$file"); my $firstline = <TMPL>; - if ($firstline =~ /<!-- \d+\.\d+\@[\w\._]+ -->/) { + if ($firstline =~ /\d+\.\d+\@[\w\.-]+/) { ok(1,"$file has a version string"); } else { ok(0,"$file does not have a version string --ERROR"); diff --git a/template/default/global/code-error.html.tmpl b/template/default/global/code-error.html.tmpl index 4e73a7738..47987729a 100644 --- a/template/default/global/code-error.html.tmpl +++ b/template/default/global/code-error.html.tmpl @@ -1,3 +1,4 @@ +<!-- 1.0@bugzilla.org --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of diff --git a/template/default/global/user-error.html.tmpl b/template/default/global/user-error.html.tmpl index 1e8e34b01..a76ad5fa7 100644 --- a/template/default/global/user-error.html.tmpl +++ b/template/default/global/user-error.html.tmpl @@ -1,3 +1,4 @@ +<!-- 1.0@bugzilla.org --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of diff --git a/template/default/sidebar/xul.tmpl b/template/default/sidebar/xul.tmpl index 9f42ddf3b..d8af5d3f2 100644 --- a/template/default/sidebar/xul.tmpl +++ b/template/default/sidebar/xul.tmpl @@ -1,4 +1,4 @@ -<!-- 1.0@bugzilla.org --> +[%# 1.0@bugzilla.org %] [%# -*- mode: sgml -*- %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file diff --git a/template/default/token/emailchangenew.txt.tmpl b/template/default/token/emailchangenew.txt.tmpl index 7fd195c6f..9a0a1e8d7 100644 --- a/template/default/token/emailchangenew.txt.tmpl +++ b/template/default/token/emailchangenew.txt.tmpl @@ -1,4 +1,4 @@ -<!-- 1.0@bugzilla.org --> +[%# 1.0@bugzilla.org %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of diff --git a/template/default/token/emailchangeold.txt.tmpl b/template/default/token/emailchangeold.txt.tmpl index 14bea8a22..661f8f1d4 100644 --- a/template/default/token/emailchangeold.txt.tmpl +++ b/template/default/token/emailchangeold.txt.tmpl @@ -1,4 +1,4 @@ -<!-- 1.0@bugzilla.org --> +[%# 1.0@bugzilla.org %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of diff --git a/template/default/token/tokencancel.txt.tmpl b/template/default/token/tokencancel.txt.tmpl index 1a9097115..b37d0da2d 100644 --- a/template/default/token/tokencancel.txt.tmpl +++ b/template/default/token/tokencancel.txt.tmpl @@ -1,4 +1,4 @@ -<!-- 1.0@bugzilla.org --> +[%# 1.0@bugzilla.org %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of |