Attachment 24641 Details for Bug 7180 – Bug 7180: Follow-up fixing minor issues

[patch] Bug 7180: Follow-up fixing minor issues

Bug-7180-Follow-up-fixing-minor-issues.patch (text/plain), 3.80 KB, created by Jonathan Druart on 2014-01-23 09:09:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-01-23 09:09:57 UTC

Size: 3.80 KB

patch

obsolete

>From 8b54833d283213c88775cdffc968922aef15ab77 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Mon, 9 Sep 2013 22:53:49 +0200
>Subject: [PATCH] Bug 7180: Follow-up fixing minor issues
>
>- Fixed some labels from Budget to Fund
>- Added the system preference to sysprefs.sql
>- Fixed some untranslatable Javascript strings
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> installer/data/mysql/sysprefs.sql                              |    1 +
> .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt     |    8 ++++----
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 6ebce00..a18dd56 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -175,6 +175,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('LocalCoverImages','0','1','Display local cover images on intranet details pages.','YesNo'),
> ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'),
> ('MARCAuthorityControlField008','|| aca||aabn           | a|a     d',NULL,NULL,'Textarea'),
>+('MarcFieldsToOrder','',NULL,'Set the mapping values for a new order line created from a marcrecord (staged file). In a YAML format.','textarea'),
> ('MARCOrgCode','OSt','','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','free'),
> ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'),
> ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>index 1cba426..f70aaf5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -101,7 +101,7 @@
> 
>         $("#Aform").on("submit", function(){
>             if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) {
>-                alert("There is no record selected");
>+                alert(_("There is no record selected"));
>                 return false;
>             }
> 
>@@ -112,7 +112,7 @@
>                 }
>             });
>             if ( error > 0 ) {
>-                alert(error + " quantity values are not filled or not a number");
>+                alert(error + " " + _("quantity values are not filled or not a number"));
>                 return false;
>             }
> 
>@@ -269,7 +269,7 @@
>                                 </li>
>                                 <li>
>                                     [% IF ( close ) %]
>-                                        <span class="label">Budget: </span>
>+                                        <span class="label">Fund: </span>
>                                         <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
>                                     [% ELSE %]
>                                         <li>
>@@ -285,7 +285,7 @@
>                                             </select>
>                                         </li>
>                                         <li>
>-                                            <label for="all_budget_id">Budget: </label>
>+                                            <label for="all_budget_id">Fund: </label>
>                                             <select id="all_budget_id" size="1" name="all_budget_id">
>                                             [% FOREACH budget_loo IN budget_loop %]
>                                                 [% IF ( budget_loo.b_sel ) %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 7180: 6234 | 13019 | 15023 | 15048 | 15617 | 15677 | 15934 | 15935 | 16014 | 16505 | 16511 | 16544 | 16566 | 16613 | 19066 | 19067 | 19068 | 19316 | 19587 | 19588 | 19589 | 19590 | 19641 | 19645 | 20900 | 20901 | 20902 | 20903 | 20904 | 20926 | 20933 | 20934 | 20935 | 20978 | 20979 | 21004 | 21014 | 21017 | 21117 | 21462 | 21463 | 21464 | 21465 | 21466 | 21467 | 21468 | 21469 | 21470 | 21471 | 21472 | 21473 | 21474 | 21514 | 22546 | 22547 | 22548 | 22549 | 22550 | 22551 | 22552 | 22553 | 22554 | 22555 | 22556 | 22557 | 22558 | 22559 | 24052 | 24053 | 24054 | 24055 | 24056 | 24057 | 24058 | 24059 | 24060 | 24061 | 24062 | 24063 | 24064 | 24065 | 24636 | 24637 | 24638 | 24639 | 24640 | 24641 | 24642 | 24643 | 24644 | 24645 | 24646 | 24647 | 24648 | 24649 | 24708 | 24709 | 24710 | 24711 | 24712 | 24713 | 24714 | 24715 | 24716 | 24717 | 24718 | 24719 | 24720 | 24721 | 25908 | 26950 | 26951 | 26952 | 26953 | 26954 | 26955 | 26956 | 26957 | 26958 | 26959 | 26960 | 26961 | 26962 | 26963 | 26964 | 27128 | 27131 | 27136 | 27160 | 27325 | 27408 | 27409 | 27410 | 27411 | 27412 | 27413 | 27414 | 27415 | 27416 | 27417 | 27418 | 27419 | 27420 | 27421 | 27422 | 27423 | 27424 | 27451 | 27520 | 27561 | 27562 | 27563 | 27564 | 27565 | 27566 | 27567 | 27568 | 27569 | 27570 | 27571 | 27572 | 27573 | 27574 | 27575 | 27576 | 27577 | 27578 | 27829 | 27830 | 27831 | 27832 | 27833 | 27834 | 27835 | 27836 | 27837 | 27838 | 27839 | 27840 | 27841 | 27842 | 27843 | 27844 | 27845 | 27846 | 27847 | 27848 | 27849 | 27850 | 27851 | 27852 | 27853 | 27854 | 27855 | 27856 | 27857 | 27858 | 27859 | 27860 | 27861 | 27862 | 27863 | 27864 | 27865 | 27866