Fix for bug 135291: add version string to new templates and fix the string for non

xml templates.

r=bbaetz, r2=ddk

diff --git a/t/004template.t b/t/004template.t
index e831e42e4d065adb44585c7bd9429b46d020121a..cf63975d1594fa84a57c58a529ef010fa8976b80 100644 (file)
--- 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 4e73a7738d7487bad0013b016f801b9dd7f04f6c..47987729a370e29c78b77640fe67c69080f07700 100644 (file)
--- 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 1e8e34b0181acf20e7724a94f99fb28f4cc97297..a76ad5fa77d5ca5fbc6a0fbdd8a99362574adfcc 100644 (file)
--- 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 9f42ddf3ba7487c65f889a8fcbdb320ae1e5a494..d8af5d3f2052a086e6ce8c19ccfb10b1972e15fd 100644 (file)
--- 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 7fd195c6fe0a0ca5bf3d6439effdd6f6463c1a20..9a0a1e8d7cd23452d232f907583bba62fc4bed4a 100644 (file)
--- 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 14bea8a22534a77a00864bc324861612dcbfede6..661f8f1d479f0cbd1bf0fde8ea5cb132bb3250b7 100644 (file)
--- 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 1a9097115854e0c677a3e3f4a3dbe7b947f4c98b..b37d0da2da10d82079c6c3a21d99afeac9776379 100644 (file)
--- 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