From 62e523a50f8e9e370e9b10c106e7af71cbe25976 Mon Sep 17 00:00:00 2001
From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Date: Sun, 3 May 2020 19:19:21 -0300
Subject: [PATCH] Bug 24636: (follow-up) - move 'by' into include file

To ease correct translation.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit f46d88125d48fa21893f77f14584320dc3548a64)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/includes/budget_planning.inc      | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budget_planning.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budget_planning.inc
index ff8cdee94e..d1f2dc78ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budget_planning.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budget_planning.inc
@@ -1,7 +1,7 @@
 [%- BLOCK planning -%]
   [%- SWITCH plan -%]
-    [%- CASE 'MONTHS'    -%]<span>months</span>
-    [%- CASE 'BRANCHES'  -%]<span>libraries</span>
-    [%- CASE 'ITEMTYPES' -%]<span>item types</span>
+    [%- CASE 'MONTHS'    -%]<span>by months</span>
+    [%- CASE 'BRANCHES'  -%]<span>by libraries</span>
+    [%- CASE 'ITEMTYPES' -%]<span>by item types</span>
   [%- END -%]
 [%- END -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 70408abb68..be2c58c4e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -4,7 +4,7 @@
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% PROCESS 'budget_planning.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description | html %] by [% PROCESS planning plan=authcat %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>td.locked { background-image: url('[% interface | html %]/[% theme | html %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; } .plan_entry { text-align: right; width:90%; }</style>
 </head>
@@ -29,7 +29,7 @@
 [% INCLUDE 'budgets-admin-toolbar.inc' %]
 
 <form method="post" id="Aform" name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
-<h3>Planning for [% budget_period_description | html %] by [% PROCESS planning plan=authcat %]</h3>
+<h3>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</h3>
 <input type="hidden" name="authcat" value="[% authcat | html %]" />
 <!-- Budget Lines -->
 
-- 
2.20.1