From 6e7153a5722d9d260861db082fcbf9205822f8ec Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 14 Dec 2021 21:46:43 -1000 Subject: [PATCH] Bug 29602: (follow-up) Surround strings with span tag To be nicer with translators. Update the PO files for whichever languages will show how this is useful. Signed-off-by: Victor Grousset/tuxayo Rebased-by: Victor Grousset/tuxayo Signed-off-by: Martin Renvoize Signed-off-by: Fridolin Somers --- .../en/includes/additional-fields-entry.inc | 2 +- .../batch_authority_record_deletion.inc | 6 ++--- .../batch_authority_record_modification.inc | 4 ++-- .../batch_item_record_deletion.inc | 4 ++-- .../prog/en/includes/biblio-title.inc | 2 +- .../prog/en/includes/blocked-fines.inc | 2 +- .../prog/en/includes/borrower_debarments.inc | 12 +++++----- .../prog/en/includes/clubs-table.inc | 8 +++---- .../prog/en/includes/holds_table.inc | 6 ++--- .../prog/en/includes/merge-record.inc | 2 +- .../en/includes/messaging-preference-form.inc | 24 ++++++++++--------- .../en/includes/patron-article-requests.inc | 18 ++++++++------ .../prog/en/includes/patron_messages.inc | 18 +++++++------- 13 files changed, 58 insertions(+), 50 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc index d20b7c5b80..775c04d167 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc @@ -17,7 +17,7 @@ [% END %] [% END %] - (Authorised values for [% field.authorised_value_category | html %]) + (Authorised values for [% field.authorised_value_category | html %]) [% ELSE %] [% IF field.marcfield %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc index f9e24aff39..5092f077fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc @@ -28,11 +28,11 @@ [% END %] [% IF m.code == 'authority_not_exists' %] - The authority id [% m.authid | html %] does not exist in the database. + The authority id [% m.authid | html %] does not exist in the database. [% ELSIF m.code == 'authority_not_deleted' %] - Authority record [% m.authid | html %] was not deleted. An error occurred. + Authority record [% m.authid | html %] was not deleted. An error occurred. [% ELSIF m.code == 'authority_deleted' %] - Authority [% m.authid | html %] has been deleted successfully. + Authority [% m.authid | html %] has been deleted successfully. [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc index 37af0630b5..3f56ca598b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc @@ -8,8 +8,8 @@ [% ELSE %]
- [% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred. - [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %] + [% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred. + [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %] New batch record modification
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc index b65e4db5ba..4b552ec0c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc @@ -9,7 +9,7 @@

[% report.deleted_biblionumbers.size | html %] record(s) deleted.

[% END %] [% ELSE %] - No items deleted. +

No items deleted.

[% END %] @@ -21,7 +21,7 @@ [% IF job.status == 'cancelled' %]
- The job has been cancelled before it finished. + The job has been cancelled before it finished. New batch item modification
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc index f3c79154e3..2e7ca6426a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc @@ -5,7 +5,7 @@ [% IF ( biblio.title ) %] [% biblio.title | html %] [% ELSE %] - No title + No title [% END %] [% IF ( biblio.medium ) %] [% biblio.medium | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index e563aa678e..7625708ecf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -3,7 +3,7 @@ [% IF fines and fines > 0 %]
  • Charges: - Patron has outstanding charges of [% fines | $Price %]. + Patron has outstanding charges of [% fines | $Price %]. [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index 9a0cba9b8a..2bbfc7aad3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -31,12 +31,12 @@ [% END %] - [% IF d.comment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %] - [% ELSE %] - [% d.comment | $raw %] - [% END %] - + [% IF d.comment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %] + [% ELSE %] + [% d.comment | $raw %] + [% END %] + [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% d.created | $KohaDates %] [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index 171656144f..f6df1bbc18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -42,16 +42,16 @@ [% UNLESS destination == 'holds' %] [% IF c.club_template.is_enrollable_from_opac %] - Yes + Yes [% ELSE %] - No + No [% END %] [% IF c.club_template.is_email_required %] - Yes + Yes [% ELSE %] - No + No [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index b3951572ca..c00cf8dd11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -152,19 +152,19 @@ [%- hold.barcodenumber | html -%] [%- ELSE -%] - No barcode + No barcode [%- END -%] [%- ELSE -%] [%- IF ( hold.item_level_hold ) -%] - Only item + Only item [%- IF ( hold.barcodenumber ) -%] [%- hold.barcodenumber | html -%] [%- ELSE -%] - No barcode + No barcode [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc index 637885c03a..4231fc318c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc @@ -52,7 +52,7 @@
  • [% record.recordid | html %] - [% IF record.reference %](ref)[% END %] + [% IF record.reference %](ref)[% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index de6729cc62..279e78c84c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -16,21 +16,23 @@ [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %] [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %] - [% IF ( messaging_preference.Item_Due ) %]Item due - [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice - [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled - [% ELSIF ( messaging_preference.Hold_Reminder ) %]Hold reminder - [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in + [% IF ( messaging_preference.Item_Due ) %]Item due + [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice + [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled + [% ELSIF ( messaging_preference.Hold_Reminder ) %]Hold reminder + [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in [% ELSIF ( messaging_preference.Item_Checkout ) %] [% IF Koha.Preference( 'RenewalSendNotice' ) %] - Item checkout and renewal + Item checkout and renewal [% ELSE %] - Item checkout + Item checkout [% END %] - [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready - [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable - [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal - [% ELSE %]Unknown [% END %] + [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready + [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable + [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal + [% ELSE %]Unknown + [% END %] + [% IF ( messaging_preference.takes_days ) %] [% IF ( messaging_form_inactive ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc index 2e23fc260f..d326859f18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc @@ -59,7 +59,7 @@ - [% IF ar.toc_request %]Yes[% END %] + [% IF ar.toc_request %]Yes[% END %] @@ -74,17 +74,21 @@ [% ar.patron_notes | html %] - [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] + + [% IF ar.format == 'PHOTOCOPY' %]Copy + [% ELSIF ar.format == 'SCAN' %]Scan + [% END %] + [% IF ar.status == 'PENDING' %] - Pending + Pending [% ELSIF ar.status == 'PROCESSING' %] - Processing + Processing [% ELSIF ar.status == 'COMPLETED' %] - Completed + Completed [% ELSIF ar.status == 'CANCELED' %] - Canceled + Canceled [% END %] @@ -96,6 +100,6 @@ [% ELSE %] - Patron has no current article requests. + Patron has no current article requests. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index 0c1d8f88dc..97219917e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -10,16 +10,17 @@ [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %] Review pending modifications [% ELSE %] - Patron has pending modifications + Patron has pending modifications [% END %] [% END %] [% IF ( warndeparture ) %]
  • - Expiration: Patron's card will expire soon. - Patron's card expires on [% expiry | $KohaDates %] Renew or Edit details - + Expiration: + Patron's card will expire soon. + Patron's card expires on [% expiry | $KohaDates %] + Renew or Edit details
    • [% END %] @@ -31,9 +32,10 @@ [% IF ( expired ) %]
  • - Expiration: Patron's card has expired. + Expiration: + Patron's card has expired. [% IF ( expiry ) %] - Patron's card expired on [% expiry | $KohaDates %] + Patron's card expired on [% expiry | $KohaDates %] [% END %] Renew or Edit details
    • @@ -150,7 +152,7 @@ ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %] [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %] - Hold placed on [% w.reservedate | $KohaDates %]. + Hold placed on [% w.reservedate | $KohaDates %].
    [% SET expires_on = w.expirationdate %] @@ -172,7 +174,7 @@ ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %] [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %] - Hold placed on [% w.reservedate | $KohaDates %]. + Hold placed on [% w.reservedate | $KohaDates %].
    [% SET expires_on = w.expirationdate %] -- 2.39.5