Bug 34079 - The phrase "Displaying [all|approved|pending|rejected] terms" was separated
Summary: The phrase "Displaying [all|approved|pending|rejected] terms" was separated
Status: RESOLVED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: I18N/L10N (show other bugs)
Version: unspecified
Hardware: All All
: P5 - low normal (vote)
Assignee: Caroline Cyr La Rose
QA Contact: Martin Renvoize
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-06-21 14:17 UTC by Caroline Cyr La Rose
Modified: 2023-12-28 20:47 UTC (History)
3 users (show)

See Also:
Change sponsored?: ---
Patch complexity: String patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
23.11.00,23.05.04,22.11.10


Attachments
Bug 34079 - The phrase "Displaying [all|approved|pending|rejected] terms" was separated (1.99 KB, patch)
2023-06-21 14:26 UTC, Caroline Cyr La Rose
Details | Diff | Splinter Review
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated (2.14 KB, patch)
2023-06-21 15:01 UTC, Caroline Cyr La Rose
Details | Diff | Splinter Review
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated (2.20 KB, patch)
2023-06-22 11:33 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated (2.26 KB, patch)
2023-09-11 11:00 UTC, Martin Renvoize
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Caroline Cyr La Rose 2023-06-21 14:17:54 UTC
The phrase "Displaying [all|approved|pending|rejected] terms" was cut into individual words by bug 30733. However, in French, we need to be able to change the sentence structure (it would become something like "Displaying terms [all|approved|pending|rejected]").
Comment 1 Caroline Cyr La Rose 2023-06-21 14:26:03 UTC
Created attachment 152523 [details] [review]
Bug 34079 - The phrase "Displaying [all|approved|pending|rejected] terms" was separated

This patch reunites the words for the sentence "Displaying
[all|approved|pending|rejected] terms" in order to facilitate
translating in languages that have a different syntax.

To test:
1. Install a new language

   ./misc/translator/translate install xx-XX

2. Check the xx-XX-staff-prog.po file for the sentence
   --> All the words are individual strings

3. Apply patch

4. Update the po files

   ./misc/translator/translate update xx-XX

5. Check the xx-XX-staff-prog.po file again
   --> The sentence is reunited
Comment 2 Fridolin Somers 2023-06-21 14:45:46 UTC
Tricky indeed.

In my opinion, we should use the all phrase to have context and no %s :

<h4>
[% IF ( filter_approved_all ) %]<span>Displaying all terms</span>[% END %]
[% IF ( filter_approved_ok ) %]<span>Displaying approved terms</span>[% END %]
[% IF ( filter_approved_pending ) %]<span>Displaying pending terms</span>[% END %]
[% IF ( filter_approved_rej ) %]<span>Displaying rejected terms</span>[% END %]
</h4>
Comment 3 Caroline Cyr La Rose 2023-06-21 15:01:52 UTC
Created attachment 152527 [details] [review]
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated

This patch reunites the words for the sentence "Displaying
[all|approved|pending|rejected] terms" in order to facilitate
translating in languages that have a different syntax.

To test:
1. Install a new language

   ./misc/translator/translate install xx-XX

2. Check the xx-XX-staff-prog.po file for the sentence
   --> All the words are individual strings

3. Apply patch

4. Update the po files

   ./misc/translator/translate update xx-XX

5. Check the xx-XX-staff-prog.po file again
   --> The sentence is reunited for each status (Displaying all terms,
Displaying approved terms, etc.)
Comment 4 Caroline Cyr La Rose 2023-06-21 15:02:22 UTC
(In reply to Fridolin Somers from comment #2)
> Tricky indeed.
> 
> In my opinion, we should use the all phrase to have context and no %s :
> 
> <h4>
> [% IF ( filter_approved_all ) %]<span>Displaying all terms</span>[% END %]
> [% IF ( filter_approved_ok ) %]<span>Displaying approved terms</span>[% END
> %]
> [% IF ( filter_approved_pending ) %]<span>Displaying pending terms</span>[%
> END %]
> [% IF ( filter_approved_rej ) %]<span>Displaying rejected terms</span>[% END
> %]
> </h4>

Even better!

I redid the patch.
Comment 5 Owen Leonard 2023-06-22 11:33:56 UTC
Created attachment 152553 [details] [review]
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated

This patch reunites the words for the sentence "Displaying
[all|approved|pending|rejected] terms" in order to facilitate
translating in languages that have a different syntax.

To test:
1. Install a new language

   ./misc/translator/translate install xx-XX

2. Check the xx-XX-staff-prog.po file for the sentence
   --> All the words are individual strings

3. Apply patch

4. Update the po files

   ./misc/translator/translate update xx-XX

5. Check the xx-XX-staff-prog.po file again
   --> The sentence is reunited for each status (Displaying all terms,
       Displaying approved terms, etc.)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 6 Martin Renvoize 2023-09-11 11:00:14 UTC
Created attachment 155475 [details] [review]
Bug 34079: The phrase "Displaying [all|approved|pending|rejected] terms" was separated

This patch reunites the words for the sentence "Displaying
[all|approved|pending|rejected] terms" in order to facilitate
translating in languages that have a different syntax.

To test:
1. Install a new language

   ./misc/translator/translate install xx-XX

2. Check the xx-XX-staff-prog.po file for the sentence
   --> All the words are individual strings

3. Apply patch

4. Update the po files

   ./misc/translator/translate update xx-XX

5. Check the xx-XX-staff-prog.po file again
   --> The sentence is reunited for each status (Displaying all terms,
       Displaying approved terms, etc.)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 7 Martin Renvoize 2023-09-11 11:00:40 UTC
Simple working patch, passing QA
Comment 8 Tomás Cohen Arazi 2023-09-12 12:43:19 UTC
Pushed to master for 23.11.

Nice work everyone, thanks!
Comment 9 Fridolin Somers 2023-09-14 18:16:38 UTC
Pushed to 23.05.x for 23.05.04
Comment 10 Matt Blenkinsop 2023-09-15 10:21:44 UTC
Nice work everyone!

Pushed to oldstable for 22.11.x