https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #1 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 134903 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=134903&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |victor@tuxayo.net |ity.org | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #2 from Fridolin Somers <fridolin.somers@biblibre.com> --- (In reply to Victor Grousset/tuxayo from comment #0)

---

There are a few fixes like <span>Payment</span>[% ELSE %]<span>Transaction</span>[% END %] type: </label> ↓ <span>Payment type</span>[% ELSE %]<span>Transaction type</span>[% END %] type: </label> because having "type" separated removes the context and it locks the word order as same as English. Which makes this string not possible to correctly translate in French, Spanish and Esperanto for example.

In text above you forgot to remove 'type' in second line, after [% END %]. But it is OK in patch : - <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label> + <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]<span>Payment type</span>[% ELSE %]<span>Transaction type</span>[% END %]: </label> Still I think there is a problem. This will lead to the translation of : "Payment type" "Transaction type" "%s: " Usually the ":" is with translated text : "Payment type: " "Transaction type: " For example french translation will add a space "Type de transaction : " But this may generate strings with and without ending character : "Payment type" "Payment type: " You may add a span for ending character alone : + <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]<span>Payment type</span>[% ELSE %]<span>Transaction type</span>[% END %]<span>: </span></label> But the context may be hard to understand for translators. And there are soooooo much places to change. Great work BTW ;) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #134903|0 |1 is obsolete| | --- Comment #3 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 134908 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=134908&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com --- Comment #5 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Victor, great work! In https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=134908&action=diff#a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt_sec1 you enclose only "Items" between <span>..</span>, but not "Item" and "overdue as of", that's deliberate? The original string was msgid "%s %sItems%sItem%s overdue as of %s%s " and the new one msgid "%sItem%s overdue as of %s%s " -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #8 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Updating the .po files of a lang on master, then doing "git add" on the .po and then updating with the patches should allow to see the difference. git diff | grep "\-msgid" | wc -l 182 git diff | grep "\+msgid" | wc -l 337 That makes sense, ~680 <span> used to remove 182 strings means that I split in 3.7 on average. I had the impression that on the 2300 search results on Pootle, I had touched more than 182 though. But if I "only" added 680 <span> than makes sense. As for the 337 string added, with 680 <span> and assuming half of the simpler strings being duplicates with existing or between themselves, that makes sense to have only 337 new strings. A quick skimming in the updated staff .po searching for %s shows that the terrible strings remaining are mostly those that make the <title> of each Koha page. So that's still quite a number of strings to clean. And then a few templates outputting CSV. Doing git diff and there searching for «\-msgid "» and «\+msgid "» allows to see the complexity of the removed strings and the simplicity of the added ones. @Fridolin here is your count method, I don't know what it means but here it is so you can interpret it: #current master msggrep -K -e '%s' misc/translator/po/fr-FR-staff-prog.po | grep -c "^msgid" 1749 #after patch msggrep -K -e '%s' misc/translator/po/fr-FR-staff-prog.po | grep -c "^msgid" 1708 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #134908|0 |1 is obsolete| | --- Comment #10 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 134912 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=134912&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart+koha@gmail. | |com --- Comment #12 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Victor Grousset/tuxayo from comment #9)

After today's dev meeting: if we get enough confidence after reviewing the patch, Fridolin could still merge it in the next two days albeit the string freeze. The string enhancements will compensate the two days lost for the translators.

Aren't you creating new strings? I guess you are modifying old strings that are translated already, so actually you are adding more work for languages having those strings translated. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #14 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This will create a lot of string changes for translators to completely retranslate. I think it's too late right now, there is already a lot of translations to make and this would be better for .1 Btw, we should announye string freeze properly on koha-translate etc.! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #16 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Jonathan Druart from comment #12)

Aren't you creating new strings? I guess you are modifying old strings that are translated already,

That's a mix. Part of the long strings lists related to long IF ELSIF that are to be retranslated when a new release brings a new element in the list. Like with the recalls patch that added an element in a number of the long complex strings. Part of the rest is the simpler elements of broke don't long strings that match with existing ones. And part is actual new string additions. I added 680 <span>s and IIUC that turned into 337 new strings in the .po files. So the last part of new string is half of the total. The idea is that these are easier or not much work to translate than the long complex strings that have had a new element added in this release (or code change that adds a %s). Which require to retranslate with at best the previous translation and having counting of the %s and the elements to do.

so actually you are adding more work for languages having those strings translated.

