[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Mason James  changed:

   What|Removed |Added

 CC||m...@kohaaloha.com

--- Comment #19 from Mason James  ---
Pushed to 16.05.x, for 16.05.15 release

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Katrin Fischer  changed:

   What|Removed |Added

   Severity|enhancement |trivial

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Katrin Fischer  changed:

   What|Removed |Added

 CC||katrin.fisc...@bsz-bw.de

--- Comment #18 from Katrin Fischer  ---
Squashed patch from 17.05 has been pushed to 16.11.x and will be in 16.11.09.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #17 from Jonathan Druart  
---
I have squashed the 3 patches for readability.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Jonathan Druart  changed:

   What|Removed |Added

 Status|Passed QA   |Pushed to Master

--- Comment #16 from Jonathan Druart  
---
Pushed to master for 17.11, thanks to everybody involved!

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marc Véron  changed:

   What|Removed |Added

 Status|Failed QA   |Passed QA

--- Comment #15 from Marc Véron  ---
Hope it's OK to set this back to PQA

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #14 from Marc Véron  ---
Created attachment 64078
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=64078=edit
Bug 18641: Followup for pendingreserves.tt (less %s)

Change as of comment #13 to reduce %s

After creating a new translation for a "language" aa-AA, we have
the following in the file aa-AA-staff-prog.po

msgid ""
"(Inclusive, default is %s days ago to %s days ahead. Set other date ranges "
"as needed.)"
msgstr ""

msgid ""
"(Inclusive, default is %s days ago to today. Set other date ranges as "
"needed.)"
msgstr ""

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Jonathan Druart  changed:

   What|Removed |Added

 Status|Passed QA   |Failed QA

--- Comment #13 from Jonathan Druart  
---
For the pendingreserves changes:

Before the patch, I got

#. %1$s:  HoldsToPullStartDate.
#. %2$s:  IF ( HoldsToPullEndDate ).
#. %3$s:  HoldsToPullEndDate.
#. %4$s:  ELSE.
#. %5$s:  END.
#: intranet-tmpl/prog/en/modules/circ/pendingreserves.tt:198
#, c-format
msgid ""
"(Inclusive, default is %s days ago to %s%s days ahead%stoday%s, set other "
"date ranges as needed. )"

now I get:

#. %1$s:  BLOCK range_msg.
#. %2$s:  HoldsToPullStartDate.
#. %3$s:  IF ( HoldsToPullEndDate ).
#. %4$s:  HoldsToPullEndDate.
#. %5$s:  ELSE.
#. %6$s:  END.
#. %7$s:  END.
#: intranet-tmpl/prog/en/modules/circ/pendingreserves.tt:197
#, fuzzy, c-format
msgid ""
"%s(Inclusive, default is %s days ago to %s%s days ahead%stoday%s, set other "
"date ranges as needed.)%s "

Seems worst...

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #12 from Marcel de Rooy  ---
(In reply to Jonathan Druart from comment #11)
> (In reply to Marcel de Rooy from comment #10)
> > (In reply to Jonathan Druart from comment #9)
> > > Marcel, what do you think?
> > 
> > Looks good to me
> 
> Yes I know :)
> But do you think the BLOCK method is acceptable, or we should stick to the
> IF/ELSE usual style?
> I am asking for the other bug reports.

In most cases we may be able to avoid BLOCK just as we do here now, but it
might not be that easy everywhere..

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #11 from Jonathan Druart  
---
(In reply to Marcel de Rooy from comment #10)
> (In reply to Jonathan Druart from comment #9)
> > Marcel, what do you think?
> 
> Looks good to me

Yes I know :)
But do you think the BLOCK method is acceptable, or we should stick to the
IF/ELSE usual style?
I am asking for the other bug reports.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #10 from Marcel de Rooy  ---
(In reply to Jonathan Druart from comment #9)
> Marcel, what do you think?

Looks good to me

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #9 from Jonathan Druart  
---
Marcel, what do you think?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #8 from Marc Véron  ---
Created attachment 63965
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63965=edit
Bug 18641: (RM-followup) for waitingreserves.tt

Code changed for waitingreserves.tt as asked for in comment #7

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Jonathan Druart  changed:

   What|Removed |Added

 CC||jonathan.dru...@bugs.koha-c
   ||ommunity.org

--- Comment #7 from Jonathan Druart  
---
And what not something more readable like

[% IF %]
  input
[% ELSE %]
  other input
[% END %]

?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marcel de Rooy  changed:

   What|Removed |Added

 CC||m.de.r...@rijksmuseum.nl
 QA Contact|testo...@bugs.koha-communit |m.de.r...@rijksmuseum.nl
   |y.org   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marcel de Rooy  changed:

   What|Removed |Added

  Attachment #63608|0   |1
is obsolete||

--- Comment #6 from Marcel de Rooy  ---
Created attachment 63928
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63928=edit
Bug 18641 - Translatability: Get rid of template directives in translations for
*reserves.tt files

Template directives should not be exposed in translation, but lines like the
following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All

This patch fixes it.

To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
  still work and display the same string as before

Signed-off-by: Josef Moravec 

Signed-off-by: Marcel de Rooy 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marcel de Rooy  changed:

   What|Removed |Added

 Status|Signed Off  |Passed QA

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marc Véron  changed:

   What|Removed |Added

  Attachment #63625|0   |1
is obsolete||

--- Comment #5 from Marc Véron  ---
Comment on attachment 63625
  --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63625
Bug 18649: Translatability: Get rid of tt directive in translation for
admin/categories.tt and onboardingstep2.tt

Sorry for the noise, I mistaked in Bug number...

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #4 from Marc Véron  ---
Created attachment 63625
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63625=edit
Bug 18649: Translatability: Get rid of tt directive in translation for
admin/categories.tt and onboardingstep2.tt

Translation tool shows
[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]
for en/modules/admin/categories.tt and
koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt

This patch fixes it.

To test:
- Apply patch
- Verify that code changes make sense
- Verify that template directive is no longer picked by translation

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Josef Moravec  changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Josef Moravec  changed:

   What|Removed |Added

  Attachment #63584|0   |1
is obsolete||

--- Comment #3 from Josef Moravec  ---
Created attachment 63608
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63608=edit
[SIGNED-OFF] Bug 18641 - Translatability: Get rid of template directives in
translations for *reserves.tt files

Template directives should not be exposed in translation, but lines like the
following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All

This patch fixes it.

To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
  still work and display the same string as before

Signed-off-by: Josef Moravec 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marc Véron  changed:

   What|Removed |Added

   Assignee|koha-b...@lists.koha-commun |ve...@veron.ch
   |ity.org |

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

Marc Véron  changed:

   What|Removed |Added

   Patch complexity|--- |String patch
 Status|NEW |Needs Signoff

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #2 from Marc Véron  ---
Created attachment 63584
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=63584=edit
Bug 18641 - Translatability: Get rid of template directives in translations for
*reserves.tt files

Template directives should not be exposed in translation, but lines like the
following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All

This patch fixes it.

To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
  still work and display the same string as before

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18641] Translatability: Get rid of template directives in translations for *reserves.tt files

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18641

--- Comment #1 from Marc Véron  ---
Template directives should not be exposed in translation, but lines like the
following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/