From 2ab91e2cb6bf038a27e975b6fd0db704ff59b97d Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 30 Mar 2011 21:49:38 +1300 Subject: [PATCH] Bug 5917 : Working on a fix for commas --- .../prog/en/includes/calendar.inc | 2 +- .../prog/en/includes/patron-search.inc | 4 +-- .../prog/en/includes/search_indexes.inc | 14 +++++----- .../en/modules/admin/aqbudget_owner_search.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 8 +++--- .../prog/en/modules/help/edithelp.tt | 4 +-- .../prog/en/modules/labels/search.tt | 8 +++--- .../en/modules/members/guarantor_search.tt | 2 +- .../prog/en/modules/opac-advsearch.tt | 28 +++++++++---------- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc index 43ba02268f..5a1deb1f16 100644 --- a/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc @@ -48,7 +48,7 @@ Calendar._TT["DAY_FIRST"] = _("Display %s first"); // This may be locale-dependent. It specifies the week-end days, as an array // of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1 // means Monday, etc. -Calendar._TT["WEEKEND"] = "0,6"; +Calendar._TT["WEEKEND"] = "0comma6"; Calendar._TT["CLOSE"] = _("Close"); Calendar._TT["TODAY"] = _("Today"); diff --git a/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc index bea05105b2..caf439862b 100644 --- a/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc @@ -55,8 +55,8 @@ YAHOO.util.Event.onContentReady("header_search", function() { [% END %] order by: [% IF ( branchloop ) %] diff --git a/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc index aa140f22ca..84c73ba1b8 100644 --- a/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc +++ b/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc @@ -1,24 +1,24 @@ - + - - + + - + diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt index 3a40f2d1f1..209c8329a3 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt @@ -7,9 +7,9 @@ tinyMCE.init({ theme : "advanced", plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu", theme_advanced_disable : "underline,strikethrough,styleselect,image", - theme_advanced_buttons1_add_before : "save,separator", + theme_advanced_buttons1_add_before : "savecommaseparator", theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator", - theme_advanced_buttons3_add_before : "tablecontrols,separator", + theme_advanced_buttons3_add_before : "tablecontrolscommaseparator", theme_advanced_buttons3_add : "iespell,advhr,separator,print", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", diff --git a/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt index 7aeac7f84b..07728dadb4 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt @@ -41,8 +41,8 @@ to add to Batch [% batch_id %] [% IF ( selected ) %] [% ELSE %][% END %] -[% IF ( selected ) %] -[% ELSE %][% END %] +[% IF ( selected ) %] +[% ELSE %][% END %] [% IF ( selected ) %] [% ELSE %][% END %] @@ -52,8 +52,8 @@ to add to Batch [% batch_id %] [% ELSE %] [% END %] -[% IF ( selected ) %] -[% ELSE %][% END %] +[% IF ( selected ) %] +[% ELSE %][% END %] [% IF ( selected ) %] [% ELSE %][% END %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt index b5b7e5dcd2..cfb03c43cd 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt @@ -51,7 +51,7 @@ Ordered by diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt index df5bae82a8..92eb8a5dd5 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -60,37 +60,37 @@ [% IF ( search_boxes_loo.expanded_options ) %][% search_boxes_loo.left_content %][% END %]