In case of a language that rushed translations and completed them in the 1st 24h, it will be a complete setback then. That's the worst case though. https://translate.koha-community.org/projects/22.05/ We can see that all languages have still a big number of words to translate. And the number of words from the top translators doesn't show that someone managed to do a significant fraction of new 22.05 work. Let's take Italian and German, the most complete langs. 1834 and 1898 strings to do. Around 9200 words and at best 700 worked on since a week when look for German. So we are not in the worst case. There are 182 strings that will disappear with this patch. And part of those have to be retranslated for 22.05 and Italian and German translators can't have done a big share of that considering their overall remaining number of strings to do. For other language the gap is more and more large. So the setback isn't significant yet.

I guess you are modifying old strings that are translated already

To rephrase, only the part of the 182 strings (removed by this patch) that have to be retranslated for 22.05 count for this question. And actually it's the sub part that have already been translated since yesterday. «old strings that are translated already» If they are still translated in 22.05 they aren't the issue. If this patch had been submitted and merged 3 month ago, translators still "lose" the rest of the 182 that were not altered for 22.05 and were already translated. Only what matters are the strings already translated since yesterday that are part of the 22.05 updated strings that are part of the 182 removed by this patch. So it really look like as of now it would help more the translators than hurt them. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #18 from Fridolin Somers <fridolin.somers@biblibre.com> --- I've sent the message to mailing lists. Version is frozen for translation 🥶 So hands-up until release. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #20 from Victor Grousset/tuxayo <victor@tuxayo.net> ---

My expectation would be, that most of those strings would not require any changes for 22.05, so not appear as new/fuzzy right now.

We shouldn't expect that for this patch. Because that would happen also if this patch would have been merged 1 month ago and it wouldn't have been a problem to add 300 new/fuzzy strings then. The expectation is that we should not loose too much work already done since the string freeze, otherwise that's a problem. If the patch was merged on 11th of May, here are the number of the strings it would have lost: 14 strings for German 1 strings for Armenian 17 strings for Spanish 9 strings for Turkish 11th of May is the last Pootle sync. That's where most work has been done anyway compared to the last two days so it's still representative. And the actual work we have to care about is in the last two days and for now it's even less than the low above numbers. That's fine if this patch is merged for 22.05.01 but the lost work will be higher than the current small one. That's still a good plan because that lost work will be the highest for the most active&complete (yes, both criteria) languages in the next two weeks. And these very active languages will easily recover from that loss. Calculations: Using poedit here are some numbers of empty + fuzzy strings with the .po of master updated against master code. To simulate how it has been when 22.05 was created on the translation platform with the most complete languages: German: staff: 947 opac: 168 = 1115 total strings needing work Italian: staff: 2208 opac: 347 = 2555 (this is weird, Italian is at 100% for 21.11 but the unupdated .po in master aren't 100% complete before string update, as opposed other langs) Armenian: staff: 1116 opac: 168 = 1284 Spanish: staff: 1311 opac: 170 = 1481 Turkish: staff: 1315 opac: 237 = 1552 After applying this patch and updating the strings: German: staff: 1126 opac: 300 = 1426 Italian: staff: 2360 opac: 447 = 2807 Armenian: staff: 1295 opac: 300 = 1595 Spanish: staff: 1484 opac: 302 = 1786 Turkish: staff: 1488 opac: 365 = 1853 If the patch was merged 1 month ago, it would have added a net: 311 strings for German 252 strings for Italian (unreliable due to previous inconsistency) 311 strings for Armenian 305 strings for Spanish 301 strings for Turkish I downloaded the .po from the translation platform as of 11th of May then I put them in my local Koha to get the translation work of the week preceding the string freeze. And I updated the strings. Using poedit here are the numbers of empty + fuzzy strings: German: staff: 713 opac: 29 = 742 Italian: staff: 808 opac: 107 = 915 (the .po in Pootle is okay though. But I can't compare to master then. The recent activity in Pootle is lower than for German so there can't have been 1500 strings done to bridge the gap from the .po in master. So I have to drop Italian in this analysis) Armenian: staff: 839 opac: 115 = 954 Spanish: staff: 826 opac: 111 = 937 Turkish: staff: 998 opac: 116 = 1114 After applying this patch and updating the strings: German: staff: 899 opac: 168 = 1067 Italian: staff: 996 opac: 240 = 1236 Armenian: staff: 1019 opac: 247 = 1266 Spanish: staff: 1016 opac: 243 = 1259 Turkish: staff: 1176 opac: 248 = 1424 If the patch was merged on 11th of May it would have added 325 strings for German 321 strings for Italian 312 strings for Armenian 322 strings for Spanish 310 strings for Turkish The final result is the number of strings added in the 11th of May simulation minus those from the simulation from the creation of the 22.05 translation (with the .po from master) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Michal Denar <black23@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |black23@gmail.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #23 from Fridolin Somers <fridolin.somers@biblibre.com> --- Looks great ! I've walked into every change. Found some issues and have some changes to propose. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #25 from Fridolin Somers <fridolin.somers@biblibre.com> --- In koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt : -[% INCLUDE 'doc-head-open.inc' %]Koha › Tools › Labels ›: Search[% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'doc-head-open.inc' %]<span>Koha</span> › <span>Tools</span> › <span>Labels</span> ›: <span>Search</span>[% INCLUDE 'doc-head-close.inc' %] </head> I think the template is wrong even before this change. This should be wrapped in a "title" tag. Since it is the title tag, HTML tags are not allowed. Maybe we can create another bug report for that. Idem in opac-account-pay-error.tt -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #27 from Fridolin Somers <fridolin.somers@biblibre.com> --- This is a suggestion : In koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt [% IF loopro.recall.item_level_recall %] - Item-level recall on <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.recall.itemnumber | uri %]&biblionumber=[% loopro.recall.biblionumber | uri %]&bi=[% loopro.recall.item.biblioitemnumber | uri %]">item</a> + <span>Item-level recall on <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.recall.itemnumber | uri %]&biblionumber=[% loopro.recall.biblionumber | uri %]&bi=[% loopro.recall.item.biblioitemnumber | uri %]">item</a></span> [% ELSE %] Biblio-level recall on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.recall.biblionumber | uri %]">biblio</a> [% END %] Maybe add span also around "Biblio-level recall on..." -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #134912|0 |1 is obsolete| | --- Comment #29 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135564 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135564&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. And rephrased a string about password reset to have it identical to other strings with the same meaning. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #31 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135566 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135566&action=edit Bug 30733: Fix string context lost due to being in two parts Due to conditions. Things like "Edit batch" need to be keept in one strings. Also removed some capitalization because it wasn't needed and wasn't consistend with <title> and <h1> which had now capitalization. Also fixed patron edit-batch.tt and edit-layout.tt because they were incomplete in regard to their label counterparts. They had the condition on description and batch_id but weren't displaying anything different between the two cases. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #33 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135568 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135568&action=edit Bug 30733: Wrap one more string in <span> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #35 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Rebased. --- (In reply to Fridolin Somers from multiple comments!)

Some breadcrumbs have a IF/ELSE on action (like add/modify) on an object. We need to keep the action and the object together because of some languages like French.

Great catch thanks! Fixed. ---

In koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt : [...] I think the template is wrong even before this change. This should be wrapped in a "title" tag. Since it is the title tag, HTML tags are not allowed. Maybe we can create another bug report for that.

Idem in opac-account-pay-error.tt

After investigating these with you (thanks for the help :D) we are nearly sure they are dead code. I will open followup tickets. As the for changes of this patch they can stay there. They have no impact beside cleaning translation strings. ---

In koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt [...] Why this small change ?

It was so "[% ELSE %]Item[% END %] overdue as of" is extracted and the context is kept. But it doesn't look great on a second though to leave "Items" in the IF without context. I undid it. And might handle it in a followup string cleanup patch using t() with proper plural handling. ---

Maybe add span also around "Biblio-level recall on..."

Extracted string is «%s Biblio-level recall on» , I lacked time for those not really terrible strings. Done now. ---

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ics.tt

This is for ICal calendar export, maybe it should not contain HTML

Great catch! Undone. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #37 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Jonathan Druart from comment #36)

Applying: Bug 30733: Simplify translatable strings error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt).

Hum sorry, I forgot the morning fetch. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |julian.maurice@biblibre.com --- Comment #39 from Julian Maurice <julian.maurice@biblibre.com> --- Hey, have you heard about https://gitlab.com/koha-community/Koha/-/blob/master/docs/development/intern... ? :-) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #41 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Julian Maurice from comment #39)

Hey, have you heard about https://gitlab.com/koha-community/Koha/-/blob/master/docs/development/ internationalization.md ? :-)

Yes, and what Julian said, the i18n TT functions are the way to go for complicated strings/structures. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #43 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- I would suggest then to continue the work and go with spans here. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135565|0 |1 is obsolete| | --- Comment #45 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136013 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136013&action=edit Bug 30733: Move all semicolons inside the translatable strings In the 1st patch, sometimes they where left out -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135567|0 |1 is obsolete| | --- Comment #47 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136015 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136015&action=edit Bug 30733: Undo bad handling of a plural case -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135569|0 |1 is obsolete| | --- Comment #49 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136017 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136017&action=edit Bug 30733: Undo <span> in an ICS calendar file -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #51 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136019 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136019&action=edit Bug 30733: Undo some <span> additions that don't yield good strings They need more complex solutions that would be better in a follow up ticket to not drag this one too long. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #53 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136021 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136021&action=edit Bug 30733: Split strings differently -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #55 from Victor Grousset/tuxayo <victor@tuxayo.net> ---

