From ba35ce60e1cefbfa0cfbedaca218f46f2662310e Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sat, 30 Oct 2010 00:40:15 -0400 Subject: [PATCH] bug 4991: follow-up tweaks * make some strings translatable * display library name instead of code in add/edit holiday panel * minor textual fixes to hints Signed-off-by: Galen Charlton --- .../prog/en/modules/tools/holidays.tmpl | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl index 423c7da37e..38b12dd99a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl @@ -21,7 +21,7 @@ $("#showHoliday").slideDown("fast"); $('#showDaynameOutput').html(dayName); $('#showDayname').val(dayName); - $('#showBranchNameOutput').html($("#branch").val()); + $('#showBranchNameOutput').html($("#branch :selected").text()); $('#showBranchName').val($("#branch").val()); $('#showDayOutput').html(day); $('#showDay').val(day); @@ -35,14 +35,14 @@ $('#showHolidayType').val(holidayType); if (holidayType == 'exception') { - $("#showOperationDelLabel").html('Delete this exception.'); - $("#holtype").attr("class","key exception").html("Holiday exception"); + $("#showOperationDelLabel").html(_('Delete this exception.')); + $("#holtype").attr("class","key exception").html(_("Holiday exception")); } else if(holidayType == 'weekday') { - $("#showOperationDelLabel").html('Delete this holiday.'); - $("#holtype").attr("class","key repeatableday").html("Repeatable holiday"); + $("#showOperationDelLabel").html(_('Delete this holiday.')); + $("#holtype").attr("class","key repeatableday").html(_("Repeatable holiday")); } else { - $("#showOperationDelLabel").html('Delete this holiday.'); - $("#holtype").attr("class","key holiday").html("Unique holiday"); + $("#showOperationDelLabel").html(_('Delete this holiday.')); + $("#holtype").attr("class","key holiday").html(_("Unique holiday")); } if (exceptionPosibility == 1) { @@ -58,7 +58,7 @@ $("#newHoliday").slideDown("fast"); $("#newDaynameOutput").html(dayName); $("#newDayname").val(dayName); - $("#newBranchNameOutput").html($('#branch').val()); + $("#newBranchNameOutput").html($('#branch :selected').text()); $("#newBranchName").val($('#branch').val()); $("#newDayOutput").html(day); $("#newDay").val(day); @@ -201,7 +201,7 @@

Add new holiday

  1. - Library + Library:
  2. @@ -224,7 +224,7 @@
  3. . [?] -
    Make a single holiday. For example, selecting August 1st, 2012 will make it holiday, but will not affect August 1st in other years.
    +
    Make a single holiday. For example, selecting August 1st, 2012 will make it a holiday, but will not affect August 1st in other years.
  4. . @@ -234,7 +234,7 @@
  5. . [?] -
    This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.
    +
    This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.
  6. -- 2.39.5