[PATCH] BUG 2611: Changed catalogue to catalog and fixed

[Nicole Engard]

capitalization.
Content-Type: text/plain; charset="utf-8"

---
 installer/data/mysql/en/mandatory/userflags.sql |   10 +++++-----
 installer/data/mysql/updatedatabase.pl          |   11 +++++++++++
 kohaversion.pl                                  |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/userflags.sql
b/installer/data/mysql/en/mandatory/userflags.sql
index 0c1493f..9f84d78 100644
--- a/installer/data/mysql/en/mandatory/userflags.sql
+++ b/installer/data/mysql/en/mandatory/userflags.sql
@@ -1,17 +1,17 @@
 INSERT INTO `userflags` VALUES(0,'superlibrarian','Access to all librarian
functions',0);
 INSERT INTO `userflags` VALUES(1,'circulate','Circulate books',0);
-INSERT INTO `userflags` VALUES(2,'catalogue','View Catalogue (Librarian
Interface)',0);
+INSERT INTO `userflags` VALUES(2,'catalogue','View Catalog (Librarian
Interface)',0);
 INSERT INTO `userflags` VALUES(3,'parameters','Set Koha system
parameters',0);
 INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify borrowers',0);
 INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0);
 INSERT INTO `userflags` VALUES(6,'reserveforothers','Reserve books for
patrons',0);
 INSERT INTO `userflags` VALUES(7,'borrow','Borrow books',1);
-INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalogue (Modify
bibliographic/holdings data)',0);
+INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify
bibliographic/holdings data)',0);
 INSERT INTO `userflags` VALUES(10,'updatecharges','Update borrower
charges',0);
 INSERT INTO `userflags` VALUES(11,'acquisition','Acquisition and/or
suggestion management',0);
 INSERT INTO `userflags` VALUES(12,'management','Set library management
parameters',0);
 INSERT INTO `userflags` VALUES(13,'tools','Use tools (export, import,
barcodes)',0);
-INSERT INTO `userflags` VALUES(14,'editauthorities','allow to edit
authorities',0);
-INSERT INTO `userflags` VALUES(15,'serials','allow to manage serials
subscriptions',0);
-INSERT INTO `userflags` VALUES(16,'reports','allow to access to the reports
module',0);
+INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit
authorities',0);
+INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials
subscriptions',0);
+INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports
module',0);
 INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions
for staff users',0);
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 1de71fc..9b37206 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2510,6 +2510,17 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
     print " Upgrade to $DBversion done (change max length of itemcallnumber
to 255 from 30.)\n";
 }

+$DBversion = '3.01.00.043';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("UPDATE userflags SET flagdesc='View Catalog (Librarian
Interface)' WHERE bit=2;");
+    $dbh->do("UPDATE userflags SET flagdesc='Edit Catalog (Modify
bibliographic/holdings data)' WHERE bit=9;");
+    $dbh->do("UPDATE userflags SET flagdesc='Allow to edit authorities'
WHERE bit=14;");
+    $dbh->do("UPDATE userflags SET flagdesc='Allow to access to the reports
module' WHERE bit=16;");
+    $dbh->do("UPDATE userflags SET flagdesc='Allow to manage serials
subscriptions' WHERE bit=15;");
+    SetVersion ($DBversion);
+    print " Upgrade to $DBversion done (fix spelling/capitalization to make
things match the standard.)\n";
+}
+
 =item DropAllForeignKeys($table)

   Drop all foreign keys of the table $table
diff --git a/kohaversion.pl b/kohaversion.pl
index 5367044..9701165 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
 use strict;

 sub kohaversion {
-    our $VERSION = '3.01.00.042';
+    our $VERSION = '3.01.00.043';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
-- 
1.5.6.5

--0016e644de6c988f2304714c4c0e
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable