removed needless new tag <intro>, added <br> and the missing full point, some cosmetics

CVS version numbers

croatian/events/index.wml: 1.7 -> 1.8 
english/events/index.wml: 1.20 -> 1.21 
french/events/index.wml: 1.2 -> 1.3 
german/events/index.wml: 1.1 -> 1.2 
italian/events/index.wml: 1.3 -> 1.4 
japanese/events/index.wml: 1.5 -> 1.6 
norwegian/events/index.wml: 1.4 -> 1.5 
romanian/events/index.wml: 1.2 -> 1.3 
russian/events/index.wml: 1.4 -> 1.5 
swedish/events/index.wml: 1.10 -> 1.11

1 files changed, 8 insertions, 261 deletions

diff --git a/romanian/events/index.wml b/romanian/events/index.wml
index 5195115ad00..bececce0a5c 100644
--- a/romanian/events/index.wml
+++ b/romanian/events/index.wml
@@ -1,276 +1,23 @@
-#use wml::debian::basic title="Upcoming Attractions"
-#use wml::debian::languages
+#use wml::debian::template title="Upcoming Attractions"
 
-<!-- translation from EN 1.19 -->
+#<!-- translation from EN 1.21 -->
 
-#words and phrases to translate
-<define-tag intro>
-Această pagină conține o listă de evenimente din toată comunitatea. Deasemenea 
+<p>Această pagină conține o listă de evenimente din toată comunitatea. Deasemenea 
 specifică implicares Debian în aceste evenimente. 
+<br>
 Dacă doriți să ajutați, trimite-ți mail direct la coordonatorul evenimentului. 
 Dacă nici un coordonator nu este listat și sînteți interesat să coordonați 
-evenimentul sau doriți să ne informați despre alte evenimente,  trimite-ți mail la &lt;<A
-HREF="mailto:events@debian.org">events@debian.org</A>&gt;
+evenimentul sau doriți să ne informați despre alte evenimente,  trimite-ți mail la
+&lt;<A HREF="mailto:events@debian.org">events@debian.org</A>&gt;.
 
+<p>Această pagină este în dezvoltare și orice sugestie/ajutor sînt binevenite!
 
-<p>
-Această pagină este în dezvoltare și orice sugestie/ajutor sînt binevenite!
-</define-tag>
 <define-tag event_word>Evenimente</define-tag>
 <define-tag past_words>Evenimente trecute</define-tag>
 <define-tag none_word>nimic</define-tag>
 
