From 7b2e4ebce2e42d5d8150429768fc50737021bd64 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Sep 2008 10:26:40 -0500 Subject: [PATCH] A few more en-US spelling corrections; Markup corrections; Standardizing on "email" instead of "e-mail"; Copying isbn-formatting from opac-detail.pl to detail.pl; Signed-off-by: Galen Charlton --- catalogue/detail.pl | 4 +-- catalogue/issuehistory.pl | 2 -- .../prog/en/includes/biblio-view-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- .../prog/en/includes/members-menu.inc | 3 ++ .../prog/en/modules/acqui/supplier.tmpl | 4 +-- .../prog/en/modules/admin/admin-home.tmpl | 2 +- .../prog/en/modules/admin/branches.tmpl | 2 +- .../prog/en/modules/catalogue/MARCdetail.tmpl | 40 +++++++++++----------- .../prog/en/modules/catalogue/detail.tmpl | 12 +++---- .../prog/en/modules/catalogue/moredetail.tmpl | 6 ++-- .../prog/en/modules/circ/circulation.tmpl | 4 +-- .../prog/en/modules/circ/selectbranchprinter.tmpl | 4 +-- .../prog/en/modules/members/boraccount.tmpl | 2 +- .../prog/en/modules/members/member-flags.tmpl | 2 +- .../prog/en/modules/members/memberentrygen.tmpl | 10 +++--- .../prog/en/modules/members/messaging.tmpl | 4 +-- .../prog/en/modules/members/moremember.tmpl | 6 ++-- .../prog/en/modules/tools/viewlog.tmpl | 4 +-- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 2 ++ .../prog/en/modules/opac-sendbasketform.tmpl | 2 +- .../prog/en/modules/opac-userdetails.tmpl | 2 +- 22 files changed, 62 insertions(+), 59 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 7d1be059af..d6e40000be 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -188,8 +188,8 @@ $template->param( # XISBN Stuff my $xisbn=$dat->{'isbn'}; -$xisbn =~ s/(p|-| |:)//g; -$template->param(amazonisbn => $xisbn); +$xisbn =~ /(\d*[X]*)/; +$template->param(amazonisbn => $1); # FIXME: so it is OK if the ISBN = 'XXXXX' ? if (C4::Context->preference("FRBRizeEditions")==1) { eval { $template->param( diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl index d1b38b6645..6e7e1072e7 100755 --- a/catalogue/issuehistory.pl +++ b/catalogue/issuehistory.pl @@ -42,8 +42,6 @@ my $params = $query->Vars; my $biblionumber = $params->{'biblionumber'}; my $itemnumber = $params->{'itemnumber'}; -my $title = $params->{'title'}; -my $author = $params->{'author'}; my ($issues,$biblio,$barcode); if ($itemnumber){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc index 07d593e4b0..3f021f9fea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -16,7 +16,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index c0e62ea786..98247e9faf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -39,7 +39,7 @@ function confirm_deletion() { $("#addtoshelfc").empty(); $("#printbiblioc").empty(); $("#export").remove(); - $("#addtoshelfc").before("
  • "); + $("#addtoshelfc").before("
  • <\/li>"); yuiToolbar(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc index e84e236dfd..892c3127d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -7,6 +7,9 @@
  • ">Circulation History
  • ">Modification Log
    • + +
  • ">Messaging
    • + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl index bf0b5eed9d..b801e1eb29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -70,7 +70,7 @@ if (f.company.value == "") { " />
  • " />
    • -
  • +
  • " />
    • @@ -172,7 +172,7 @@ if (f.company.value == "") {

    Fax:

    -

    E-mail: +

    Email: ">

    Notes:

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl index 2093c69abc..b254b77522 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl @@ -18,7 +18,7 @@
    Global system preferences
    -
    Manage global system preferences like MARC flavor, date format, administrator e-mail, and templates.
    +
    Manage global system preferences like MARC flavor, date format, administrator email, and templates.
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl index dca2c9781b..3b16826daf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -96,7 +96,7 @@
  • " />
  • " />
  • " />
    • -
  • " />
    • +
  • " />
  • " /> Can be entered as a single IP, or a subnet such as 192.168.1.*
    • "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -119,10 +119,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -149,10 +149,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -179,10 +179,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -209,10 +209,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on "> alt="Search on " /> + //images/filefind.png" height="15" title="Search on "> alt="Search on " /> @@ -239,10 +239,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -269,10 +269,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -299,10 +299,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -329,10 +329,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> @@ -359,10 +359,10 @@ function Changefwk(FwkList) {   "> - + ,phr&type=intranet&q="> - //images/filefind.png" height="15" title="Search on " alt="Search on " /> + //images/filefind.png" height="15" title="Search on " alt="Search on " /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index f004d2bcef..eb63fb566f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -61,12 +61,12 @@ function verify_images() { , , / - By "> + By ">
    + /ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="" />
      @@ -118,7 +118,7 @@ function verify_images() {
    • Subjects:
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 957d13ff61..b52144caf9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -19,7 +19,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl index a403d5eba5..bc3326a630 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl @@ -34,6 +34,7 @@
    • +
      • - - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl index 949f239166..138b3c5dff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl @@ -39,7 +39,7 @@ -        &itemnumber=">View item  +  &itemnumber=">View item  $ $ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl index 13093e530e..da9bdc6197 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl @@ -1,7 +1,7 @@ Koha › Patrons › Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> -/css/treeview/jquery.treeview.css"/> +/css/treeview/jquery.treeview.css"/>