Re: FWD: Re: A few comments on recent changes; ATTN: translators, DWN
On Sun, Sep 24, 2000 at 01:01:08AM +0200, Josip Rodin wrote:
[...]
> Also, how about this:
>
> --- basic.wml~ Fri Sep 8 19:10:48 2000
> +++ basic.wml Sun Sep 24 01:04:26 2000
> @@ -89,15 +89,7 @@
> <META http-equiv="Content-Type" content="text/html; charset=$(CHARSET)">
> <TITLE>$(BARETITLE:*Debian GNU/Linux -- )$(title)</TITLE>
> <LINK REV="made" HREF="mailto:webmaster@debian.org";>
> -<META NAME="Description" CONTENT="<:
> -if ("$(SUMMARY)" eq "")
> -{
> - print q(<blurb>);
> -}
> -else
> -{
> - print "$(SUMMARY)";
> -} :>">
> +<META NAME="Description" CONTENT="<ifeq "$(SUMMARY)" "" "<blurb>" "$(SUMMARY)">">
> <META NAME="Keywords" CONTENT="<keywords>">
> <META NAME="Language" CONTENT="$(CUR_LANG)">
> <info style=meta>
Yes, i did perform this change too.
Below are some suggestions, please check them carefully, i am not sure
they are totally safe (especially removal of #use lines).
And of course i do not recommend to make these changes unless you
specifically want the whole website being rebuilt.
Denis
Index: basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.50
diff -u -r1.50 basic.wml
--- basic.wml 2000/09/02 05:45:58 1.50
+++ basic.wml 2000/09/23 21:56:33
@@ -1,6 +1,4 @@
-#use wml::std::tags
#use wml::std::info
-#use wml::std::box
<define-tag blurb whitespace=delete>
[EN:Debian GNU/Linux is a free distribution of the GNU/Linux operating system. \
@@ -89,15 +87,8 @@
<META http-equiv="Content-Type" content="text/html; charset=$(CHARSET)">
<TITLE>$(BARETITLE:*Debian GNU/Linux -- )$(title)</TITLE>
<LINK REV="made" HREF="mailto:webmaster@debian.org";>
-<META NAME="Description" CONTENT="<:
-if ("$(SUMMARY)" eq "")
-{
- print q(<blurb>);
-}
-else
-{
- print "$(SUMMARY)";
-} :>">
+<META NAME="Description" CONTENT="<ifeq "$(SUMMARY)" ""
+ "<blurb>" "$(SUMMARY)">">
<META NAME="Keywords" CONTENT="<keywords>">
<META NAME="Language" CONTENT="$(CUR_LANG)">
<info style=meta>
Index: consultant.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/consultant.wml,v
retrieving revision 1.28
diff -u -r1.28 consultant.wml
--- consultant.wml 2000/08/17 12:41:07 1.28
+++ consultant.wml 2000/09/23 21:56:34
@@ -1,8 +1,3 @@
-#use wml::std::tags
-#use wml::std::info
-#use wml::std::box
-#use wml::debian::common_translation
-
<define-tag consultanttitle whitespace=delete>
[EN:List of Consultants:]
[RO:Lista consultanþilor:]
Index: ctime.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/ctime.wml,v
retrieving revision 1.56
diff -u -r1.56 ctime.wml
--- ctime.wml 2000/09/08 22:52:02 1.56
+++ ctime.wml 2000/09/23 21:56:34
@@ -1,3 +1,5 @@
+#use wml::std::tags
+
<perl>
use Time::Local;
Index: develbar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/develbar.wml,v
retrieving revision 1.100
diff -u -r1.100 develbar.wml
--- develbar.wml 2000/09/15 15:24:26 1.100
+++ develbar.wml 2000/09/23 21:56:35
@@ -1,5 +1,3 @@
-$(WML1_IGNORE:*#) $(WML1_IGNORE=#use)
-$(WML1_IGNORE:-#) wml::sys::compat1
#use wml::debian::languages
#use wml::debian::countries
@@ -666,18 +664,18 @@
</define-tag>
# %0 and %1 are for font color and font size
-<define-container FONTS_SANS-SERIF whitespace=delete>
+<define-tag FONTS_SANS-SERIF endtag=required whitespace=delete>
<FONT face="$(SANS_SERIF_FONT:-Arial,Helvetica)" %0 %1>
%body
</FONT>
-</define-container>
+</define-tag>
# Do not change anything below here without asking on debian-www first
<TABLE border="0" cellpadding="5" cellspacing="0" width="100%">
<TR>
- <TD valign="TOP"\
- width=<: if ("$(MENUWIDTH)" eq "") {print "140"} else {print "$(MENUWIDTH)"} :> bgcolor="#BBDDFF">
+ <TD valign="TOP" \
+ width=<ifeq "$(MENUWIDTH)" "" "140" "$(MENUWIDTH)"> bgcolor="#BBDDFF">
<BR>
<P><FONTS_SANS-SERIF><B><General></B><BR>
Index: event.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/event.wml,v
retrieving revision 1.49
diff -u -r1.49 event.wml
--- event.wml 2000/08/17 12:41:07 1.49
+++ event.wml 2000/09/23 21:56:35
@@ -177,6 +177,7 @@
#use wml::debian::basic title="<eventtitle>"
#use wml::debian::languages
+#use wml::std::tags
# DO NOT translate anything below. If you feel something needs to be modified
# write to debian-www first
@@ -200,7 +201,7 @@
foreach (@files)
{
$count++;
- open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
+ open(FILE, "< $path/$_") || open(FILE, "< $current_dir/$path/$_");
if ( /($match).wml/ )
{
$base = $1;
Index: fixes_link.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/fixes_link.wml,v
retrieving revision 1.34
diff -u -r1.34 fixes_link.wml
--- fixes_link.wml 2000/05/17 06:29:27 1.34
+++ fixes_link.wml 2000/09/23 21:56:35
@@ -1,3 +1,5 @@
+#use wml::std::tags
+
<perl>
# creates a link given the parameters or returns "arch: N/A" or "arch: not fixed"
Index: language_names.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/language_names.wml,v
retrieving revision 1.113
diff -u -r1.113 language_names.wml
--- language_names.wml 2000/08/28 14:24:18 1.113
+++ language_names.wml 2000/09/23 21:56:35
@@ -1,3 +1,5 @@
+#use wml::std::tags
+
# Add a new entry for your language. Also add the english name for your
# country to the existing entries. Use the same word for the translation
# and make a request on debian-www for people to add the translations
Index: languages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/languages.wml,v
retrieving revision 1.57
diff -u -r1.57 languages.wml
--- languages.wml 2000/09/07 12:38:13 1.57
+++ languages.wml 2000/09/23 21:56:35
@@ -1,4 +1,5 @@
#use wml::sup::path
+#use wml::std::tags
#use wml::debian::language_names
<perl>
Index: menubar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/menubar.wml,v
retrieving revision 1.144
diff -u -r1.144 menubar.wml
--- menubar.wml 2000/08/18 01:32:13 1.144
+++ menubar.wml 2000/09/23 21:56:36
@@ -1,5 +1,3 @@
-$(WML1_IGNORE:*#) $(WML1_IGNORE=#use)
-$(WML1_IGNORE:-#) wml::sys::compat1
#use wml::debian::languages
#use wml::debian::countries
@@ -475,18 +473,18 @@
</define-tag>
# %0 and %1 are for font color and font size
-<define-container FONTS_SANS-SERIF whitespace=delete>
+<define-tag FONTS_SANS-SERIF endtag=required whitespace=delete>
<FONT FACE="$(SANS_SERIF_FONT:-Arial,Helvetica)" %0 %1>
%body
</FONT>
-</define-container>
+</define-tag>
# Do not change anything below here without asking on debian-www first
<TABLE border="0" cellpadding="5" cellspacing="0" width="100%">
<TR>
<TD valign="TOP" \
- width=<: if ("$(MENUWIDTH)" eq "") {print "140"} else {print "$(MENUWIDTH)"} :> bgcolor="#BBDDFF">
+ width=<ifeq "$(MENUWIDTH)" "" "140" "$(MENUWIDTH)"> bgcolor="#BBDDFF">
<BR>
<P><FONTS_SANS-SERIF><B><A href="$(HOME)/"><home></A></B></FONTS_SANS-SERIF></P>
Index: news_index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/news_index.wml,v
retrieving revision 1.4
diff -u -r1.4 news_index.wml
--- news_index.wml 1999/08/08 19:07:48 1.4
+++ news_index.wml 2000/09/23 21:56:36
@@ -1,3 +1,4 @@
+#use wml::std::tags
#use wml::debian::ctime
<perl>
Index: past_event.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/past_event.wml,v
retrieving revision 1.9
diff -u -r1.9 past_event.wml
--- past_event.wml 2000/08/17 12:41:07 1.9
+++ past_event.wml 2000/09/23 21:56:36
@@ -1,5 +1,6 @@
#use wml::debian::basic title="Upcoming Attractions"
#use wml::debian::languages
+#use wml::std::tags
<perl>
#############################################################################
Index: recent_list.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/recent_list.wml,v
retrieving revision 1.44
diff -u -r1.44 recent_list.wml
--- recent_list.wml 2000/05/13 18:02:27 1.44
+++ recent_list.wml 2000/09/23 21:56:36
@@ -1,4 +1,5 @@
#use wml::debian::ctime
+#use wml::std::tags
<define-tag noitemsforthisyear whitespace=delete>
[EN:No items for this year.:]
Index: recent_news.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/recent_news.wml,v
retrieving revision 1.8
diff -u -r1.8 recent_news.wml
--- recent_news.wml 1999/08/08 19:07:48 1.8
+++ recent_news.wml 2000/09/23 21:56:36
@@ -1,10 +1,12 @@
#use wml::debian::ctime
+#use wml::std::tags
<perl>
# grabs the date and title of the last $number news items from directory $year.
# If $number is zero then all the news items are shown.
+<protect pass=2>
sub get_recent_news {
my ($year, $number, $eng_dir) = @_;
@@ -16,7 +18,7 @@
$count = 0;
foreach (@files) {
$count++;
- open(FILE, "<$year/$_") || open(FILE, "<$eng_dir/$year/$_");
+ open(FILE, "< $year/$_") || open(FILE, "< $eng_dir/$year/$_");
if (/(\d+\w?).wml/) {
$base = $1;
}
@@ -46,5 +48,5 @@
close DIR;
return $str;
}
-
+</protect>
</perl>
Index: release.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/release.wml,v
retrieving revision 1.7
diff -u -r1.7 release.wml
--- release.wml 2000/09/16 18:06:17 1.7
+++ release.wml 2000/09/23 21:56:36
@@ -1,4 +1,7 @@
+#use wml::std::tags
+
<perl>
+<protect pass=2>
#
# emits an bunch of li (list items)
@@ -136,4 +139,5 @@
}
}
+</protect>
</perl>
Index: security.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/security.wml,v
retrieving revision 1.48
diff -u -r1.48 security.wml
--- security.wml 2000/09/02 05:34:58 1.48
+++ security.wml 2000/09/23 21:56:36
@@ -3,7 +3,6 @@
#use wml::debian::fixes_link
#use wml::debian::languages
#use wml::debian::ctime
-#use wml::std::href
<define-tag datereported whitespace=delete>
[EN:Date Reported:]
Index: template.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/template.wml,v
retrieving revision 1.9
diff -u -r1.9 template.wml
--- template.wml 2000/08/17 12:41:07 1.9
+++ template.wml 2000/09/23 21:56:36
@@ -4,10 +4,9 @@
#use wml::debian::basic SUMMARY="$(SUMMARY)"
#use wml::debian::languages
-<: if ("$(NOHEADER)" eq "") {
- print "<H1>$(title)</H1>\n";
- }
-:>
+<ifeq "$(NOHEADER)" ""
+ "<H1>$(title)</H1>
+">
{#mainbody#}
Index: votebar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/votebar.wml,v
retrieving revision 1.47
diff -u -r1.47 votebar.wml
--- votebar.wml 2000/08/29 18:29:22 1.47
+++ votebar.wml 2000/09/23 21:56:36
@@ -1,5 +1,6 @@
#use wml::debian::languages
#use wml::debian::common_translation
+#use wml::std::tags
<define-tag needsponsors whitespace=delete>
[EN:Waiting for Sponsors:]
Reply to: