From bugzilla-daemon@bugs.koha-community.org Wed May 11 18:20:38 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] New: Simplify translatable strings Date: Wed, 11 May 2022 16:20:36 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0776308085613525726==" --===============0776308085613525726== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 Bug ID: 30733 Summary: Simplify translatable strings Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: I18N/L10N Assignee: koha-bugs@lists.koha-community.org Reporter: victor@tuxayo.net QA Contact: testopia@bugs.koha-community.org CC: frederic@tamil.fr A.K.A "We must be nicer with translators 2" (follow-up of bug 29602) It's the same simple idea that worked well without issues: Add in templates to not have anymore translatable strings like %sEnter a new purchase suggestion%s %sPurchase suggestions%s › %s%s%sKoha online%s catalog git is a great help to review this patch. Don't use the bugzilla diff view. Apply the patch and use: git show --color-words=3D. Now you will see just the added You can search for and go one by one to check that the opening and closing tags match and that there is no typo. Then the same with I already did that though, so you might want to spare pressing the "n" (next) key 1300 times (684 x 2) --- This patch has been made by searching in the translation platform for "%s" and inspecting the 2300 strings containing it to find those that are terrible to translate: those with tons of %s which are a concatenation of independent strings. Mainly the IFs in template produce these abominations. bug 29602 focused on CASE statement. This is an attempt for all the rest. Except for CSV templates and page tags because <span> can't be used there. Some less terrible strings have been skipped due to lack of time. --- I tried to think about right to left languages in cases like <span>Confirm deletion of subfield [%- tagsubfield | html -%]</span> I included the variable tagsubfield in the <span> so there will be a %s in the translatable string which should allow to invert the order when translating to be RTL. And also I included semicolons in the <span> when the context allows for a translated version with the semicolon on the left to make sense. If the conte= xt has a related thing just after on the same line (on the right) to the string, then I didn't include the semicolon to leave it "pointing" at the right thing. Even though that's wrong, but we can't swap the phrases. caveat: I don't have any experience in translating RTL in Koha so I'm not sure if these things help. And I just noticed we have an RTL CSS that might actually swap stuff. If that= 's the case, the fact that I left the semicolon outside the <span> might not be = an issue because it should end up swapped right? --- There are a few fixes like <span>Payment</span>[% ELSE %]<span>Transaction</span>[% END %] type: </label> =E2=86=93 <span>Payment type</span>[% ELSE %]<span>Transaction type</span>[% END %] typ= e: </label> because having "type" separated removes the context and it locks the word ord= er as same as English. Which makes this string not possible to correctly transla= te in French, Spanish and Esperanto for example. --- There is a double <span>, it looks like: <span><span>Author(s) This is expected. There was already one <span> spanning (ha ha) a few lines a= nd I needed another one just for the string on this line. --=20 You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. --===============0776308085613525726==-- From bugzilla-daemon@bugs.koha-community.org Wed May 11 18:21:40 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 16:21:39 +0000 Message-ID: <bug-30733-70-SBobXn80JG@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2680690636331179499==" --===============2680690636331179499== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2680690636331179499==-- From bugzilla-daemon@bugs.koha-community.org Wed May 11 18:22:49 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 16:22:48 +0000 Message-ID: <bug-30733-70-7AM8PtYB86@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4080410532964916732==" --===============4080410532964916732== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Large patch -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. --===============4080410532964916732==-- From bugzilla-daemon@bugs.koha-community.org Wed May 11 18:22:59 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 16:22:55 +0000 Message-ID: <bug-30733-70-CCt2ho9Px9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8874662101625945954==" --===============8874662101625945954== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8874662101625945954==-- From bugzilla-daemon@bugs.koha-community.org Wed May 11 18:23:26 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 16:23:26 +0000 Message-ID: <bug-30733-70-37lfEeDCPu@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6765023694515883625==" --===============6765023694515883625== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=29602 -- You are receiving this mail because: You are watching all bug changes. --===============6765023694515883625==-- From bugzilla-daemon@bugs.koha-community.org Wed May 11 22:37:47 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 20:37:46 +0000 Message-ID: <bug-30733-70-1PgtvYc4kK@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2940823506432933998==" --===============2940823506432933998== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 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) > --- >=20 > There are a few fixes like > <span>Payment</span>[% ELSE %]<span>Transaction</span>[% END %] type: > </label> > =E2=86=93 > <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=3D"[% type | html %]_type" class=3D"required">[% IF t= ype =3D=3D 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label> + <label for=3D"[% type | html %]_type" class=3D"required">[% IF t= ype =3D=3D '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=3D"[% type | html %]_type" class=3D"required">[% IF t= ype =3D=3D '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 ;) --=20 You are receiving this mail because: You are watching all bug changes. --===============2940823506432933998==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 01:39:07 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 23:39:06 +0000 Message-ID: <bug-30733-70-ruEVW0ko1Z@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1125553114795181122==" --===============1125553114795181122== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au -- You are receiving this mail because: You are watching all bug changes. --===============1125553114795181122==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 01:41:06 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 23:41:05 +0000 Message-ID: <bug-30733-70-n5JbKibWsJ@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1291106682220402010==" --===============1291106682220402010== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1291106682220402010==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 01:47:27 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 11 May 2022 23:47:26 +0000 Message-ID: <bug-30733-70-SmkqyI6bi9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0419552437939327546==" --===============0419552437939327546== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #4 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Some testing notes before I forget. - it has been checked multiple times that no <span> has been added to a <titl= e> - attention was given to leave out CSV and JSON outputs - each .inc was checked individually to ensure it's indeed HTML and not CSV, JSON or the content of a <title> - via doing searches in the git log for <span> and </span> it's possible to be very confident that there is not typo in the tag and not mismatching of tags (same method used on bug 29602 that worked well to find little mistakes) - one proofreading pass was especially focused in ensuring that IF and ELSE couldn't cause a tag mismatch - QA test tools pass albeit some unusual Perl warnings outputted by the scrip= t: root@kohadevbox:koha(simplify-translatable-strings)$ time /kohadevbox/qa-test-tools/koha-qa.pl -v 2 -c 1 testing 1 commit(s) (applied to 68990b9 '9a Bug 30722: Typo in overdue recalls') Processing files before patches File not found : lib/jquery/jquery-ui-1.13.1.css at /kohadevbox/koha/Koha/Template/Plugin/Asset.pm line 107. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc line 130. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc line 130. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt line 236. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article= .tt line 343. |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>| 1= 16 / 116 (100.00%) Processing files after patches File not found : lib/jquery/jquery-ui-1.13.1.css at /kohadevbox/koha/Koha/Template/Plugin/Asset.pm line 107. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc line 130. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc line 130. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt line 236. Argument "" isn't numeric in numeric gt (>) at /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article= .tt line 343. |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>| 1= 16 / 116 (100.00%) --=20 You are receiving this mail because: You are watching all bug changes. --===============0419552437939327546==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 02:43:05 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 00:43:04 +0000 Message-ID: <bug-30733-70-gViAYlhdHG@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3421539852336432614==" --===============3421539852336432614== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 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=3D134908&action= =3Ddiff#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 " --=20 You are receiving this mail because: You are watching all bug changes. --===============3421539852336432614==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 03:26:19 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 01:26:18 +0000 Message-ID: <bug-30733-70-Mw8mtlzAtQ@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3491207151136485472==" --===============3491207151136485472== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #6 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Fridolin Somers from comment #2) > In text above you forgot to remove 'type' in second line, after [% END %]. > > But it is OK in patch : Indeed I mess up the manual example, sorry for the confusion. > Still I think there is a problem. > > This will lead to the translation of : > "Payment type" > "Transaction type" > "%s: " A diff between updated strings on master and updated strings with the patch shows by searching for the location comment "transaction_types.inc" that "Payment type" is created "Transaction type" already exists and the location "transaction_types.inc" is added in it's list No other "transaction_types.inc" to be found that could show that "%s: " is created or linked to an existing one > Usually the ":" is with translated text : > "Payment type: " > "Transaction type: " ok, shall I make all the strings include the ":" ? In your above example I see a trailing space after the semicolon but we don't aim for this in source strings right? > 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. Translators probably will just copy it as it without deducing they can there decide their punctuation spacing style. Assuming the string extraction script keeps it. But it seems not from a check above. -- You are receiving this mail because: You are watching all bug changes. --===============3491207151136485472==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 03:26:29 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 01:26:28 +0000 Message-ID: <bug-30733-70-bEa0uPowX3@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7537187277317124036==" --===============7537187277317124036== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7537187277317124036==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 03:34:42 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 01:34:41 +0000 Message-ID: <bug-30733-70-wcEQn430M3@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0375357319279158348==" --===============0375357319279158348== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #7 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Hola Bernardo :D (In reply to Bernardo Gonzalez Kriegel from comment #5) > In > https://bugs.koha-community.org/bugzilla3/attachment. > cgi?id=3D134908&action=3Ddiff#a/koha-tmpl/intranet-tmpl/prog/en/modules/cir= c/ > overdue.tt_sec1 > you enclose only "Items" between <span>..</span>, but not "Item" and > "overdue as of", that's deliberate? >=20 > 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 " Yes that's the intended result. To still keep some context, I hesitated and didn't have a strong opinion about what is better. Now that I reread it there would be no ambiguity. So better isolate every piece, right? Now that you are here I can ask what should I do about semicolons? Should I always include them in the string? I left part of them out because I guess I would help RTL languages: > And also I included semicolons in the <span> when the context allows for a = translated version with the semicolon on the left to make sense. If the conte= xt has a related thing just after on the same line (on the right) to the stri= ng, then I didn't include the semicolon to leave it "pointing" at the right t= hing. Even though that's wrong, but we can't swap the phrases. > caveat: I don't have any experience in translating RTL in Koha so I'm not s= ure if these things help. > And I just noticed we have an RTL CSS that might actually swap stuff. If th= at's the case, the fact that I left the semicolon outside the <span> might no= t be an issue because it should end up swapped right? --=20 You are receiving this mail because: You are watching all bug changes. --===============0375357319279158348==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 06:23:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 04:23:34 +0000 Message-ID: <bug-30733-70-0EfHLzeFTE@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5367765616137532266==" --===============5367765616137532266== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- 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 a= nd then updating with the patches should allow to see the difference. git diff | grep "\-msgid" | wc -l=20 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 Pootl= e, I had touched more than 182 though. But if I "only" added 680 <span> than mak= es 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 =C2=AB\-msgid "=C2=BB and =C2=AB\+msgi= d "=C2=BB allows to=20 see the complexity of the removed strings and the simplicity of the added one= s. @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 --=20 You are receiving this mail because: You are watching all bug changes. --===============5367765616137532266==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 06:27:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 04:27:35 +0000 Message-ID: <bug-30733-70-YKw1FJRmyq@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2634994154666670747==" --===============2634994154666670747== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #9 from Victor Grousset/tuxayo <victor@tuxayo.net> --- 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. -- You are receiving this mail because: You are watching all bug changes. --===============2634994154666670747==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 07:57:08 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 05:57:06 +0000 Message-ID: <bug-30733-70-IOUwvJGtnD@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1213752158254912746==" --===============1213752158254912746== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1213752158254912746==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 08:17:34 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 06:17:33 +0000 Message-ID: <bug-30733-70-acn9cNaRZu@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7005589076907902665==" --===============7005589076907902665== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #11 from Victor Grousset/tuxayo <victor@tuxayo.net> --- More tests 1. Acquisitions =3D> go to a basket 2. make an order 3. receive it and get and invoice 4. Home > Acquisitions > Invoices=20 5. close and open it and check the status column say the status ok 6. Search for a shipment and billing date range that doesn't match your invoi= ce 7. Check message looks okay Search was: Shipment date: From 05/02/2022 To 05/31/2022 Billing date: From 05/02/2022 To 05/31/2022 1. Create a subscription with a "Subscription length" 2. Acquisitions =3D> go to a basket 3. make an order from a subscription 4. pick your subscription 5. In Accounting details you should see something like "Frequency: 2/day | Number of weeks: 6" --=20 You are receiving this mail because: You are watching all bug changes. --===============7005589076907902665==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 09:28:19 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 07:28:18 +0000 Message-ID: <bug-30733-70-Kpg2S2jgK3@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6547890628004905823==" --===============6547890628004905823== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 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 a= re translated already, so actually you are adding more work for languages having those strings translated. --=20 You are receiving this mail because: You are watching all bug changes. --===============6547890628004905823==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 10:42:53 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 08:42:52 +0000 Message-ID: <bug-30733-70-su1H5oPDG1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6394627796681727579==" --===============6394627796681727579== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #13 from Fridolin Somers <fridolin.somers@biblibre.com> --- (In reply to Victor Grousset/tuxayo from comment #8) > > @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 Adding this count for fr-FR-opac-bootstrap.po: current master : 390 after patch : 360 This counts how many strings to translate contains a %s. So your changes adds strings to translate but lower down the number of strings containing a %s by at least 41+30=71. This is great help for translators. An example : msgid "" "%s Fulfilled %s Cancelled %s (%s) %s %s Waiting %s Processing %s In transit " "%s Pending %s " msgid "" "%s In transit to %s %s Ready for pickup %s Expired on %s %s Cancelled on %s " "%s Overdue to be returned %s Fulfilled %s Requested %s " Are splitted in : msgid "Fulfilled" msgid "Cancelled" ... -- You are receiving this mail because: You are watching all bug changes. --===============6394627796681727579==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 11:27:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 09:27:49 +0000 Message-ID: <bug-30733-70-VMB3wFaRil@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4238529786354831273==" --===============4238529786354831273== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============4238529786354831273==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 13:00:14 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 11:00:13 +0000 Message-ID: <bug-30733-70-Ogov2HMbxO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1397996950692238532==" --===============1397996950692238532== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #15 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- (In reply to Katrin Fischer from comment #14) > 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.! I agree with Katrin, this could wait until .1 release. Strings have been updated yesterday. -- You are receiving this mail because: You are watching all bug changes. --===============1397996950692238532==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 16:19:05 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 14:19:04 +0000 Message-ID: <bug-30733-70-MiW7Kmy1qT@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6265400957838294530==" --===============6265400957838294530== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- 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,=20 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 mat= ch 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 file= s. 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 wi= th this patch. And part of those have to be retranslated for 22.05 and Italian a= nd 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 ha= ve to be retranslated for 22.05 count for this question. And actually it's the s= ub part that have already been translated since yesterday. =C2=ABold strings that are translated already=C2=BB If they are still transla= ted in 22.05 they aren't the issue. If this patch had been submitted and merged 3 month ag= o, 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. --=20 You are receiving this mail because: You are watching all bug changes. --===============6265400957838294530==-- From bugzilla-daemon@bugs.koha-community.org Thu May 12 16:44:38 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 12 May 2022 14:44:36 +0000 Message-ID: <bug-30733-70-fSqHdjKfoj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0466138702417636166==" --===============0466138702417636166== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #17 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Katrin Fischer from comment #14) > This will create a lot of string changes for translators to completely > retranslate.=20 If comment 16 is correct then no, it won't be a setback. Katrin: > I think it's too late right now, there is already a lot of > translations to make and this would be better for .1 Bernardo: > I agree with Katrin, this could wait until .1 release. That's a good surprise that such string changes can be considered to backport. However the setback considerably more and this time significant for any language that makes a significant effort to get a 22.05.00 close to 100% translated, close to all of the long complex strings to retranslate for 22.05 would have been translated for nothing. While in the next days only a fraction of it would be done and lost. In the end it only matter for languages close to 100% on previous release and whose team have enough workforce to have any significant work done in the fir= st days of the freeze (the only teams to loose work now albeit it's not significant IIUC) and that can hope for a close to 100% 22.05.00 (the only teams to loose something significant if we wait for 22.05.01 window) Most languages have more strings to worry about than those changed for 22.05 and most with a high completion percentage still don't translate fast enough now and in the coming few weeks to be impacted by whether this patch is merged around now or for .01. So very happy to see that for this patch to make it for 22.05.x the possibili= ty would be open for .01 but that doesn't look best for translating team (the mo= st involved ones) compared to .00 > Btw, we should announye string freeze properly on koha-translate etc.! Indeed! --=20 You are receiving this mail because: You are watching all bug changes. --===============0466138702417636166==-- From bugzilla-daemon@bugs.koha-community.org Fri May 13 04:22:23 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 13 May 2022 02:22:22 +0000 Message-ID: <bug-30733-70-o0Hd3CY5Qc@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5841917523853515406==" --===============5841917523853515406== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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. --===============5841917523853515406==-- From bugzilla-daemon@bugs.koha-community.org Fri May 13 22:54:54 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 13 May 2022 20:54:54 +0000 Message-ID: <bug-30733-70-nlyFYhgOXr@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7258154500314957171==" --===============7258154500314957171== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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. But by breaking them up, there would only be a few that match existing strings in other places and there should be quite a bit of extra new strings with the patch. -- You are receiving this mail because: You are watching all bug changes. --===============7258154500314957171==-- From bugzilla-daemon@bugs.koha-community.org Sat May 14 08:16:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 14 May 2022 06:16:49 +0000 Message-ID: <bug-30733-70-TafX0tLRI1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0967025638874837015==" --===============0967025638874837015== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #20 from Victor Grousset/tuxayo <victor@tuxayo.net> --- > My expectation would be, that most of those strings would not require any c= hanges 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 th= is 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 t= oo 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 ev= en 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 =3D 1115 total strings needing work Italian: staff: 2208 opac: 347 =3D 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 =3D 1284 Spanish: staff: 1311 opac: 170 =3D 1481 Turkish: staff: 1315 opac: 237 =3D 1552 After applying this patch and updating the strings: German: staff: 1126 opac: 300 =3D 1426 Italian: staff: 2360 opac: 447 =3D 2807 Armenian: staff: 1295 opac: 300 =3D 1595 Spanish: staff: 1484 opac: 302 =3D 1786 Turkish: staff: 1488 opac: 365 =3D 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 p= ut 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 =3D 742 Italian: staff: 808 opac: 107 =3D 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 =3D 954 Spanish: staff: 826 opac: 111 =3D 937 Turkish: staff: 998 opac: 116 =3D 1114 After applying this patch and updating the strings: German: staff: 899 opac: 168 =3D 1067 Italian: staff: 996 opac: 240 =3D 1236 Armenian: staff: 1019 opac: 247 =3D 1266 Spanish: staff: 1016 opac: 243 =3D 1259 Turkish: staff: 1176 opac: 248 =3D 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) --=20 You are receiving this mail because: You are watching all bug changes. --===============0967025638874837015==-- From bugzilla-daemon@bugs.koha-community.org Sat May 14 23:56:18 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 14 May 2022 21:56:16 +0000 Message-ID: <bug-30733-70-4rGGuWtLbq@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6216579114971500448==" --===============6216579114971500448== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #21 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (The final result is what I posted at the beginning of the comment "the number of the strings it would have lost") -- You are receiving this mail because: You are watching all bug changes. --===============6216579114971500448==-- From bugzilla-daemon@bugs.koha-community.org Wed May 18 19:20:01 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 18 May 2022 17:20:00 +0000 Message-ID: <bug-30733-70-nXJCyWPXls@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1908406459583523572==" --===============1908406459583523572== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1908406459583523572==-- From bugzilla-daemon@bugs.koha-community.org Mon May 30 01:47:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sun, 29 May 2022 23:47:34 +0000 Message-ID: <bug-30733-70-hVxRirH5Xo@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5389412714483531939==" --===============5389412714483531939== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #22 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135444 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135444&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. --===============5389412714483531939==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 02:56:49 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 00:56:48 +0000 Message-ID: <bug-30733-70-QMbHvJMK5q@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9004811888154640765==" --===============9004811888154640765== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============9004811888154640765==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 03:03:15 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 01:03:14 +0000 Message-ID: <bug-30733-70-NkLgDQsbVs@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2764216423683566844==" --===============2764216423683566844== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #24 from Fridolin Somers <fridolin.somers@biblibre.com> --- 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. For example : koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt - <legend><h1>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund + <legend><h1>[% IF ( budget_id ) %]<span>Modify</span>[% ELSE %]<span>Add</span>[% END %] <span>Fund</span> Will generate : Modify Add Fund But we need to have : Modify Fund Add Fund For french translation : Modifier le poste budgĂ©taire Ajouter un Poste budgĂ©taire "un/le" must be "une/la" when object is a she. Same in those files : acqbudgets.tt authtypes.tt cities.tt debit_types.tt edit-batcht.tt edit-layout.tt -- You are receiving this mail because: You are watching all bug changes. --===============2764216423683566844==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 03:10:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 01:10:34 +0000 Message-ID: <bug-30733-70-NQMQBUP1L6@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8478440357500238871==" --===============8478440357500238871== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- 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 &rsaquo= ;: Search[% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'doc-head-open.inc' %]<span>Koha</span> › <span>Tools</spa= n> › <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 --=20 You are receiving this mail because: You are watching all bug changes. --===============8478440357500238871==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 03:13:55 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 01:13:54 +0000 Message-ID: <bug-30733-70-Rma07aTAGh@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0926558995833562687==" --===============0926558995833562687== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #26 from Fridolin Somers <fridolin.somers@biblibre.com> --- In koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt - <h2>[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of [% todaysdate | html %][% IF ( isfiltered ) %] <span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2> + <h2>[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]<span>Items</span>[% ELSE %]Item[% END %] overdue as of [% todaysdate | html %][% IF ( isfiltered ) %] <span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2> Why this small change ? It is actually a IF/ELSE to use singular or plural Item or Items. "overdue" will need to know the context. I'd say do not touch. -- You are receiving this mail because: You are watching all bug changes. --===============0926558995833562687==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 03:15:12 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 01:15:11 +0000 Message-ID: <bug-30733-70-lW8uItkkao@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2757921412863689993==" --===============2757921412863689993== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2757921412863689993==-- From bugzilla-daemon@bugs.koha-community.org Tue May 31 03:17:46 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 31 May 2022 01:17:45 +0000 Message-ID: <bug-30733-70-sLXpkqVevj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0760953072217155582==" --===============0760953072217155582== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #28 from Fridolin Somers <fridolin.somers@biblibre.com> --- This is a suggestion : koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ics.tt This is for ICal calendar export, maybe it should not contain HTML -- You are receiving this mail because: You are watching all bug changes. --===============0760953072217155582==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:40:45 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:40:44 +0000 Message-ID: <bug-30733-70-AtppacX0u9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5583129352564651431==" --===============5583129352564651431== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============5583129352564651431==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:40:59 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:40:58 +0000 Message-ID: <bug-30733-70-eK9K4zhIy6@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9131495539249990944==" --===============9131495539249990944== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135444|0 |1 is obsolete| | --- Comment #30 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135565 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135565&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. --===============9131495539249990944==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:41:12 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:41:11 +0000 Message-ID: <bug-30733-70-kK7BOwEp1x@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3850301607416545011==" --===============3850301607416545011== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3850301607416545011==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:41:26 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:41:25 +0000 Message-ID: <bug-30733-70-41QpB237e1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9134226129901082606==" --===============9134226129901082606== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #32 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135567 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135567&action=edit Bug 30733: Undo bad handling of a plural case -- You are receiving this mail because: You are watching all bug changes. --===============9134226129901082606==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:41:41 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:41:40 +0000 Message-ID: <bug-30733-70-n4JXAET0OO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8730033904061778014==" --===============8730033904061778014== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8730033904061778014==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 05:43:45 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 03:43:44 +0000 Message-ID: <bug-30733-70-og2T5iVHhf@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6457599680387591771==" --===============6457599680387591771== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #34 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 135569 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=135569&action=edit Bug 30733: Undo <span> in an ICS calendar file -- You are receiving this mail because: You are watching all bug changes. --===============6457599680387591771==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 06:00:32 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 04:00:31 +0000 Message-ID: <bug-30733-70-0oSkdrbO8i@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8940199179021348511==" --===============8940199179021348511== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- 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. ---=20 > 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 =C2=AB%s Biblio-level recall on=C2=BB , 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. --=20 You are receiving this mail because: You are watching all bug changes. --===============8940199179021348511==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 08:52:20 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 06:52:19 +0000 Message-ID: <bug-30733-70-FlcrcK2i6W@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7971132167290097685==" --===============7971132167290097685== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #36 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Applying: Bug 30733: Simplify translatable strings error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). -- You are receiving this mail because: You are watching all bug changes. --===============7971132167290097685==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 08:53:26 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 06:53:25 +0000 Message-ID: <bug-30733-70-ndJ2APXvjE@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7129185338752797870==" --===============7129185338752797870== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7129185338752797870==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 09:19:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 07:19:50 +0000 Message-ID: <bug-30733-70-PisK1IgOCh@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3766930231574976892==" --===============3766930231574976892== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #38 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- My tests: - checkout master - run install (fr-FR) - commit - apply patches - run install - diff The following changes look wrong: * cataloguing/value_builder/marc21_linking_section.tt -msgid "%sResults %s to %s of %s %sNo results found %s" +#, fuzzy, c-format +msgid "%sResults %s to %s of %s %s" msgstr "%sRĂ©sultats %s Ă  %s sur %s %sAucun rĂ©sultat %s" Surround "Results with span [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% total | html %]</span> * opac-account-pay-error.tt It's not clear what's happening, isn't it be part of <title>? * includes/holds-table.inc "Item in transit from" You switched from: 9591 -msgid "%s %s %s %s Item in transit from " to: 11135 +msgid "Item in transit from " That's still not useful to translate. You just removed the %s, but translators still cannot translate the sentence correctly * Same here, from: 9712 -msgid "%s %stag%stags%s successfully added." to: 12611 +msgid "successfully added." * Same: msgid "Added %s by", by who? * Same: msgid "Waiting for patron at" * Same: msgid "Recalled by patron expected at" You want to help translators giving them sentences easy to translate. If you remove context you are make things worse :) -- You are receiving this mail because: You are watching all bug changes. --===============3766930231574976892==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 09:40:59 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 07:40:59 +0000 Message-ID: <bug-30733-70-UYseaLm0Zh@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1154986815416796217==" --===============1154986815416796217== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 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/interna= tionalization.md ? :-) --=20 You are receiving this mail because: You are watching all bug changes. --===============1154986815416796217==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 09:43:44 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 07:43:43 +0000 Message-ID: <bug-30733-70-0h5yzceyvp@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7517308288887672276==" --===============7517308288887672276== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #40 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- * You could also split this: <span>Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %]</span> * msgid "If you have any questions, please contact the " the what? See on bug 29602 how we fixed this problem with KohaSpan * msgid "Recalled by patron expected at" * msgid "does not exist" * msgid "does not match" * msgid "%s Hold found for %s (" where is the closing parenthesis? I am only at the middle of the diff, it's very boring, will continue later. But I think you get it. -- You are receiving this mail because: You are watching all bug changes. --===============7517308288887672276==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 2 09:46:17 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 02 Jun 2022 07:46:16 +0000 Message-ID: <bug-30733-70-Z1iADQUdfD@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8379985088875630929==" --===============8379985088875630929== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8379985088875630929==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 3 05:42:47 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 03 Jun 2022 03:42:45 +0000 Message-ID: <bug-30733-70-I27IuWlGMC@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8791708015363810822==" --===============8791708015363810822== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #42 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Thanks for the feedback Julian and Jonathan :D I'll 1st address the part about i18n TT functions. (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 ? :-) Of course I did :P , on Bug 29602 I pushed to use that instead of <span> but = it couldn't be done (more on that bellow) and nothing changed on the situation of use of i18n TT functions so for this ticket I reluctantly used the same method as bug 29602. Which I find cluttering so I would be happy to make a 180=C2=B0= turn here and replace the ugly <span> with t(). (In reply to Jonathan Druart from comment #41) > Yes, and what Julian said, the i18n TT functions are the way to go for > complicated strings/structures. Which couldn't be used for bug 29602 so I followed the same constraint here. But you are the right person to clear the uncertainty about the used of i18n = TT functions because you raised the concern about them on bug 29602 comment 7 > IIRC there were perf issues That question was hard to settle on bug 20988. Current state is that I'm not sure what was the methodology you suggested to measure this accurately and asked for confirmation. So what is your current position? I guess it's because of the not that high number of strings that performances aren't a worry here. But so was the case for bug 29602. --=20 You are receiving this mail because: You are watching all bug changes. --===============8791708015363810822==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 3 06:32:38 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 03 Jun 2022 04:32:37 +0000 Message-ID: <bug-30733-70-qAie0GzRP9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2439574587540169300==" --===============2439574587540169300== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2439574587540169300==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:17:19 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:18 +0000 Message-ID: <bug-30733-70-55mZgxD3nK@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4041650530722973105==" --===============4041650530722973105== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135564|0 |1 is obsolete| | --- Comment #44 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136012 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136012&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. --===============4041650530722973105==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:17:29 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:23 +0000 Message-ID: <bug-30733-70-R8RMPRUmss@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7377545582989343896==" --===============7377545582989343896== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7377545582989343896==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:17:39 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:29 +0000 Message-ID: <bug-30733-70-VLHBPQ8qSr@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6060492824925610769==" --===============6060492824925610769== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135566|0 |1 is obsolete| | --- Comment #46 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136014 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136014&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. --===============6060492824925610769==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:17:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:34 +0000 Message-ID: <bug-30733-70-vuikEs0NX4@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3024262828702647238==" --===============3024262828702647238== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3024262828702647238==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:01 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:40 +0000 Message-ID: <bug-30733-70-mRb9SjA5uX@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7553542713587490253==" --===============7553542713587490253== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #135568|0 |1 is obsolete| | --- Comment #48 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136016 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136016&action=edit Bug 30733: Wrap one more string in <span> -- You are receiving this mail because: You are watching all bug changes. --===============7553542713587490253==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:11 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:46 +0000 Message-ID: <bug-30733-70-2TxdOjX6uj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2699873354747340398==" --===============2699873354747340398== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2699873354747340398==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:21 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:53 +0000 Message-ID: <bug-30733-70-hyQTKfEoT4@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4284213664159406650==" --===============4284213664159406650== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #50 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136018 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136018&action=edit Bug 30733: Simplify some singular cases To be sure translators don't think it's wrong and translate it plurally. -- You are receiving this mail because: You are watching all bug changes. --===============4284213664159406650==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:32 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:17:58 +0000 Message-ID: <bug-30733-70-K6iNxPesow@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7863355747809458779==" --===============7863355747809458779== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7863355747809458779==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:42 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:18:05 +0000 Message-ID: <bug-30733-70-xtotym3sk0@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1707357462012164446==" --===============1707357462012164446== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #52 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136020 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136020&action=edit Bug 30733: fix url => URL to merge with existing string -- You are receiving this mail because: You are watching all bug changes. --===============1707357462012164446==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:18:52 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:18:11 +0000 Message-ID: <bug-30733-70-jkgf5uBQpU@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6331939071225912788==" --===============6331939071225912788== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============6331939071225912788==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:23:53 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:23:44 +0000 Message-ID: <bug-30733-70-8Za6eBIG4D@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1190155054841658221==" --===============1190155054841658221== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #54 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Jonathan Druart from comment #38) > My tests: > - checkout master > - run install (fr-FR) > - commit > - apply patches > - run install you mean update? --- > The following changes look wrong: >=20 > * cataloguing/value_builder/marc21_linking_section.tt > [...] > Surround "Results with span > [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% > total | html %]</span> Ok done, initially I skipped some strings that were not really terrible to ke= ep time to process all the worst. --- > * opac-account-pay-error.tt > It's not clear what's happening, isn't it be part of <title>? After investigating with Fridolin we are nearly sure it's dead code from the time of Paypal payment integrated into Koha. I will open a followup ticket. As the for changes of this patch they can stay there. They have no impact besides cleaning translation strings. Simpler strings never used are still less translation work than a complex string never used. > * includes/holds-table.inc "Item in transit from" > You switched from: > 9591 -msgid "%s %s %s %s Item in transit from " > to: > 11135 +msgid "Item in transit from " >=20 > That's still not useful to translate. You just removed the %s, but > translators still cannot translate the sentence correctly Ok, I extracted the <strong> in a BLOCK, thanks for the advice to use that. > * Same here, from: > 9712 -msgid "%s %stag%stags%s successfully added." > to: > 12611 +msgid "successfully added." It's a plural case. Reverted, it should be done using I18n TT functions. ---- > * Same: msgid "Added %s by", by who? Previous string: msgid "%s Added %s by you %s %s Added %s by %s %s %s %s %s %s %s %s %s %s %s = %s %s %s %s %s %s " That's an improvement right? Can't do better IIUC, the last word of the displayed string is from a SWITCH https://git.koha-community.org/Koha-community/Koha/src/commit/beb663836b45a77= f45195774133cc9b78957fcd5/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showr= eviews.tt#L94 ---- > * Same: msgid "Waiting for patron at" > * Same: msgid "Recalled by patron expected at" Is that about about including a trailing %s to make clear that there is a variable? Done. --- > You want to help translators giving them sentences easy to translate. If you > remove context you are make things worse :) Is there actually a confusion? Given the way phrases end. ---- (In reply to Jonathan Druart from comment #40) > * You could also split this: > <span>Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until > | $KohaDates %] [% END %]</span> Indeed, that's not a loss of context. I isolated Suspended and until. ----- > * msgid "If you have any questions, please contact the " >=20 > the what? > See on bug 29602 how we fixed this problem with KohaSpan I don't get the need of KohaSpan. Because here are the different resulting HTMLs with and without the KohaSpan filter. <span>If you have any questions, please contact the <span><a href=3D"mailto:root@localhost">site administrator</a></span></span> <span>If you have any questions, please contact the <a href=3D"mailto:root@localhost">site administrator</a></span> And in both cases, the string will not be as wished. Because in contrast to t= he 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? ------- > * msgid "Recalled by patron expected at" Fixed. > * msgid "does not exist" > * msgid "does not match" It's just a bunch of IF, not much we can do. https://git.koha-community.org/Koha-community/Koha/src/commit/972330bc9e13e40= 564885bcf0ef1723abcc51772/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_= modification_templates.tt#L186 > * msgid "%s Hold found for %s (" where is the closing parenthesis? It doesn't look like I changed this so I don't know why if came up in your diff. Anyway, added a few <span> > I am only at the middle of the diff, it's very boring, will continue later. > But I think you get it. It took me a long time to understand not having an ending %s was the issue. (I hope it was indeed that! =F0=9F=98=AE ) I hope I spotted all the cases after going though the whole diff. Everything should be fixed or addressed in the previous paragraphs. --=20 You are receiving this mail because: You are watching all bug changes. --===============1190155054841658221==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 13 14:32:49 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 12:32:48 +0000 Message-ID: <bug-30733-70-F1yi3UQMnj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6046266191346355789==" --===============6046266191346355789== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #55 from Victor Grousset/tuxayo <victor@tuxayo.net> --- > <span>If you have any questions, please contact the <a href=3D"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. --=20 You are receiving this mail because: You are watching all bug changes. --===============6046266191346355789==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:06:17 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:06:15 +0000 Message-ID: <bug-30733-70-FQ7HBty150@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8087627803949229129==" --===============8087627803949229129== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes. --===============8087627803949229129==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:06:27 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:06:21 +0000 Message-ID: <bug-30733-70-bCWhx4UnoJ@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2669122573005073967==" --===============2669122573005073967== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2669122573005073967==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:06:49 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:06:45 +0000 Message-ID: <bug-30733-70-Eq46ZY8d4V@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7277865211672378357==" --===============7277865211672378357== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136013|0 |1 is obsolete| | --- Comment #57 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136046 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136046&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. --===============7277865211672378357==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:07:51 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:07:50 +0000 Message-ID: <bug-30733-70-aTHXRlx2i9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1375502207183734893==" --===============1375502207183734893== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1375502207183734893==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:08:08 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:08:06 +0000 Message-ID: <bug-30733-70-XhvQUe9E1r@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3708567314201110927==" --===============3708567314201110927== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136015|0 |1 is obsolete| | --- Comment #59 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136048 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136048&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. --===============3708567314201110927==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:08:23 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:08:22 +0000 Message-ID: <bug-30733-70-GlmBO4PPjP@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4885565760726487809==" --===============4885565760726487809== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============4885565760726487809==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:08:43 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:08:41 +0000 Message-ID: <bug-30733-70-ppFRFKdXlz@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1074032125300893487==" --===============1074032125300893487== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136017|0 |1 is obsolete| | --- Comment #61 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136050 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136050&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. --===============1074032125300893487==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:09:07 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:09:05 +0000 Message-ID: <bug-30733-70-zlXg3J1etf@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9147062230413407018==" --===============9147062230413407018== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============9147062230413407018==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:09:22 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:09:21 +0000 Message-ID: <bug-30733-70-VHEQuZ0Hnc@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3580429767004730026==" --===============3580429767004730026== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136019|0 |1 is obsolete| | --- Comment #63 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136052 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136052&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. --===============3580429767004730026==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:09:47 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:09:46 +0000 Message-ID: <bug-30733-70-SQNvpWw00f@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3146633688320877895==" --===============3146633688320877895== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3146633688320877895==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 14 00:10:05 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 13 Jun 2022 22:10:04 +0000 Message-ID: <bug-30733-70-Ddrss6a4SK@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2659935087311164906==" --===============2659935087311164906== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136021|0 |1 is obsolete| | --- Comment #65 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136054 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136054&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. --===============2659935087311164906==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 16:19:43 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 14:19:41 +0000 Message-ID: <bug-30733-70-yyCsAOijH6@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7870464740044056730==" --===============7870464740044056730== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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. --===============7870464740044056730==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:30:46 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:30:44 +0000 Message-ID: <bug-30733-70-7zG7U9JIpw@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0407289034773882006==" --===============0407289034773882006== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136045|0 |1 is obsolete| | --- Comment #67 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136098 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136098&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. --===============0407289034773882006==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:03 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:02 +0000 Message-ID: <bug-30733-70-naCyGFcXiy@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5259699129279568792==" --===============5259699129279568792== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============5259699129279568792==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:13 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:12 +0000 Message-ID: <bug-30733-70-8fL1Wexs2r@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8673014950771250307==" --===============8673014950771250307== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136047|0 |1 is obsolete| | --- Comment #69 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136100 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136100&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. --===============8673014950771250307==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:23 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:18 +0000 Message-ID: <bug-30733-70-X8W7dN7An6@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8266366052917040365==" --===============8266366052917040365== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8266366052917040365==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:34 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:24 +0000 Message-ID: <bug-30733-70-XbCMVWzYn5@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2162398694427672389==" --===============2162398694427672389== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136049|0 |1 is obsolete| | --- Comment #71 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136102 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136102&action=edit Bug 30733: Wrap one more string in <span> -- You are receiving this mail because: You are watching all bug changes. --===============2162398694427672389==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:44 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:29 +0000 Message-ID: <bug-30733-70-NTK8RiAHH8@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1665224132354162769==" --===============1665224132354162769== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1665224132354162769==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:31:54 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:35 +0000 Message-ID: <bug-30733-70-cEc3E9i8ER@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5159331411480641080==" --===============5159331411480641080== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136051|0 |1 is obsolete| | --- Comment #73 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136104 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136104&action=edit Bug 30733: Simplify some singular cases To be sure translators don't think it's wrong and translate it plurally. -- You are receiving this mail because: You are watching all bug changes. --===============5159331411480641080==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:32:04 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:43 +0000 Message-ID: <bug-30733-70-TYcLpASDwH@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0486225592128092979==" --===============0486225592128092979== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0486225592128092979==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:32:14 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:51 +0000 Message-ID: <bug-30733-70-siwfrYbsgV@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8883739189157465467==" --===============8883739189157465467== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136053|0 |1 is obsolete| | --- Comment #75 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136106 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136106&action=edit Bug 30733: fix url => URL to merge with existing string -- You are receiving this mail because: You are watching all bug changes. --===============8883739189157465467==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:32:24 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:31:58 +0000 Message-ID: <bug-30733-70-1l3hUiSmk1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4789088391235743267==" --===============4789088391235743267== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============4789088391235743267==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:34:51 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:34:50 +0000 Message-ID: <bug-30733-70-drpTDZKdiT@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0670746418744705075==" --===============0670746418744705075== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136098|0 |1 is obsolete| | --- Comment #77 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136108 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136108&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. --===============0670746418744705075==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:35:12 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:35:11 +0000 Message-ID: <bug-30733-70-le0z0HAY8K@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6308434959782033558==" --===============6308434959782033558== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============6308434959782033558==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:35:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:35:34 +0000 Message-ID: <bug-30733-70-1aT3eUS27l@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1673225541314896758==" --===============1673225541314896758== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136100|0 |1 is obsolete| | --- Comment #79 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136110 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136110&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. --===============1673225541314896758==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:35:52 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:35:50 +0000 Message-ID: <bug-30733-70-fKc1qWGmbq@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8802538452389333556==" --===============8802538452389333556== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8802538452389333556==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:36:12 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:36:11 +0000 Message-ID: <bug-30733-70-PnV30nRvrA@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5773317738313276302==" --===============5773317738313276302== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136102|0 |1 is obsolete| | --- Comment #81 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136112 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136112&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. --===============5773317738313276302==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:36:29 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:36:28 +0000 Message-ID: <bug-30733-70-FZfEjt5E2r@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1116718035336658421==" --===============1116718035336658421== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1116718035336658421==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:36:44 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:36:44 +0000 Message-ID: <bug-30733-70-o7nVL3NsOY@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5380831928138068161==" --===============5380831928138068161== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136104|0 |1 is obsolete| | --- Comment #83 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136114 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136114&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. --===============5380831928138068161==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:37:03 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:37:02 +0000 Message-ID: <bug-30733-70-ZbEzBxnBFe@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6284565946867826590==" --===============6284565946867826590== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============6284565946867826590==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:37:22 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:37:21 +0000 Message-ID: <bug-30733-70-8O9t9QjtSg@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1425533642600375445==" --===============1425533642600375445== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136106|0 |1 is obsolete| | --- Comment #85 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136116 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136116&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. --===============1425533642600375445==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:37:41 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:37:40 +0000 Message-ID: <bug-30733-70-poVoUAT6QO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1299501349208632165==" --===============1299501349208632165== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1299501349208632165==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 15 19:38:16 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 15 Jun 2022 17:38:15 +0000 Message-ID: <bug-30733-70-3C7dTVYyoV@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8305043194165840933==" --===============8305043194165840933== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #87 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Rebased. Sorry for the double upload, I lost Fridolin's signoff the 1st time. -- You are receiving this mail because: You are watching all bug changes. --===============8305043194165840933==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:01:44 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:01:43 +0000 Message-ID: <bug-30733-70-QK86uirYHD@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2426613343312983245==" --===============2426613343312983245== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2426613343312983245==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:02:04 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:02:03 +0000 Message-ID: <bug-30733-70-QGVozTk38o@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5651792855681912147==" --===============5651792855681912147== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136109|0 |1 is obsolete| | --- Comment #89 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136175 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136175&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. --===============5651792855681912147==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:02:24 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:02:23 +0000 Message-ID: <bug-30733-70-DU7zFt2gBR@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6337537024565137992==" --===============6337537024565137992== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============6337537024565137992==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:02:47 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:02:46 +0000 Message-ID: <bug-30733-70-It80uYqT6D@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1176223369614863904==" --===============1176223369614863904== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136111|0 |1 is obsolete| | --- Comment #91 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136177 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136177&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. --===============1176223369614863904==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:03:02 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:03:01 +0000 Message-ID: <bug-30733-70-pd8QPshwEZ@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5176964664062519868==" --===============5176964664062519868== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============5176964664062519868==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:03:18 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:03:18 +0000 Message-ID: <bug-30733-70-5P4AqHPK16@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4912906146184000920==" --===============4912906146184000920== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136113|0 |1 is obsolete| | --- Comment #93 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136179 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136179&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. --===============4912906146184000920==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:03:39 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:03:38 +0000 Message-ID: <bug-30733-70-MUKhuap7Qu@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7795252462297939491==" --===============7795252462297939491== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7795252462297939491==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:04:02 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:04:01 +0000 Message-ID: <bug-30733-70-N1ZGkyAY3t@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8121770182300323568==" --===============8121770182300323568== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136115|0 |1 is obsolete| | --- Comment #95 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136181 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136181&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. --===============8121770182300323568==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:04:26 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:04:25 +0000 Message-ID: <bug-30733-70-Fzw9rXeYzK@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0261643347068682339==" --===============0261643347068682339== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0261643347068682339==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:04:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:04:49 +0000 Message-ID: <bug-30733-70-8wOf29DVJ1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9017517620805184132==" --===============9017517620805184132== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136117|0 |1 is obsolete| | --- Comment #97 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Created attachment 136183 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136183&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. --===============9017517620805184132==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:06:00 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:05:59 +0000 Message-ID: <bug-30733-70-AZwmIScXt3@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4950073628609480469==" --===============4950073628609480469== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============4950073628609480469==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 18:34:58 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 16:34:56 +0000 Message-ID: <bug-30733-70-jFp54YkXYa@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0690292584116356976==" --===============0690292584116356976== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.derscheid@lmscloud.de --- Comment #99 from Paul Derscheid <paul.derscheid@lmscloud.de> --- I this intended? --- diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index 6af47706d0..a39f377914 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -38,7 +38,7 @@ Your cart <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 %] [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] [% IF ( BIBLIO_RESULT.author ) %]; [% END %] --- I think there's something wrong here.. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 905fd07bd3..917a7ef246 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -516,14 +516,15 @@ Note that permanent location is a code, and location may be an authval. [% IF item.recalled %] [% IF item.recall.waiting_date %] - Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %] + <span>Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]</span> [% ELSE %] - Item recalled by <a href=3D"/cgi-bin/koha/members/moremember.pl?borrowernumber=3D[% 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 %] = =20 + [% patron_link =3D BLOCK %]<a href=3D"/cgi-bin/koha/members/moremember.pl?borrowernumber=3D[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a>[% END %] =20 + <span>Item recalled by [% patron_link| $raw = %] on [% item.recall.created_date | $KohaDates %]</span> [% END %] [% END %] --- 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 @@ -127,7 +127,7 @@ <div class=3D"dialog message">[% added_count= | html %] [% IF ( added_count =3D=3D 1 ) %]tag[% ELSE %]tags[% END %] successfu= lly added.</div> [% END %] [% IF ( deleted_count ) %] - <div class=3D"dialog message">[% deleted_count | html %] [% IF ( deleted_count =3D=3D 1 ) %]tag[% ELSE %]tags[% END %] success= fully deleted.</div> + <div class=3D"dialog message">[% deleted_cou= nt | html %] [% IF ( deleted_count =3D=3D 1 ) %]tag[% ELSE %]tags[% END %] success= fully deleted.</div> [% END %] [% END # /add_op %] --=20 You are receiving this mail because: You are watching all bug changes. --===============0690292584116356976==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:01:27 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:01:26 +0000 Message-ID: <bug-30733-70-CDcLrt6SIp@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9069180168926212215==" --===============9069180168926212215== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- 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 a= nd I needed another one just for the string on this line. ------ > I think there's something wrong here.. >=20 > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt > [...] > - Item recalled by <a > href=3D"/cgi-bin/koha/members/moremember.pl?borrowernumber=3D[% > 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 %] = =20 >=20 > + [% patron_link =3D BLOCK %]<a > href=3D"/cgi-bin/koha/members/moremember.pl?borrowernumber=3D[% > item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% > item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | > html %])</a>[% END %] = =20 > + <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 t= he 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=3D"dialog message">[% deleted_count= | > html %] [% IF ( deleted_count =3D=3D 1 ) %]tag[% ELSE %]tags[% END %] > successfully deleted.</div> > + <div class=3D"dialog message">[% > deleted_count | html %] [% IF ( deleted_count =3D=3D 1 ) %]tag[% ELSE %]tag= s[% > 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. --=20 You are receiving this mail because: You are watching all bug changes. --===============9069180168926212215==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:08:46 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:08:44 +0000 Message-ID: <bug-30733-70-oF5uvgmqag@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6668636221229537013==" --===============6668636221229537013== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136174|0 |1 is obsolete| | --- Comment #101 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136188 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136188&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> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes. --===============6668636221229537013==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:08:56 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:08:50 +0000 Message-ID: <bug-30733-70-jztPDxL3G9@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0052028568753725858==" --===============0052028568753725858== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0052028568753725858==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:06 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:08:54 +0000 Message-ID: <bug-30733-70-vp3i2ka5Yv@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7788701902994949804==" --===============7788701902994949804== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136176|0 |1 is obsolete| | --- Comment #103 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136190 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136190&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> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes. --===============7788701902994949804==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:16 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:08:59 +0000 Message-ID: <bug-30733-70-P9XEdrGXnY@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0996413817014832431==" --===============0996413817014832431== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0996413817014832431==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:26 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:05 +0000 Message-ID: <bug-30733-70-jwMnN7hMNl@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8576111097066606722==" --===============8576111097066606722== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136178|0 |1 is obsolete| | --- Comment #105 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136192 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136192&action=edit Bug 30733: Wrap one more string in <span> 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. --===============8576111097066606722==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:36 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:10 +0000 Message-ID: <bug-30733-70-MroJhakhcb@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9187546754652202730==" --===============9187546754652202730== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============9187546754652202730==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:47 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:15 +0000 Message-ID: <bug-30733-70-4Ke0NYpTHN@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8201851140147981120==" --===============8201851140147981120== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136180|0 |1 is obsolete| | --- Comment #107 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136194 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136194&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> Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes. --===============8201851140147981120==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:09:57 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:20 +0000 Message-ID: <bug-30733-70-GwPNB0rWWn@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3080904535965099582==" --===============3080904535965099582== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3080904535965099582==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:10:07 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:25 +0000 Message-ID: <bug-30733-70-aJoPUS2NIj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8353210131322251752==" --===============8353210131322251752== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136182|0 |1 is obsolete| | --- Comment #109 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 136196 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136196&action=edit Bug 30733: fix url => URL to merge with existing string 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. --===============8353210131322251752==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 19:10:17 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 17:09:30 +0000 Message-ID: <bug-30733-70-LSThXNPfEb@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7453739009240899211==" --===============7453739009240899211== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7453739009240899211==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:22:48 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:22:47 +0000 Message-ID: <bug-30733-70-xsCiH1DLNT@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8393397767286092745==" --===============8393397767286092745== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |fridolin.somers@biblibre.co |y.org |m -- You are receiving this mail because: You are watching all bug changes. --===============8393397767286092745==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:29:10 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:29:09 +0000 Message-ID: <bug-30733-70-EU15xSoAob@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6304600960935232382==" --===============6304600960935232382== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============6304600960935232382==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:30:16 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:30:14 +0000 Message-ID: <bug-30733-70-kGISbYiCLV@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1332663723441293572==" --===============1332663723441293572== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136188|0 |1 is obsolete| | --- Comment #112 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136202 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136202&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> 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. --===============1332663723441293572==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:31:20 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:31:19 +0000 Message-ID: <bug-30733-70-J0Qu2hkwfA@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7530093157788174983==" --===============7530093157788174983== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7530093157788174983==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:31:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:31:34 +0000 Message-ID: <bug-30733-70-ZXDsj1vbKX@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3399950356414812040==" --===============3399950356414812040== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136190|0 |1 is obsolete| | --- Comment #114 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136204 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136204&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> 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. --===============3399950356414812040==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:31:50 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:31:48 +0000 Message-ID: <bug-30733-70-7zsDVLvLfa@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7270550471183730118==" --===============7270550471183730118== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7270550471183730118==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:32:04 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:32:03 +0000 Message-ID: <bug-30733-70-QwO31TwwYj@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2901726271810956660==" --===============2901726271810956660== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136192|0 |1 is obsolete| | --- Comment #116 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136206 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136206&action=edit Bug 30733: Wrap one more string in <span> 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. --===============2901726271810956660==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:32:19 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:32:18 +0000 Message-ID: <bug-30733-70-B21ynYSt9v@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3274557125280441609==" --===============3274557125280441609== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3274557125280441609==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:32:34 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:32:33 +0000 Message-ID: <bug-30733-70-i7305vq4Tv@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5647858269429530244==" --===============5647858269429530244== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136194|0 |1 is obsolete| | --- Comment #118 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136208 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136208&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> 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. --===============5647858269429530244==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:32:49 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:32:48 +0000 Message-ID: <bug-30733-70-n9xgI1jKKO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4026647997229113899==" --===============4026647997229113899== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============4026647997229113899==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:33:04 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:33:03 +0000 Message-ID: <bug-30733-70-xPT6TjJRgs@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5988470242534270163==" --===============5988470242534270163== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #136196|0 |1 is obsolete| | --- Comment #120 from Fridolin Somers <fridolin.somers@biblibre.com> --- Created attachment 136210 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=136210&action=edit Bug 30733: fix url => URL to merge with existing string 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. --===============5988470242534270163==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:34:01 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:34:00 +0000 Message-ID: <bug-30733-70-olUtII5C1F@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0691902395051762554==" --===============0691902395051762554== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0691902395051762554==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:34:27 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:34:26 +0000 Message-ID: <bug-30733-70-Iawux7thpc@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8640183243823652093==" --===============8640183243823652093== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes. --===============8640183243823652093==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:34:54 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:34:54 +0000 Message-ID: <bug-30733-70-s5yDeXIbAD@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7581466934631307513==" --===============7581466934631307513== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============7581466934631307513==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:35:51 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:35:50 +0000 Message-ID: <bug-30733-70-DicHlBtIes@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5942157821268621746==" --===============5942157821268621746== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #123 from Fridolin Somers <fridolin.somers@biblibre.com> --- Careful when generating HTML release notes, <span> in commit messages must be escaped. -- You are receiving this mail because: You are watching all bug changes. --===============5942157821268621746==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:42:52 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:42:50 +0000 Message-ID: <bug-30733-70-SsaydCZoO7@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3855404635329823794==" --===============3855404635329823794== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3855404635329823794==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 16 23:45:10 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 16 Jun 2022 21:45:09 +0000 Message-ID: <bug-30733-70-1BDpWQAGJa@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2539981786061051380==" --===============2539981786061051380== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 --- Comment #124 from Victor Grousset/tuxayo <victor@tuxayo.net> --- > Maybe add some nice text to go in the release notes Done, is it good? > Careful when generating HTML release notes, <span> in commit messages must = be escaped. Wasn't the issue only for the ticket name? Commit don't end up in release notes. --=20 You are receiving this mail because: You are watching all bug changes. --===============2539981786061051380==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 17 15:29:52 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 17 Jun 2022 13:29:51 +0000 Message-ID: <bug-30733-70-ArvBs7LMnR@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7779848057574960243==" --===============7779848057574960243== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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. --===============7779848057574960243==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 17 15:30:02 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 17 Jun 2022 13:29:54 +0000 Message-ID: <bug-30733-70-LPHqoWXF7W@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6197189787092445245==" --===============6197189787092445245== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 --- Comment #125 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Pushed to master for 22.11. Nice work everyone, thanks! -- You are receiving this mail because: You are watching all bug changes. --===============6197189787092445245==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 17 16:03:35 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 17 Jun 2022 14:03:33 +0000 Message-ID: <bug-30733-70-9rhOpiZ99G@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0385582198864100614==" --===============0385582198864100614== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============0385582198864100614==-- From bugzilla-daemon@bugs.koha-community.org Fri Jun 17 22:29:53 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Fri, 17 Jun 2022 20:29:52 +0000 Message-ID: <bug-30733-70-IuXDHTygJg@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7406224337473615317==" --===============7406224337473615317== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |Pushed to stable CC| |lucas@bywatersolutions.com --- Comment #127 from Lucas Gass <lucas@bywatersolutions.com> --- backported to 22.05.x for 22.05.01 -- You are receiving this mail because: You are watching all bug changes. --===============7406224337473615317==-- From bugzilla-daemon@bugs.koha-community.org Sat Jun 18 11:36:18 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 18 Jun 2022 09:36:17 +0000 Message-ID: <bug-30733-70-Yp9hV6pcnw@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5986296721250189571==" --===============5986296721250189571== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============5986296721250189571==-- From bugzilla-daemon@bugs.koha-community.org Mon Jun 20 08:40:22 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Mon, 20 Jun 2022 06:40:21 +0000 Message-ID: <bug-30733-70-lOoOry6Ber@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3105113611874544081==" --===============3105113611874544081== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|22.11.00 |22.11.00,22.05.01 released in| | -- You are receiving this mail because: You are watching all bug changes. --===============3105113611874544081==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 21 16:48:42 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Tue, 21 Jun 2022 14:48:41 +0000 Message-ID: <bug-30733-70-5r78wbPabT@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2849973886099941852==" --===============2849973886099941852== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2849973886099941852==-- From bugzilla-daemon@bugs.koha-community.org Wed Jun 22 16:31:18 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 22 Jun 2022 14:31:15 +0000 Message-ID: <bug-30733-70-HXBeFfRRkO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3589694820968388685==" --===============3589694820968388685== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D30733 Arthur Suzuki <arthur.suzuki@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to stable |RESOLVED --- Comment #130 from Arthur Suzuki <arthur.suzuki@biblibre.com> --- According to conversation during IRC dev meeting, won't backport to 21.11. Th= x! <pre> 16:25 < ashimema> is it actualyl worthwhile backporting 30733 any further.. ? 16:26 < ashimema> ha.. great minds 16:26 < cait1> it creates a lot of work for translators 16:26 < tuxayo> ashimema totally not 16:26 < cait1> and the later the version the more unlikley people keep up 16:26 < tuxayo> It's a mess ^^ 16:26 < liliputech> if it's not i can manage not to work on it ;) 16:26 < ashimema> I don't think we should.. it would do the oposite of what it tries to do.. get translators to re-translate a lot 16:26 < tuxayo> 30733 was only for 22.05 16:26 < cait1> yep, I think it's good there 16:26 < liliputech> ok, then i will resolve-fix that one :) thx! </pre> --=20 You are receiving this mail because: You are watching all bug changes. --===============3589694820968388685==-- From bugzilla-daemon@bugs.koha-community.org Thu Jun 30 05:00:56 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Thu, 30 Jun 2022 03:00:45 +0000 Message-ID: <bug-30733-70-i8NKdMS9zF@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1068051132944231329==" --===============1068051132944231329== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============1068051132944231329==-- From bugzilla-daemon@bugs.koha-community.org Thu Jul 28 13:37:27 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Wed, 27 Jul 2022 12:49:17 +0000 Message-ID: <bug-30733-70-wVMOH20UEW@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7303125933714325282==" --===============7303125933714325282== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30733 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |31246 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31246 [Bug 31246] <span> displayed in 'Additional fields' section -- You are receiving this mail because: You are watching all bug changes. --===============7303125933714325282==-- From bugzilla-daemon@bugs.koha-community.org Sat Oct 8 03:02:12 2022 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 08 Oct 2022 01:02:01 +0000 Message-ID: <bug-30733-70-fpnmnBH08r@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2208692629179253392==" --===============2208692629179253392== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============2208692629179253392==-- From bugzilla-daemon@bugs.koha-community.org Sat Jun 15 23:24:13 2024 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 15 Jun 2024 21:24:01 +0000 Message-ID: <bug-30733-70-lrkoP80w30@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3586769361222146832==" --===============3586769361222146832== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============3586769361222146832==-- From bugzilla-daemon@bugs.koha-community.org Sat Jun 15 23:25:12 2024 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 30733] Simplify translatable strings Date: Sat, 15 Jun 2024 21:24:51 +0000 Message-ID: <bug-30733-70-aA8eQSx51I@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-30733-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8358903684229107738==" --===============8358903684229107738== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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. --===============8358903684229107738==--