From 5b93c16365b6c7ea9dbea7c700e3416a841555a8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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=utf8 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 Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 1ed9d5529f4f625216f3bcbfa5e8d43e56b3e0e7) Signed-off-by: Fridolin Somers (cherry picked from commit a67953b635f3511253aee1ceab9d327b9963ab9e) Signed-off-by: Victor Grousset/tuxayo --- .../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 e6259f991c..8545e9fe17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,8 +1,7 @@ [% INCLUDE 'blocking_errors.inc' %]
-[% 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 ) %]
    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 @@ -[% 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') ) ) %]
    Patrons and circulation
      [% IF ( CAN_user_tools_manage_patron_lists ) %] @@ -48,12 +46,7 @@ [% END %]
    [% 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 ) %]
    Catalog
      [% IF ( CAN_user_tools_items_batchdel ) %] @@ -101,9 +94,7 @@ [% END %]
    [% 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 ) %]
    Additional tools
      [% 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 350fd1b28d..d57e64910f 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 @@ -13,9 +13,7 @@
      -[% 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') ) ) %]

      Patrons and circulation

      [% END %]
      @@ -84,9 +82,7 @@
      -[% 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 ) %]

      Additional tools

      [% END %]
      @@ -149,12 +145,7 @@
      -[% 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 ) %]

      Catalog

      [% END %]
      -- 2.39.5