|
Description
Caroline Cyr La Rose
2022-04-12 19:27:24 UTC
This is the string that is causing the problem #. %1$s: itemtypeloo.translated_description | html #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt:374 #, c-format msgid "%s (All)" msgstr "%s (Toutes)" If I add fuzzy to the last commented line and reapply the translation, the problem goes away. #. %1$s: itemtypeloo.translated_description | html #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt:374 #, fuzzy,c-format msgid "%s (All)" msgstr "%s (Toutes)" Created attachment 133364 [details] [review] Bug 30517: Translation breaks editing parent type circulation rule fix Test plan: 1. Install another language in the staff interface 1. ./translate install xx-XX 2. Check the box of the language in the 'language' system preference 3. Refresh 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch and refresh 11. Do step 8-9 again and notice it now behaves as it should Created attachment 133404 [details] [review] Bug 30517: Translation breaks editing parent type circulation rule fix Test plan: 1. Install another language in the staff interface 1. ./translate install xx-XX 2. Check the box of the language in the 'language' system preference 3. Refresh 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch and refresh 11. Do step 8-9 again and notice it now behaves as it should Hi, should this be Needs Signoff? no interest? Hi, I just testried on a sandbox and it doesn't work step 11 displays the same results as in steps 8 & 9 : All/All rule is modified when I edit the All/Books rule Did you install the translations before or after the patch was applied? (In reply to Katrin Fischer from comment #7) > Did you install the translations before or after the patch was applied? I just followed the test plan : translation (french) installed before applying the patch. I can try applying the patch before installing the language. I tested applying the patch and, after, installing the language. Patch works better but some things bother me 1.I click on "Circulation and fines rules" 2.I click on the Edit button to modify "All / Books" 3. I save my changes -> I really modify "All / Books" -> the bottom line (i.e the one where we write our changes) resets But sometimes, if I don't want to save my changes, I click on another line to edit (Koha asks me then if I am sure) but it doesn't change the bottom line. Created attachment 139718 [details] [review] Bug 30517: Translation breaks editing parent type circulation rule fix Test plan: 1. Install another language in the staff interface 1. in commandline: `cd misc/translator/; ./translate install xx-XX` 2. Check the box of the language in the 'language' system preference and save 3. Refresh and you should be able to choose languages 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch, translate again and refresh the page 11. Do step 8-9 again and notice it now behaves as it should Updated the test plan to make it a bit more clear. (In reply to Emmanuel Bétemps from comment #9) > I tested applying the patch and, after, installing the language. > > Patch works better but some things bother me > > > 1.I click on "Circulation and fines rules" > 2.I click on the Edit button to modify "All / Books" > 3. I save my changes > -> I really modify "All / Books" > -> the bottom line (i.e the one where we write our changes) resets > > But sometimes, if I don't want to save my changes, I click on another line > to edit (Koha asks me then if I am sure) but it doesn't change the bottom > line. I do not seem to have this problem. What I did after the test plan: 1- Go to Administration -> Circulation and fines rules 2- Click edit button for "All / Books" 3- Modify "Checkouts allowed" to a different number 4- Click on edit button for "All / All" without saving 5- Click ok on the confirmation popup 6- Bottom line's information change to "All / All" circulation rule values (In reply to Emmanuel Bétemps from comment #9) > I tested applying the patch and, after, installing the language. > > Patch works better but some things bother me > > > 1.I click on "Circulation and fines rules" > 2.I click on the Edit button to modify "All / Books" > 3. I save my changes > -> I really modify "All / Books" > -> the bottom line (i.e the one where we write our changes) resets > > But sometimes, if I don't want to save my changes, I click on another line > to edit (Koha asks me then if I am sure) but it doesn't change the bottom > line. When you install a language it copies the templates and files. So if you install the patch first, you'll look at unchanged/old templates that don't have the patch. You probably also need to make sure that "all" has been translated to something else in that language.
>
> When you install a language it copies the templates and files. So if you
> install the patch first, you'll look at unchanged/old templates that don't
> have the patch.
> You probably also need to make sure that "all" has been translated to
> something else in that language.
That should have read...: so if you install the language first... because installing the patch will then only update the English files and not trigger updating the translated files as well.
Hi, Patch doesn't apply (I followed the test plan in comment #10) Screenshot confirms I (really) just need to know if I must install language or patch first :) Created attachment 140091 [details]
Bottom line doesn't edit the chosen line
(In reply to Emmanuel Bétemps from comment #14) > Hi, > > Patch doesn't apply (I followed the test plan in comment #10) > Screenshot confirms > > I (really) just need to know if I must install language or patch first :) Hi, thanks for testing again. TLDR: `./translate install xx-XX` before and after the patch You need to install the language at step 1: >1. Install another language in the staff interface > 1. in commandline: `cd misc/translator/; ./translate install xx-XX` > 2. Check the box of the language in the 'language' system preference >and save > 3. Refresh and you should be able to choose languages apply the patch at step 10: >10. Apply the patch, translate again and refresh the page and do step 1.1 again to refresh translations (that's what I meant by "translate again" here). Created attachment 140193 [details] [review] Bug 30517: Translation breaks editing parent type circulation rule fix Test plan: 1. Install another language in the staff interface 1. in commandline: `cd misc/translator/; ./translate install xx-XX` 2. Check the box of the language in the 'language' system preference and save 3. Refresh and you should be able to choose languages 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch, translate again and refresh the page 11. Do step 8-9 again and notice it now behaves as it should Signed-off-by: Emmanuel Bétemps <e.betemps@gmail.com> (In reply to Shi Yao Wang from comment #16) > apply the patch at step 10: > >10. Apply the patch, translate again and refresh the page > > and do step 1.1 again to refresh translations (that's what I meant by > "translate again" here). my bad ! I didn't understand I had to install translation twice (once before and once after installing the patch) 'translate again' meant to me 'change the language of the interface' thanks for your patience & explanations :) Emmanuel Bétemps Created attachment 141202 [details] [review] Bug 30517: Translation breaks editing parent type circulation rule fix Test plan: 1. Install another language in the staff interface 1. in commandline: `cd misc/translator/; ./translate install xx-XX` 2. Check the box of the language in the 'language' system preference and save 3. Refresh and you should be able to choose languages 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch, translate again and refresh the page 11. Do step 8-9 again and notice it now behaves as it should Signed-off-by: Emmanuel Bétemps <e.betemps@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Overall I am not super happy about the way we rely on a regex here, but have not managed to break behavior in my tests. So this fix works and that's the most important as this bug has been there for too long causing potential data loss. Pushed to master for 22.11. Nice work everyone, thanks! Backported to 22.05.x for upcoming 22.05.08 release applied to 21.11 for 21.11.15 Backported to 21.05.x for 21.05.22 Not released in 21.05.22 (In reply to wainuiwitikapark from comment #25) > Not released in 21.05.22 Reverted from 21.05 branch |