improvements to the language of the installer

moved borrower categories defaults for English into a separate sql file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
index 7b1c4a7..b2577ac 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
@@ -117,10 +117,10 @@ function Hide(link) {
   </p>
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="addframeworks"-->
-  <h2 align="center">Data added</h2>
+  <h2 align="center">Results of installation:</h2>
   <p>Language :<!--TMPL_VAR Name="fwklanguage"--></p>
   <!--TMPL_LOOP Name="list"-->
-  <h3> <!--TMPL_VAR Name="level"--></h3>
+  <h3><!--TMPL_VAR Name="level"--> data added</h3>
   <p>
   <ul>
   <!--TMPL_LOOP Name="fwklist"-->
@@ -131,7 +131,6 @@ function Hide(link) {
   <!--/TMPL_LOOP-->
   <p>Installation complete.<br/>
     <p>Click on Finish to complete and load the Koha Staff Interface.
-    The installer will be disabled for security reasons.
     <form name="finish">
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="finish" />

diff --git a/misc/sql-datas/en/optional/borrower_categories.sql b/misc/sql-datas/en/optional/borrower_categories.sql
new file mode 100644 (file)
index 0000000..d7d35ad
--- /dev/null
+++ b/misc/sql-datas/en/optional/borrower_categories.sql
@@ -0,0 +1,4 @@
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PATRON','patron',12,100,18,NULL,NULL,'0.000000',0,NULL,'0.000000','A');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('CHILD','child',12,18,0,NULL,NULL,'0.000000',0,NULL,'0.000000','C');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('INST','institution',12,100,0,NULL,NULL,'0.000000',0,NULL,'0.000000','I');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PROF','professional',12,100,18,NULL,NULL,'0.000000',0,NULL,'0.000000','P');

diff --git a/misc/sql-datas/en/optional/borrower_categories.txt b/misc/sql-datas/en/optional/borrower_categories.txt
new file mode 100644 (file)
index 0000000..b31389e
--- /dev/null
+++ b/misc/sql-datas/en/optional/borrower_categories.txt
@@ -0,0 +1 @@
+Default borrower categories: Adult Patron, Child, Institution, Professional. You can add additional categories after installation.

diff --git a/misc/sql-datas/en/optional/library.sql b/misc/sql-datas/en/optional/library.sql
index 0287e28..2d3b9d5 100644 (file)
--- a/misc/sql-datas/en/optional/library.sql
+++ b/misc/sql-datas/en/optional/library.sql
@@ -1,4 +1,10 @@
 INSERT INTO `branches` (branchcode, branchname) VALUES ('MAIN','Main Library');
+
 INSERT INTO `currency` (currency, rate) VALUES ('USD', 1.0);
-INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`) VALUES ('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,0,2,'USMARC'),('amicus.collectionscanada.ca',210,'NL','','','AMICUS',2,0,3,'USMARC'),('66.213.78.76',9999,'NPLKoha','','','NELSONVILLE PUBLIC LIBRARY',3,0,4,'USMARC');
-INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PATRON','patron',20,100,10,NULL,NULL,'0.000000',0,NULL,'0.000000','A');
+
+INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`) VALUES
+('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,2,'USMARC'),
+('amicus.collectionscanada.ca',210,'NL','','','AMICUS',2,1,3,'USMARC'),
+('66.213.78.76',9999,'NPLKoha','','','NELSONVILLE PUBLIC LIBRARY',3,0,4,'USMARC');
+
+