-<perl>
-sub get_event_list {
-	my ( $path, $number, $current_dir ) = @_;
-
-
-	$str=""; $over=""; $current=""; $unknown="";
-
-	opendir(DIR, "$current_dir/$path");
-  	@files = grep { /^\d+.*.wml$/ && -f "$current_dir/$path/$_" } readdir(DIR);
-  	@files = sort @files;
-  	closedir DIR;
-
-  $count = 0;
-  foreach (@files) {
-     $count++;
-     open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
-     if ( /(\d+.*).wml/ ) {
-        $base = $1;
-     }
-     $title = ''; $when = ''; $where = ''; $desc = ''; $past = '';
-     <protect pass=2>
-     foreach $line (<FILE>) {
-        if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
-           $title = $1;
-        }
-        elsif ($line =~ /^#use wml::debian::past_event$/) {
-           $past = 'yes';
-        }
-        elsif ($line =~ /^#use wml::debian::event$/) {
-           $past = 'no';
-        }
-        elsif ($line =~ /^<define-tag date>(.*)<\/define-tag>$/) {
-           $when = $1;
-        }
-        elsif ($line =~ /^<define-tag where>(.*)<\/define-tag>$/) {
-           $where = $1;
-        }
-        elsif ($line =~ /^<define-tag desc>(.*)<\/define-tag>$/) {
-           $desc = $1;
-        }
-
-		if ($title && $when && $where) {
-           $str1 = "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG><A HREF=\"$path/$base\">$title</A></STRONG> ($where)</TD></TR>\n";
-		}
-		elsif ($title && $when) {
-           $str1 = "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG><A HREF=\"$path/$base\">$title</A></STRONG></TD></TR>\n";
-		}
-
-		if ($past && $title && $when && $where ) {
-			last;
-		}
-     }
-     </protect>
-	 if ( $past eq "yes" )
-	 {
-	 	$over .= $str1;
-	 }
-	 elsif ( $past eq "no" )
-	 {
-	 	$current .= $str1;
-	 }
-	 else
-	 {
-	 	$unknown .= $str1;
-	 }
-     close FILE;
-     if ($count eq $number) { last; }
-  }
-if ( $over eq "" && $current eq "" && $unknown eq "" )
-{
-	$str = "$path - [<none_word>]<BR>";
-}
-else
-{
-	$str = "";
-	if ( $current ne "" ) { $str .= "<H3>$path <event_word></H3><TABLE>$current</TABLE>"; }
-	if ( $over ne "" ) { $str .= "<A HREF=\"./$path/\">$path - <past_words></A><BR>"; }
-	if ( $unknown ne "" ) { $str .= "<H3>$path Unknown (indicates bug)</H3><TABLE>$unknown</TABLE>"; }
-}
-return $str;
-}
-
-# get_past_event_list
-# This finds out if the given year (or any years if none are given) has any
-# events that have past.  If there are it provides links.
-#
-# Sun Aug  1 18:11:02 EDT 1999
-# Added.  Code is mostly stolen from get_event_list();
-# - blackie@sfcc.net
-
-
-sub get_past_event_list {
-my $str = '';
-my @paths = ();
-my ($current_dir, $path, $monthorder, $yearorder ) = @_;
-if ($path ne '') {
-  push(@paths,$path);
-}
-
-if ($path eq '') {
-  ($sec,$min,$hour,$mday,$month,$year,$wday,$yday,$isdst) = localtime(time);
-  # This is not a y2k bug.
-  $year += '1900';
-  $path = $year;
-  while (1) {
-    if ( -d "$current_dir/$path") {
-      push(@paths,$path);
-      $path--;
-    } else {
-      last;
-    }
-  }
-  if ($yearorder ne 'futurefirst') {
-    @paths =  reverse @paths;
-  }
-}
-
-foreach $path (@paths) {
-  opendir(DIR, "$current_dir/$path") || last;
-  @files = grep { /^\d+.*.wml$/ && -f "$current_dir/$path/$_" } readdir(DIR);
-  @files = sort @files;
-  closedir DIR;
-  foreach (@files) {
-    open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
-    if ( /(\d+.*).wml/ ) {
-       $base = $1;
-    }
-    my $past = '';
-    foreach $line (<FILE>) {
-       if ($line =~ /^#use wml::debian::past_event$/) {
-           $past = 'yes';
-           last;
-       }
-    }
-    if ($past eq 'yes') {
-    $str .= "<A HREF=\"./$path/\">$path - <past_words></A><BR>"; 
-    last;
-    }
-  close FILE;
-  }
-}
-return $str;
-}
-
-
-# get_future_event_list
-# This displays future events in whatever order the translator asks.
-#
-# Sun Aug  1 18:11:02 EDT 1999
-# Added.  Code is mostly stolen from get_event_list();
-# - blackie@sfcc.net  
-
-sub get_future_event_list {
-my $str;
-my @paths;
-my ($current_dir, $path, $monthorder, $yearorder ) = @_;
-
-if ($path ne '') {
-  push(@paths,$path);
-}
-if ($path eq '') {
-  ($sec,$min,$hour,$mday,$month,$year,$wday,$yday,$isdst) = localtime(time);
-  # This is not a y2k bug.  
-  $year += '1900';
-  $path = $year;
-  while (1) {
-    if ( -d "$current_dir/$path") {
-      push(@paths,$path);
-      $path++;
-    } else {
-      last;
-    }
-  } 
-  if ($yearorder eq 'futurefirst') {
-    @paths =  reverse @paths;
-  }
-}
-
-foreach $path (@paths) {
-my $events = '';
-my @files = ();
-opendir(DIR, "$current_dir/$path") || last;
-@files = grep { /^\d+.*.wml$/ && -f "$current_dir/$path/$_" } readdir(DIR);
-@files = sort @files;
-if ($monthorder eq 'decfirst') {
-  @files =  reverse @files;
-}
-
-closedir DIR;
-foreach (@files) {
-open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
-  if ( /(\d+.*).wml/ ) {
-     $base = $1;
-  }
-my $title = ''; my $when = ''; my $where = ''; my $desc = ''; my $past = '';
-  foreach $line (<FILE>) {     
-     <protect pass=2>
-     if ($line =~ /^#use wml::debian::past_event$/) {
-         $past = 'yes';
-         last;
-     }
-     if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
-         $title = $1;
-     }
-     elsif ($line =~ /^<define-tag date>(.*)<\/define-tag>$/) {
-        $when = $1;
-     }
-     elsif ($line =~ /^<define-tag where>(.*)<\/define-tag>$/) {
-        $where = $1;
-     }
-     elsif ($line =~ /^<define-tag desc>(.*)<\/define-tag>$/) {
-        $desc = $1;
-     }
-     </protect>
-  }
-if ($past ne 'yes') {
-   if ($title && $when && $where) {
-      $events .= "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG> <A HREF=\"$path/$base\">$title</A></STRONG> ($where)</TD></TR>\n";
-   }
-   elsif ($title && $when) {
-      $events .= "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG> <A HREF=\"$path/$base\">$title</A></STRONG></TD></TR>\n";   
-   }
-}
-close FILE;
-}
-$str .= "<H3>$path <event_word></H3><TABLE>$events</TABLE>";
-}
-
-return $str;
-}
-
-</perl>
-
-<p>
-<intro>
-
-#
-# This has been redone.  See index.wml.README for details.  Email me if
-# you have any difficulties.
-#
-# - blackie@sfcc.net
+#include "$(ENGLISHDIR)/events/index.include"
 
 <:= get_future_event_list('$(ENGLISHDIR)/events','','','futurefirst') :>
 
-#<:= get_event_list ('1999', '0', '$(ENGLISHDIR)/events' ) :>
-
-#<:= get_event_list ('2000', '0', '$(ENGLISHDIR)/events' ) :>
-
-#<:= get_event_list ('1998', '0', '$(ENGLISHDIR)/events' ) :>
-
 <:= get_past_event_list('$(ENGLISHDIR)/events','','','futurefirst') :>
-
-<:= languages() :>
-#use wml::debian::footer