<span>If you have any questions, please contact the <a href="mailto:root@localhost">site administrator</a></span>

And in both cases, the string will not be as wished. Because in contrast to the examples in bug 29602, "site administrator" is in the <a>. I got a list of a some strings like this. Maybe there is a way to deal with this? I18n TT functions to provide context for the incomplete strings?

Meanwhile, changes have been reverted. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136012|0 |1 is obsolete| | --- Comment #56 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136045 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136045&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. And rephrased a string about password reset to have it identical to other strings with the same meaning. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136014|0 |1 is obsolete| | --- Comment #58 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136047 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136047&action=edit Bug 30733: Fix string context lost due to being in two parts Due to conditions. Things like "Edit batch" need to be keept in one strings. Also removed some capitalization because it wasn't needed and wasn't consistend with <title> and <h1> which had now capitalization. Also fixed patron edit-batch.tt and edit-layout.tt because they were incomplete in regard to their label counterparts. They had the condition on description and batch_id but weren't displaying anything different between the two cases. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136016|0 |1 is obsolete| | --- Comment #60 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136049 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136049&action=edit Bug 30733: Wrap one more string in <span> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136018|0 |1 is obsolete| | --- Comment #62 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136051 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136051&action=edit Bug 30733: Simplify some singular cases To be sure translators don't think it's wrong and translate it plurally. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136020|0 |1 is obsolete| | --- Comment #64 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136053 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136053&action=edit Bug 30733: fix url => URL to merge with existing string Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |tomascohen@gmail.com --- Comment #66 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Please rebase so we can QA and push fast. Thanks, and great work. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136046|0 |1 is obsolete| | --- Comment #68 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136099 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136099&action=edit Bug 30733: Move all semicolons inside the translatable strings In the 1st patch, sometimes they where left out -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136048|0 |1 is obsolete| | --- Comment #70 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136101 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136101&action=edit Bug 30733: Undo bad handling of a plural case -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136050|0 |1 is obsolete| | --- Comment #72 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136103 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136103&action=edit Bug 30733: Undo <span> in an ICS calendar file -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136052|0 |1 is obsolete| | --- Comment #74 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136105 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136105&action=edit Bug 30733: Undo some <span> additions that don't yield good strings They need more complex solutions that would be better in a follow up ticket to not drag this one too long. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136054|0 |1 is obsolete| | --- Comment #76 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136107 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136107&action=edit Bug 30733: Split strings differently -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136099|0 |1 is obsolete| | --- Comment #78 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136109 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136109&action=edit Bug 30733: Move all semicolons inside the translatable strings In the 1st patch, sometimes they where left out Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136101|0 |1 is obsolete| | --- Comment #80 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136111 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136111&action=edit Bug 30733: Undo bad handling of a plural case Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136103|0 |1 is obsolete| | --- Comment #82 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136113 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136113&action=edit Bug 30733: Undo <span> in an ICS calendar file Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136105|0 |1 is obsolete| | --- Comment #84 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136115 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136115&action=edit Bug 30733: Undo some <span> additions that don't yield good strings They need more complex solutions that would be better in a follow up ticket to not drag this one too long. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136107|0 |1 is obsolete| | --- Comment #86 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136117 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136117&action=edit Bug 30733: Split strings differently Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136108|0 |1 is obsolete| | --- Comment #88 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136174 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136174&action=edit Bug 30733: Simplify translatable strings And a few minor fixes when they where causing issues for translatability. And rephrased a string about password reset to have it identical to other strings with the same meaning. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136110|0 |1 is obsolete| | --- Comment #90 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136176 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136176&action=edit Bug 30733: Fix string context lost due to being in two parts Due to conditions. Things like "Edit batch" need to be keept in one strings. Also removed some capitalization because it wasn't needed and wasn't consistend with <title> and <h1> which had now capitalization. Also fixed patron edit-batch.tt and edit-layout.tt because they were incomplete in regard to their label counterparts. They had the condition on description and batch_id but weren't displaying anything different between the two cases. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136112|0 |1 is obsolete| | --- Comment #92 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136178 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136178&action=edit Bug 30733: Wrap one more string in <span> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136114|0 |1 is obsolete| | --- Comment #94 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136180 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136180&action=edit Bug 30733: Simplify some singular cases To be sure translators don't think it's wrong and translate it plurally. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136116|0 |1 is obsolete| | --- Comment #96 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136182 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136182&action=edit Bug 30733: fix url => URL to merge with existing string Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #98 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Rebased. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #100 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Paul Derscheid from comment #99)

