Bug 30307 - 21.11 files contain strings from master (Recalls)
Summary: 21.11 files contain strings from master (Recalls)
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: I18N/L10N (show other bugs)
Version: 21.11
Hardware: All All
: P5 - low blocker
Assignee: Bernardo Gonzalez Kriegel
QA Contact: Testopia
URL:
Keywords:
: 30530 (view as bug list)
Depends on:
Blocks:
 
Reported: 2022-03-17 10:11 UTC by Katrin Fischer
Modified: 2022-12-12 21:24 UTC (History)
7 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
Circulation function:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Katrin Fischer 2022-03-17 10:11:00 UTC 
This morning there were new strings to translate, but something seems to have gone wrong with the updates for the 21.11 version.

The files contain strings from the just pushed Recalls feature that should not be there:

https://translate.koha-community.org/da/21.11/translate/#search=Recall&sfields=source,target&soptions=exact&unit=21570911&offset=0

https://translate.koha-community.org/da/21.11/translate/#search=Recall&sfields=source,target&soptions=exact&unit=21570914&offset=0

Maybe files have been generated against master instead of the 21.11 branch?

We need to fix this urgently or we might create issues where strings that don't match in the lower version appear untranslated.
Comment 1 Jonathan Druart 2022-03-17 10:27:59 UTC 
I've noticed that update-koha.log contained "branch '21.11' set up to track 'origin/master'"

I edited /srv/scripts/update-koha.sh and replaced 
MASTER="21.11"
with
MASTER="22.05"

Script is now running for 21.11
 % /srv/scripts/update-koha.sh 21.11 | tee  update-koha.log
Comment 2 Katrin Fischer 2022-03-17 22:23:11 UTC 
I confirmed that the regenerated files were correct. Should we close this then?
Comment 3 Katrin Fischer 2022-04-13 15:35:28 UTC 
*** Bug 30530 has been marked as a duplicate of this bug. ***