From: root Date: Sun, 12 Aug 2007 04:51:56 +0000 (+0000) Subject: Some more changes made. X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=ea01fa56ba776c81e13c3aeda9c0626018770f8e;p=kiriwrite%2F.git Some more changes made. --- diff --git a/cgi-files/install.cgi b/cgi-files/install.cgi index d6df2ec..0bb18dc 100755 --- a/cgi-files/install.cgi +++ b/cgi-files/install.cgi @@ -110,6 +110,7 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"errormessagetext"} = "Please press the back button on your browser or preform the command needed to return to the previous page."; + $kiriwrite_lang{"en-GB"}{"switch"} = "Switch"; $kiriwrite_lang{"en-GB"}{"setting"} = "Setting"; $kiriwrite_lang{"en-GB"}{"value"} = "Value"; $kiriwrite_lang{"en-GB"}{"filename"} = "Filename"; @@ -1770,7 +1771,7 @@ foreach $language_name_short (@language_list_short){ } print " "; -print submit('Switch'); +print submit($kiriwrite_lang{$language_selected}{switch}); print end_form; print end_td(); diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi index 4f0fc6d..b787558 100755 --- a/cgi-files/kiriwrite.cgi +++ b/cgi-files/kiriwrite.cgi @@ -1816,7 +1816,7 @@ sub kiriwrite_page_edit{ $kiriwrite_presmodule->addlinebreak(); $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{editpagebutton}); $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{common}->{clearvalues}); + $kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{restorecurrent}); $kiriwrite_presmodule->addtext(" | "); $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name) } ); @@ -7048,8 +7048,8 @@ sub kiriwrite_filter_list{ $kiriwrite_presmodule->addlinebreak(); $kiriwrite_presmodule->addlinebreak(); - # If the filters database exists then get the list of filters, - # otherwise write a message saying that the filters database + # If the filter database exists then get the list of filters, + # otherwise write a message saying that the filter database # does not exist and will be created when a filter is added. if ($filtersdb_notexist eq 0){ @@ -7062,7 +7062,7 @@ sub kiriwrite_filter_list{ if ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){ - # A database error has occured with the filters database. + # A database error has occured with the filter database. kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1)); @@ -7114,12 +7114,12 @@ sub kiriwrite_filter_list{ } - # Check if there are filters in the filters database and + # Check if there are filters in the filter database and # write a message if there isn't. if ($filter_count eq 0){ - # There are no filters in the filters database. + # There are no filters in the filter database. $filterswarning = $kiriwrite_lang->{filter}->{nofiltersavailable}; @@ -7134,7 +7134,7 @@ sub kiriwrite_filter_list{ if ($filtersdb_notexist eq 1){ - # The filters database doesn't exist so write + # The filter database doesn't exist so write # a message. $filterswarning = $kiriwrite_lang->{filter}->{filterdatabasedoesnotexist}; @@ -7154,7 +7154,7 @@ sub kiriwrite_filter_list{ } else { - # The filters database exists so write out the + # The filter database exists so write out the # list of filters. if ($blankfindfilter eq 1){ @@ -7411,7 +7411,7 @@ sub kiriwrite_filter_add{ } - # Connect to the filters database. + # Connect to the filter database. $kiriwrite_dbmodule->connectfilter(1); @@ -7470,7 +7470,7 @@ sub kiriwrite_filter_add{ $kiriwrite_dbmodule->disconnect(); # Write out a message saying that the filter was added to the - # filters database. + # filter database. $kiriwrite_presmodule->addtext($kiriwrite_lang->{filter}->{filteradded}, { Style => "pageheader" }); $kiriwrite_presmodule->addlinebreak(); @@ -7572,7 +7572,7 @@ sub kiriwrite_filter_edit{ # newfilterpriority, newfilternotes, confirm); # # # # filterid Specifies the filter number (line number) in the # -# filters database. # +# filter database. # # newfilterfind Specifies the new word to find. # # newfilterreplace Specifies the new word to replace. # # newfilterpriority Specifies the new filter priority. # @@ -7765,7 +7765,7 @@ sub kiriwrite_filter_edit{ } - # Connect to the filters database. + # Connect to the filter database. $kiriwrite_dbmodule->connectfilter(); @@ -7802,7 +7802,7 @@ sub kiriwrite_filter_edit{ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){ - # A database error has occured while using the filters database + # A database error has occured while using the filter database # so return an error. kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1)); @@ -7870,7 +7870,7 @@ sub kiriwrite_filter_edit{ } - # Connect to the filters database. + # Connect to the filter database. $kiriwrite_dbmodule->connectfilter(); @@ -8154,7 +8154,7 @@ sub kiriwrite_filter_delete{ $kiriwrite_dbmodule->disconnect(); # Write a message saying that the filter was deleted - # from the filters database. + # from the filter database. $kiriwrite_presmodule->addtext($kiriwrite_lang->{filter}->{deletedfilter}, { Style => "pageheader" }); $kiriwrite_presmodule->addlinebreak(); @@ -8466,7 +8466,7 @@ sub kiriwrite_compile_makepages{ } - # Load the filters database (if the filters skip + # Load the filter database (if the filters skip # value isn't set to 1). if ($filters_skip eq 0){ @@ -8479,7 +8479,7 @@ sub kiriwrite_compile_makepages{ if ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){ - # A database error has occured with the filters database. + # A database error has occured with the filter database. $kiriwrite_presmodule->addtext($error_prefix . kiriwrite_language($kiriwrite_lang->{compile}->{filterdatabaseerror}, $kiriwrite_dbmodule->geterror(1))); $kiriwrite_presmodule->addlinebreak(); @@ -8635,7 +8635,7 @@ sub kiriwrite_compile_makepages{ # Place each template file into the hash. - $templatefiles{$template_info{"TemplateFilename"}}{template} = $template_info{"TemplateFilename"}; + $templatefiles{$template_info{"TemplateFilename"}}{template} = $template_info{"TemplateLayout"}; $templatefiles{$template_info{"TemplateFilename"}}{valid} = 1; } @@ -8806,18 +8806,14 @@ sub kiriwrite_compile_makepages{ } else { - if ($page_content){ - - $page_final = $templatefiles{$page_template}{template}; - - if (!$page_final){ - $page_final = ""; - } - - $page_final =~ s//$page_content/g; + $page_final = $templatefiles{$page_template}{template}; + if (!$page_final){ + $page_final = ""; } + $page_final =~ s//$page_content/g; + } # Create the combined page title (if needed). @@ -13969,7 +13965,7 @@ if ($query->param('mode')){ if ($http_query_action eq "add"){ # The action the user requested is to add a filter to the - # filters database. + # filter database. # Check if there is a value in confirm and if there is # then pass it on to the new find and replace words @@ -13981,7 +13977,7 @@ if ($query->param('mode')){ # There is a value in http_query_confirm, so pass on the # new find and replace words so that they can be added - # to the filters database. + # to the filter database. my $http_query_findwords = $query->param('findword'); my $http_query_replacewords = $query->param('replaceword'); @@ -14005,7 +14001,7 @@ if ($query->param('mode')){ } elsif ($http_query_action eq "edit"){ # The action the user requested is to edit an filter from - # the filters database. + # the filter database. my $http_query_number = $query->param('filter'); my $http_query_confirm = $query->param('confirm'); @@ -14013,7 +14009,7 @@ if ($query->param('mode')){ if ($http_query_confirm){ # There is a value in http_query_confirm, so pass on the - # new find and replace words so that the filters database + # new find and replace words so that the filter database # can be edited. my $http_query_findwords = $query->param('filterfind'); @@ -14038,7 +14034,7 @@ if ($query->param('mode')){ } elsif ($http_query_action eq "delete"){ # The action the user requested is to delete an filter - # from the filters database. + # from the filter database. my $http_query_number = $query->param('filter'); my $http_query_confirm = $query->param('confirm'); diff --git a/cgi-files/lang/en-GB.xml b/cgi-files/lang/en-GB.xml index a1a3556..aa769e0 100644 --- a/cgi-files/lang/en-GB.xml +++ b/cgi-files/lang/en-GB.xml @@ -179,8 +179,8 @@ Return to the filter list. View Filters - There are no filters available in the filters database. To add a filter, click on the Add Filter link. - The filters database does not exist and will be created when a filter is added. + There are no filters available in the filter database. To add a filter, click on the Add Filter link. + The filter database does not exist and will be created when a filter is added. Warning: One (or more) of your filters has a blank find filter and needs to be fixed. Blank Find Setting @@ -274,15 +274,15 @@ [Warning] Compile Databases - The filters database does not exist. No filters will be used. - The filters database has invalid permissions set. No filters will be used. + The filter database does not exist. No filters will be used. + The filter database has invalid permissions set. No filters will be used. A filter database error has occurred: %s. No filters will be used. - One (or more) of the find filters from the filters database is blank. - Finished processing the filters database. - The templates database does not exist. Pages will be compiled without templates being used. - The templates database has invalid permissions set. Pages will be compiled without templates being used. + One (or more) of the find filters from the filter database is blank. + Finished processing the filter database. + The template database does not exist. Pages will be compiled without templates being used. + The template database has invalid permissions set. Pages will be compiled without templates being used. A database error occurred while trying to get the list of templates: %s - Finished processing the templates database. + Finished processing the template database. The database with the filename '%s' has invalid characters. Skipping this database... The database with the filename '%s' is too long. Skipping this database... The database with the filename '%s' does not exist. Skipping this database... @@ -400,10 +400,10 @@ The database directory name given was blank. The database directory name given was invalid. The database module with the filename given is missing. - The filters database was not created because of the invalid permissions set. - A database error has occurred while using the filters database. - The filters database has invalid permission settings. - The filters database is missing. + The filter database was not created because of the invalid permissions set. + A database error has occurred while using the filter database. + The filter database has invalid permission settings. + The filter database is missing. The filter identification number given is blank. The filter with the identification number given does not exist. The filter identification number given is invalid. @@ -483,7 +483,7 @@ The template name given is too long The template description given is too long The template database is missing. - The template filename given does not exist in the templates database. + The template filename given does not exist in the template database. The template filename given was blank.