Changeset 336

Timestamp:

03/26/04 17:25:47 (5 years ago)

Author:

earle

Message:

Added language code to questions in Build.PL and TT vars in scripts.

Location:

trunk

Files:

• Build.PL (modified) (3 diffs)
• newpage.cgi (modified) (1 diff)
• preferences.cgi (modified) (4 diffs)
• wiki.cgi (modified) (5 diffs)

trunk/Build.PL

@@ -49 +49 @@
   type     => "y_n"
   },
-{ question => "What's the URL of the wiki's stylesheet?",
+{ question => "What's the URL of the site's stylesheet?",
   variable => "stylesheet_url"
 },
-{ question => "What's the wiki called? (should be unique)",
+{ question => "What's the site called? (should be unique)",
   variable => "site_name",
-  default  => "OpenGuides Wiki"
+  default  => "My OpenGuides Site"
   },
 { question => "Do you want the navigation bar included on the home page?",
@@ -65 +65 @@
   default  => "Home"
   },
-{ question => "How would you describe the wiki?",
+{ question => "How would you describe the site?",
   variable => "site_desc",
-  default  => "Development site for openguides.org's software"
-  },
-{ question => "What city is the wiki based in?",
+  default  => "A guide to [my city]"
+  },
+{ question => "What city is the site based in?",
   variable => "default_city",
   default  => "London"
   },
-{ question => "What country is the wiki based in?",
+{ question => "What country is the site based in?",
   variable => "default_country",
   default  => "United Kingdom"
   },
-{ question => "Contact email address for the wiki admin?",
+{ question => "What language will the site be in? (Please give an ISO language code.)",
+  variable => "default_language",
+  default  => "en"
+  },
+{ question => "Contact email address for the site administrator?",
   variable => "contact_email"
   },
@@ -111 +115 @@
 my @answers;
 
-# Database type is speshull - can be one of three.
+# It is an ancient Configurer, and he chooseth one of three. 
 my $dbtype;
 my $dbtype_qu = "what type of database do you want the site to run on?  postgres/mysql/sqlite";

trunk/newpage.cgi

@@ -1 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl
+
+use warnings;
 use strict;
 

trunk/preferences.cgi

@@ -1 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
 
 use strict;
 use CGI;
-
+use lib '/home/earle/lib';
 use Config::Tiny;
 use OpenGuides::CGI;
@@ -13 +13 @@
 my $cgi = CGI->new();
 my $action = $cgi->param('action') || '';
+my $language = $config->{_}->{default_language};
 
 if ( $action eq "set_preferences" ) {
@@ -43 +44 @@
         template => "preferences.tt",
         cookies  => $cookie,
-        vars     => { not_editable           => 1,
+        vars     => {
+                      language               => $language,
+                      not_editable           => 1,
                       username               => $username,
                       include_geocache_link  => $gc_link,
@@ -63 +66 @@
         template => "preferences.tt",
         vars     => { %prefs,
+                      language     => $language,
                       not_editable => 1,
                       show_form    => 1

trunk/wiki.cgi

@@ -1 @@
-#!/usr/local/bin/perl -w
+#!/usr/local/bin/perl
 
 use strict;
@@ -30 +30 @@
 # Read in configuration values from config file.
 my $script_name = $config->{_}->{script_name};
-my $script_url = $config->{_}->{script_url};
+my $script_url  = $config->{_}->{script_url};
+my $language    = $config->{_}->{default_language};
 
 # Ensure that script_url ends in a '/' - this is done in Build.PL but
@@ -47 +48 @@
 
     # Note $q->param('keywords') gives you the entire param string.
-    # We need this because usemod has URLs like foo.com/wiki.pl?This_Page
+    # We need this to do URLs like foo.com/wiki.cgi?This_Page
     my $node = $q->param('id') || $q->param('title') || $q->param('keywords') || "";
     $node = $formatter->node_param_to_node_name( $node );
@@ -230 +231 @@
                             metadata => $node_data{metadata} );
 
-    %tt_vars = ( %tt_vars,
+    %tt_vars = (
+                 %tt_vars,
                  %metadata_vars,
                  content       => $content,
@@ -237 +239 @@
                  version       => $node_data{version},
                  node_name     => $q->escapeHTML($node),
-                 node_param    => $q->escape($node) );
+                 node_param    => $q->escape($node),
+                 language      => $language, );
+
 
     # We've undef'ed $version above if this is the current version.