Bugzilla – Attachment 2250 Details for
Bug 4883
Problem translating \n (newline) with pootle.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch. remove \n from staff files
0002-BUG-4883-Staff-remove-n-from-strings-for-translation.patch (text/plain), 7.56 KB, created by
Katrin Fischer
on 2010-06-17 20:01:36 UTC
(
hide
)
Description:
patch. remove \n from staff files
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2010-06-17 20:01:36 UTC
Size:
7.56 KB
patch
obsolete
>From df3f960771caff9fa215a8119dfff80c50c68738 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sat, 5 Jun 2010 04:02:04 +0200 >Subject: [PATCH 2/2] BUG 4883: Staff - remove \n from strings for translation >Content-Type: text/plain; charset="utf-8" > >--- > .../prog/en/modules/admin/aqbudgets.tmpl | 12 ++++++------ > .../prog/en/modules/admin/aqcontract.tmpl | 14 +++++++------- > .../prog/en/modules/authorities/authorities.tmpl | 4 ++-- > .../prog/en/modules/reserve/request.tmpl | 6 +++--- > .../prog/en/modules/virtualshelves/shelves.tmpl | 6 +++--- > 5 files changed, 21 insertions(+), 21 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >index e607f77..8b728e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >@@ -21,15 +21,15 @@ > // var actTotal =""; > > if (!(isNotNull(f.budget_code,1))) { >- _alertString += _("- Budget code cannot be blank\n"); >+ _alertString += _("- Budget code cannot be blank") + "\n"; > } > > if (!(isNotNull(f.budget_name,1))) { >- _alertString += _("- Budget name cannot be blank\n"); >+ _alertString += _("- Budget name cannot be blank") + "\n"; > } > > if (!(isNotNull(f.budget_amount,1))) { >- _alertString += _("- Budget amount cannot be blank\n"); >+ _alertString += _("- Budget amount cannot be blank") + "\n"; > } > > var budgetId; >@@ -52,7 +52,7 @@ > if (budgetId > 0) { ; //its a mod ... > // if parent eq curent-budget, fail... > if ( newBudgetParent == budgetId ) { >- _alertString += _("- Budget parent is current budget\n"); >+ _alertString += _("- Budget parent is current budget") + "\n"; > } > > else if (newBudgetParent) { >@@ -74,8 +74,8 @@ > if (_alertString.length==0) { > document.Aform.submit(); > } else { >- alertString2 = _("Form not submitted because of the following problem(s)\n"); >- alertString2 += "------------------------------------------------------------------------------------\n\n"; >+ alertString2 = _("Form not submitted because of the following problem(s)"); >+ alertString2 += "\n------------------------------------------------------------------------------------\n\n"; > alertString2 += _alertString; > alert(alertString2); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl >index 95e8c6b..bb8c234 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl >@@ -15,30 +15,30 @@ > // to check if the data are correctly entered. > function Check(ff) { > var ok=0; >- var _alertString=_("Form not submitted because of the following problem(s)\n"); >- _alertString +="-------------------------------------------------------------------\n\n"; >+ var _alertString=_("Form not submitted because of the following problem(s)"); >+ _alertString +="\n-------------------------------------------------------------------\n\n"; > if (!(isNotNull(ff.contractname,0))){ > ok=1; >- _alertString += _("- Name missing\n"); >+ _alertString += _("- Name missing") + "\n"; > } > var startDate = Date_from_syspref($("#contractstartdate").val()); > var endDate = Date_from_syspref($("#contractenddate").val()); > if (!parseInt(startDate.getTime())) { > ok=1; >- _alertString += _("- Start date missing or invalid.\n"); >+ _alertString += _("- Start date missing or invalid.") + "\n"; > } > if (!parseInt(endDate.getTime())) { > ok=1; >- _alertString += _("- End date missing or invalid.\n"); >+ _alertString += _("- End date missing or invalid.") + "\n"; > } > > if (startDate > endDate) { > ok=1; >- _alertString += _("Wrong date! start date cannot be after end date.\n"); >+ _alertString += _("Wrong date! start date cannot be after end date.") + "\n"; > } > if (endDate < (new Date)) { > ok=1; >- _alertString += _("End date before today, Invalid end date!\n"); >+ _alertString += _("End date before today, Invalid end date!") + "\n"; > } > if (ok) { // if there is a problem > alert(_alertString); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl >index 72b132f..3304403 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl >@@ -91,14 +91,14 @@ function AreMandatoriesNotOk(){ > > if(isempty){ > flag = 1; >- StrAlert += "\t* Field " + arr[0] + " is mandatory, at least one of its subfields must be filled\n"; >+ StrAlert += "\t* Field " + arr[0] + _(" is mandatory, at least one of its subfields must be filled") + "\n"; > } > > } > > > if(StrAlert){ >- return _("Can't save this record because the following field aren't filled :\n\n") + StrAlert; >+ return _("Can't save this record because the following field aren't filled :") + "\n\n" + StrAlert; > } > return false; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >index 0f06ec8..5e81e1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl >@@ -47,14 +47,14 @@ function check() { > } > > if (count_reserv == "0"){ >- msg += (_("- Please select an item to place a hold\n")); >+ msg += (_("- Please select an item to place a hold") + "\n"); > } > if (count_reserv >= "2"){ >- msg += (_("- You may only place a hold on one item at a time\n")); >+ msg += (_("- You may only place a hold on one item at a time") + "\n"); > } > > if (alreadyreserved > "0"){ >- msg += (_("- This patron had already placed a hold on this item\n Please cancel the previous hold first \n")); >+ msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n"); > } > > if (msg == "") return(true); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl >index 39e6793..b335fb2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl >@@ -96,14 +96,14 @@ function placeHold () { > var alertString2; > > if(f.addshelf.value.length ==0){ >- _alertString += _("- You must enter a List Name\n"); >+ _alertString += _("- You must enter a List Name") + "\n"; > } > > if (_alertString.length==0) { > document.Aform.submit(); > } else { >- alertString2 = _("Form not submitted because of the following problem(s)\n"); >- alertString2 += "------------------------------------------------------------------------------------\n\n"; >+ alertString2 = _("Form not submitted because of the following problem(s)"); >+ alertString2 += "\n------------------------------------------------------------------------------------\n\n"; > alertString2 += _alertString; > alert(alertString2); > } >-- >1.6.3.3 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=2250">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4883
:
2235
|
2249
| 2250