Bugzilla – Attachment 2427 Details for
Bug 5056
Untranslatable strings in members.js
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-5056-Untranslatable-strings-in-members.j.patch (text/plain), 5.25 KB, created by
Owen Leonard
on 2010-07-26 19:03:37 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2010-07-26 19:03:37 UTC
Size:
5.25 KB
patch
obsolete
>From 10315418723603cbd6bc93c419420241b794e524 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 26 Jul 2010 15:02:31 -0400 >Subject: [PATCH] Fix for Bug 5056, Untranslatable strings in members.js > >--- > koha-tmpl/intranet-tmpl/prog/en/js/members.js | 19 ++++++++++--------- > .../prog/en/modules/members/memberentrygen.tmpl | 12 ++++++++++-- > 2 files changed, 20 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/members.js b/koha-tmpl/intranet-tmpl/prog/en/js/members.js >index 145e95f..796db0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/members.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/members.js >@@ -8,7 +8,7 @@ if (d!="") { > var ok=1; > var msg; > if ( (date.length < 2) && (ok==1) ) { >- msg = _("Separator must be /"); >+ msg = MSG_SEPARATOR+field.name; > alert(msg); ok=0; field.focus(); > return; > } >@@ -17,19 +17,19 @@ if (d!="") { > var yyyy = date[2]; > // checking days > if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) { >- msg = _("day not correct."); >+ msg = MSG_INCORRECT_DAY+field.name; > alert(msg); ok=0; field.focus(); > return false; > } > // checking months > if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) { >- msg = _("month not correct."); >+ msg = MSG_INCORRECT_MONTH+field.name; > alert(msg); ok=0; field.focus(); > return false; > } > // checking years > if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) { >- msg = _("years not correct."); >+ msg = MSG_INCORRECT_YEAR+field.name; > alert(msg); ok=0; field.focus(); > return false; > } >@@ -43,13 +43,13 @@ var msg2; > if ( document.form.check_member.value==1){ > if (document.form.categorycode.value != "I"){ > >- msg1 += ("Warning !!!! Duplicate patron!!!!"); >+ msg1 += MSG_DUPLICATE_PATRON; > alert(msg1); > check_form_borrowers(0); > document.form.submit(); > > }else{ >- msg2 += ("Warning !!!! Duplicate organisation!!!!"); >+ msg2 += MSG_DUPLICATE_ORGANIZATION; > alert(msg2); > check_form_borrowers(0); > } >@@ -73,7 +73,7 @@ var myDate2=document.form.dateexpiry.value.split ('/'); > > { > document.form.dateenrolled.focus(); >- var msg = ("Warning !!! check date expiry >= date enrolment"); >+ var msg = MSG_LATE_EXPIRY; > alert(msg); > } > } >@@ -101,7 +101,8 @@ function check_form_borrowers(nav){ > else > { > var champ_verif = document.form.BorrowerMandatoryField.value.split ('|'); >- var message ="The following fields are mandatory :\n"; >+ var message = MSG_MISSING_MANDATORY >+ message += "\n"; > var message_champ=""; > for (var i=0; i<champ_verif.length; i++) { > if (document.getElementsByName(""+champ_verif[i]+"")[0]) { >@@ -131,7 +132,7 @@ function check_form_borrowers(nav){ > if (statut!=1 && document.form.check_member.value > 0 ) { > if (!(document.form_double.answernodouble.checked)){ > message =""; >- message_champ+=("Please confirm suspicious duplicate patron !!! "); >+ message_champ+= MSG_DUPLICATE_SUSPICION; > statut=1; > document.form.nodouble.value=0; > } else { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl >index b21d35a..6bd4266 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl >@@ -2,7 +2,6 @@ > <title>Koha › Patrons › > <!-- TMPL_IF NAME="opadd" --> Add<!-- TMPL_ELSE --> Modify<!--/TMPL_IF--> <!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"--> Organization patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF --><!--TMPL_UNLESS Name="opadd"--> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --><!--/TMPL_UNLESS--></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> >-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script> > <!-- TMPL_INCLUDE NAME="calendar.inc" --> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ >@@ -48,9 +47,18 @@ > }); > original.parentNode.insertBefore(clone, original.nextSibling); > } >- >+ var MSG_SEPARATOR = _("Separator must be / in field "); >+ var MSG_INCORRECT_DAY = _("Invalid day entered in field "); >+ var MSG_INCORRECT_MONTH = _("Invalid month entered in field "); >+ var MSG_INCORRECT_YEAR = _("Invalid year entered in field "); >+ var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron"); >+ var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization"); >+ var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date"); >+ var MSG_MISSING_MANDATORY = _("The following fields are mandatory:"); >+ var MSG_DUPLICATE_SUSPICION = _("Please confirm whether this is a duplicate patron"); > //]]> > </script> >+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script> > </head> > <body> > <!-- TMPL_INCLUDE NAME="header.inc" --> >-- >1.7.0.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5056
: 2427