Bugzilla – Attachment 133382 Details for
Bug 29602
We must be nicer with translators
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29602: (follow-up) Surround strings with span tag
Bug-29602-follow-up-Surround-strings-with-span-tag.patch (text/plain), 20.43 KB, created by
Martin Renvoize (ashimema)
on 2022-04-19 07:20:12 UTC
(
hide
)
Description:
Bug 29602: (follow-up) Surround strings with span tag
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-04-19 07:20:12 UTC
Size:
20.43 KB
patch
obsolete
>From 3b13209997f87e6ac3dad7e912e0c73d6f48d013 Mon Sep 17 00:00:00 2001 >From: Fridolin Somers <fridolin.somers@biblibre.com> >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 <victor@tuxayo.net> >Rebased-by: Victor Grousset/tuxayo <victor@tuxayo.net> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../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 @@ > <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option> > [% END %] > [% END %] >- </select> (Authorised values for [% field.authorised_value_category | html %]) >+ </select> <span>(Authorised values for [% field.authorised_value_category | html %])</span> > [% ELSE %] > [% IF field.marcfield %] > <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" /> >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 @@ > <i class="fa fa-exclamation error"></i> > [% END %] > [% IF m.code == 'authority_not_exists' %] >- The authority id [% m.authid | html %] does not exist in the database. >+ <span>The authority id [% m.authid | html %] does not exist in the database.</span> > [% ELSIF m.code == 'authority_not_deleted' %] >- Authority record [% m.authid | html %] was not deleted. An error occurred. >+ <span>Authority record [% m.authid | html %] was not deleted. An error occurred.</span> > [% ELSIF m.code == 'authority_deleted' %] >- Authority [% m.authid | html %] has been deleted successfully. >+ <span>Authority [% m.authid | html %] has been deleted successfully.</span> > [% END %] > </div> > [% 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 @@ > </div> > [% ELSE %] > <div class="dialog message"> >- [% 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 %] >+ <span>[% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.</span> >+ [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %] > <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> > </div> > [% 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 @@ > <p>[% report.deleted_biblionumbers.size | html %] record(s) deleted.</p> > [% END %] > [% ELSE %] >- No items deleted. >+ <p>No items deleted.</p> > [% END %] > </div> > >@@ -21,7 +21,7 @@ > > [% IF job.status == 'cancelled' %] > <div class="dialog error"> >- The job has been cancelled before it finished. >+ <span>The job has been cancelled before it finished.</span> > <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a> > </div> > [% 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 ) %] > <span class="biblio-title">[% biblio.title | html %]</span> > [% ELSE %] >- No title >+ <span>No title</span> > [% END %] > [% IF ( biblio.medium ) %] > <span class="biblio-medium">[% biblio.medium | html %]</span> >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 %] > <li> > <span class="circ-hlt">Charges:</span> >- Patron has outstanding charges of [% fines | $Price %]. >+ <span>Patron has outstanding charges of [% fines | $Price %].</span> > [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% 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 %] > </td> > <td> >- [% IF d.comment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %] >- [% ELSE %] >- [% d.comment | $raw %] >- [% END %] >- </td> >+ [% IF d.comment.search('OVERDUES_PROCESS') %] >+ <span>Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]</span> >+ [% ELSE %] >+ [% d.comment | $raw %] >+ [% END %] >+ </td> > <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <em>Indefinite</em> [% END %]</td> > <td>[% d.created | $KohaDates %]</td> > [% 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' %] > <td> > [% IF c.club_template.is_enrollable_from_opac %] >- Yes >+ <span>Yes</span> > [% ELSE %] >- No >+ <span>No</span> > [% END %] > </td> > <td> > [% IF c.club_template.is_email_required %] >- Yes >+ <span>Yes</span> > [% ELSE %] >- No >+ <span>No</span> > [% END %] > </td> > [% 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 -%] > <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" /> > [%- ELSE -%] >- No barcode >+ <span>No barcode</span> > [%- END -%] > </a> > [%- ELSE -%] > [%- IF ( hold.item_level_hold ) -%] > <em> >- Only item >+ <span>Only item</span> > <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]"> > [%- IF ( hold.barcodenumber ) -%] > [%- hold.barcodenumber | html -%] > <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" /> > [%- ELSE -%] >- No barcode >+ <span>No barcode</span> > [%- END -%] > </a> > </em> >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 @@ > <li role="presentation"> > <a href="#tabrecord[% record.recordid | uri %]" aria-controls="tabrecord[% record.recordid | uri %]" role="tab" data-toggle="tab"> > [% record.recordid | html %] >- [% IF record.reference %](ref)[% END %] >+ [% IF record.reference %]<span>(ref)</span>[% END %] > </a> > </li> > [% 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' %] > <tr> >- <td>[% 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 >+ <td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span> >+ [% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span> >+ [% ELSIF ( messaging_preference.Hold_Filled ) %]<span>Hold filled</span> >+ [% ELSIF ( messaging_preference.Hold_Reminder ) %]<span>Hold reminder</span> >+ [% ELSIF ( messaging_preference.Item_Check_in ) %]<span>Item check-in</span> > [% ELSIF ( messaging_preference.Item_Checkout ) %] > [% IF Koha.Preference( 'RenewalSendNotice' ) %] >- Item checkout and renewal >+ <span>Item checkout and renewal</span> > [% ELSE %] >- Item checkout >+ <span>Item checkout</span> > [% 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 %]</td> >+ [% ELSIF ( messaging_preference.Ill_ready ) %]<span>Interlibrary loan ready</span> >+ [% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span> >+ [% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span> >+ [% ELSE %]<span>Unknown</span> >+ [% END %] >+ </td> > [% IF ( messaging_preference.takes_days ) %] > <td> > [% 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 @@ > </td> > > <td class="article-request-toc"> >- [% IF ar.toc_request %]Yes[% END %] >+ [% IF ar.toc_request %]<span>Yes</span>[% END %] > </td> > > <td class="article-request-pages"> >@@ -74,17 +74,21 @@ > [% ar.patron_notes | html %] > </td> > >- <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >+ <td class="article-request-format"> >+ [% IF ar.format == 'PHOTOCOPY' %]<span>Copy</span> >+ [% ELSIF ar.format == 'SCAN' %]<span>Scan</span> >+ [% END %] >+ </td> > > <td class="article-request-status"> > [% IF ar.status == 'PENDING' %] >- Pending >+ <span>Pending</span> > [% ELSIF ar.status == 'PROCESSING' %] >- Processing >+ <span>Processing</span> > [% ELSIF ar.status == 'COMPLETED' %] >- Completed >+ <span>Completed</span> > [% ELSIF ar.status == 'CANCELED' %] >- Canceled >+ <span>Canceled</span> > [% END %] > </td> > >@@ -96,6 +100,6 @@ > </tbody> > </table> > [% ELSE %] >- Patron has no current article requests. >+ <span>Patron has no current article requests.</span> > [% END %] > </div> >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 ) %] > <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a> > [% ELSE %] >- Patron has pending modifications >+ <span>Patron has pending modifications</span> > [% END %] > </li> > [% END %] > > [% IF ( warndeparture ) %] > <li class="warndeparture"> >- <span class="circ-hlt">Expiration:</span> Patron's card will expire soon. >- Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> >- >+ <span class="circ-hlt">Expiration:</span> >+ <span>Patron's card will expire soon.</span> >+ <span>Patron's card expires on [% expiry | $KohaDates %]</span> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> > </li> > [% END %] > >@@ -31,9 +32,10 @@ > > [% IF ( expired ) %] > <li class="expired"> >- <span class="circ-hlt">Expiration:</span> Patron's card has expired. >+ <span class="circ-hlt">Expiration:</span> >+ <span>Patron's card has expired.</span> > [% IF ( expiry ) %] >- Patron's card expired on [% expiry | $KohaDates %] >+ <span>Patron's card expired on [% expiry | $KohaDates %]</span> > [% END %] > <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> > </li> >@@ -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 %]. >+ <span>Hold placed on [% w.reservedate | $KohaDates %].</span> > <br /> > <strong class="waitinghere"> > [% 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 %]. >+ <span>Hold placed on [% w.reservedate | $KohaDates %].</span> > <br /> > <strong> > [% SET expires_on = w.expirationdate %] >-- >2.20.1
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 29602
:
128108
|
128109
|
128534
|
128535
|
128542
|
128543
|
130196
|
130197
|
130198
|
130199
|
130200
|
131421
|
131422
|
131423
|
131424
|
131425
|
131934
|
131935
|
131936
|
131937
|
131938
|
133129
|
133130
|
133131
|
133132
|
133133
|
133370
|
133371
|
133372
|
133373
|
133374
|
133381
| 133382 |
133383
|
133384
|
133385
|
133495
|
133521