Bugzilla – Attachment 122499 Details for
Bug 28462
TT tag on several lines break the translator tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28462: Remove line breaks in TT tags
Bug-28462-Remove-line-breaks-in-TT-tags.patch (text/plain), 8.52 KB, created by
Victor Grousset/tuxayo
on 2021-06-29 21:50:36 UTC
(
hide
)
Description:
Bug 28462: Remove line breaks in TT tags
Filename:
MIME Type:
Creator:
Victor Grousset/tuxayo
Created:
2021-06-29 21:50:36 UTC
Size:
8.52 KB
patch
obsolete
>From f566ed970afb581131ecf55d46ba2c05f2cf2824 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 23 Jun 2021 09:50:55 +0200 >Subject: [PATCH] Bug 28462: Remove line breaks in TT tags >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Same as previous patch for other files. >Looks like the problem exists only with IF. > >== test plan == >1. See the problematic strings in a given language > git grep "\bIF\b" misc/translator/po | grep -v '#' | grep '\bzh-Hant-TW' >2. update the language > misc/translator/translate update zh-Hant-TW >3. Recheck the problematic strings, they aren't here anymore >4. Check the diff: git diff > and search the if's with «/-.* IF » to see how the deleted strings > look like and that it makes sense. > >Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> >--- > .../prog/en/includes/cat-toolbar.inc | 3 +-- > .../intranet-tmpl/prog/en/includes/tools-menu.inc | 15 +++------------ > .../prog/en/modules/tools/tools-home.tt | 15 +++------------ > 3 files changed, 7 insertions(+), 26 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index 41fb8d934c..75a6059688 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -2,8 +2,7 @@ > [% INCLUDE 'blocking_errors.inc' %] > <div id="toolbar" class="btn-toolbar"> > >-[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || >-CAN_user_serials_create_subscription ) %] >+[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ||CAN_user_serials_create_subscription ) %] > <div class="btn-group"> > <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >index ba3f54a281..cf2b0c887e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -5,9 +5,7 @@ > <ul> > <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li> > </ul> >-[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons >- || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons >- || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] >+[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] > <h5>Patrons and circulation</h5> > <ul> > [% IF ( CAN_user_tools_manage_patron_lists ) %] >@@ -48,12 +46,7 @@ > [% END %] > </ul> > [% END %] >-[% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel >- || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory >- || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections >- || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) >- || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import >- || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] >+[% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] > <h5>Catalog</h5> > <ul> > [% IF ( CAN_user_tools_items_batchdel ) %] >@@ -101,9 +94,7 @@ > [% END %] > </ul> > [% END %] >-[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_news >- || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) >- || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] >+[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_news || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] > <h5>Additional tools</h5> > <ul> > [% IF ( CAN_user_tools_edit_calendar ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 66c05aa330..f9f66787c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -24,9 +24,7 @@ > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-4"> >-[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons >- || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons >- || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] >+[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] > <h3>Patrons and circulation</h3> > [% END %] > <dl> >@@ -95,9 +93,7 @@ > > > <div class="col-sm-4 col-sm-push-4"> >-[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_news >- || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) >- || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] >+[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_news || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] > <h3>Additional tools</h3> > [% END %] > <dl> >@@ -171,12 +167,7 @@ > </div> > > <div class="col-sm-4 col-sm-pull-4"> >-[% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel >- || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory >- || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections >- || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) >- || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import >- || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] >+[% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] > <h3>Catalog</h3> > [% END %] > <dl> >-- >2.32.0
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 28462
:
121434
|
122309
|
122311
|
122498
|
122499
|
122589
|
122590