I this intended? [...] <p> [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %] + <span><span>Author(s):</span> [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]

This is expected. There was already one <span> spanning (ha ha) a few lines and I needed another one just for the string on this line. ------

I think there's something wrong here..

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt [...] - Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.created_date | $KohaDates %]

+ [% patron_link = BLOCK %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a>[% END %] + <span>Item recalled by [% patron_link| $raw %] on [% item.recall.created_date | $KohaDates %]</span> [% END %] [% END %]

I had to do something ugly (adding <span> everywhere arguably is already ^^") , extracting the <a> in a BLOCK. Because having the <a> in the middle of the phrase would split it without any recourse. But a BLOCK usage doesn't cause the extractor to split the string. ------

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt index 8953297ab7..445ec01a03 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt [...] - <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div> + <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>

Here I had split the string initially and fixed indentation but I ended up not splitting the string. It's a plural case. It should be done using I18n TT functions. But I let the indentation fix. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136175|0 |1 is obsolete| | --- Comment #102 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136189 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136189&action=edit Bug 30733: Move all semicolons inside the translatable strings In the 1st patch, sometimes they where left out Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136177|0 |1 is obsolete| | --- Comment #104 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136191 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136191&action=edit Bug 30733: Undo bad handling of a plural case Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136179|0 |1 is obsolete| | --- Comment #106 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136193 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136193&action=edit Bug 30733: Undo <span> in an ICS calendar file Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136181|0 |1 is obsolete| | --- Comment #108 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136195 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136195&action=edit Bug 30733: Undo some <span> additions that don't yield good strings They need more complex solutions that would be better in a follow up ticket to not drag this one too long. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136183|0 |1 is obsolete| | --- Comment #110 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136197 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136197&action=edit Bug 30733: Split strings differently Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #111 from Fridolin Somers <fridolin.somers@biblibre.com> --- QA script is happy. Just a warning with and without patches : File not found : lib/jquery/jquery-ui-1.13.1.css at /kohadevbox/koha/Koha/Template/Plugin/Asset.pm line 107. We should look at this in another bug. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136189|0 |1 is obsolete| | --- Comment #113 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136203 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136203&action=edit Bug 30733: Move all semicolons inside the translatable strings In the 1st patch, sometimes they where left out Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136191|0 |1 is obsolete| | --- Comment #115 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136205 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136205&action=edit Bug 30733: Undo bad handling of a plural case Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136193|0 |1 is obsolete| | --- Comment #117 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136207 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136207&action=edit Bug 30733: Undo <span> in an ICS calendar file Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136195|0 |1 is obsolete| | --- Comment #119 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136209 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136209&action=edit Bug 30733: Undo some <span> additions that don't yield good strings They need more complex solutions that would be better in a follow up ticket to not drag this one too long. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136197|0 |1 is obsolete| | --- Comment #121 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136211 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136211&action=edit Bug 30733: Split strings differently Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #122 from Fridolin Somers <fridolin.somers@biblibre.com> --- Maybe add some nice text to go in the release notes -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |Cleanup of translatable release notes| |text done by guiding the | |string extractor to make it | |do simpler strings for | |translators instead of | |large concatenation of long | |strings in the code with a | |lot of unnecessary %s | |placeholders. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master Version(s)| |22.11.00 released in| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #126 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136286 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136286&action=edit Bug 30733: [22.05] Simplify translatable strings And a few minor fixes when they where causing issues for translatability. And rephrased a string about password reset to have it identical to other strings with the same meaning. Simplified via wrapping strings with <span> to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a <span> in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #128 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Strings are available on Pootle now, just from this patch: Critical 91 Unfinished 1,539 It's ok, just to show the effect. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Arthur Suzuki <arthur.suzuki@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |arthur.suzuki@biblibre.com --- Comment #129 from Arthur Suzuki <arthur.suzuki@biblibre.com> --- big patch, lots of conflict when trying to apply to 21.11.x. Provide a patch for 21.11 if needed, thanks! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |31069 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31069 [Bug 31069] Did you mean? in the OPAC - links have <span> tags -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |31718 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31718 [Bug 31718] Change the IF ELSE values in marc_subfields_structure breadcrumbs to facilitate translation -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|32722 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32722 [Bug 32722] Mandatory subfields from UNIMARC framework shouldn't block the creation of a bib record when field itself is optional -- You are receiving this mail because: You are watching all bug changes.