[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-631-g3723481

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  37234811a518f4446a5564e954df2aa34d606633 (commit)
       via  65258180761ecd0df91441f01207f18ccc10936e (commit)
      from  022e5974a3de505ee5019aaba7f1a80f42eda21c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37234811a518f4446a5564e954df2aa34d606633
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jan 29 14:27:42 2013 +0100

    Bug 9161: Followup: the -f param does not work correctly
    
    Without this patch, the -f param (for the translate script) add the
    modified line in the po file BUT comment all lines from others files.
    
    This patch concat the generated file with the previous one and merge
    them. This way produce a pretty po file with all our strings :)
    
    + Modification in LangInstaller.pm to fix a bug when the -f param was not
    given.
    
    Test plan:
    1/ Update your po file :
    cd misc/translator
    perl translate update fr-FR
    git commit -a -m"TMP PO"
    2/ Modification on 2 files:
    ie.
    catalogue/advsearch.tt:32 <h1>Advanced search Foo</h1>
    catalogue/issuehistory.tt:38 <th>Patron Bar</th>
    
    3/ Update your po file with only the first file:
    perl translate update fr-FR -f advsearch.tt
    
    4/ Edit your po file and check that only the foo string is present (or
    git diff).
    
    5/ Update your po file with only the second file:
    perl translate update fr-FR -f issuehistory
    
    6/ Edit your po file and check that 2 strings are present (or git diff).
    
    7/ Change the translation for these 2 strings and delete the fuzzy
    lines.
    
    8/ Install the first file for your language:
    perl translate install fr-FR -f advsearch.tt
    
    9/ Edit your translated file and verify the string is translated. Check
    that the issuehistory.tt file is not changed.
    
    10/ Same for issuehistory:
    perl translate install fr-FR -f issuehistory
    
    11/ stash your modification in your tt files (or reset --hard):
    git stash
    
    12/ Check in your po file that the 2 strings are commented (git diff).
    
    13/ To finish, install all template files and check that they are
    replaced correctly:
    perl translate install fr-FR
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    
    I have squashed the both follow-up patches.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 65258180761ecd0df91441f01207f18ccc10936e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 28 11:04:35 2012 +0100

    Bug 9161: Translate only specific files
    
    The previous version of tmpl_process3.pl says in the pod:
    
      -i, --input=SOURCE          Get or update strings from SOURCE file.
                                  SOURCE is a directory if -r is also specified.
    
    But is was not possible to specify one or more files.
    
    This patch allows us to give one or more specific file with the -f
    parameter.
    
    for eg.:
    
    perl tmpl_process3.pl install -i /home/koha/koha-tmpl/opac-tmpl/prog/en/modules/
        -o /home/koha/koha-tmpl/opac-tmpl/prog/fr-FR/modules/
        -s /home/koha/misc/translator/po/fr-FR-i-opac-t-prog-v-3006000.po
        -r
        -f opac-account.tt
        -f opac-main.tt
    
    You can specify:
      -f advsearch.tt => translate all files with a filename containing
      'advsearch.tt'
    or
      -f search => will translate acqui/histsearch.tt, acqui/z3950_search.tt, etc.
    
    Bug 9161: Followup: Add a -f param for the translate script
    
    Now you can directly call the translate script
    (misc/translator/translate) with the -f parameter
    
    eg.:
    ./translate install|create|update -f search.tt -f main.tt
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    
    I've squashed the 3 patches, and reported doc into 'translate' script.
    It works as advertised.
    
    Side note: It would be great to extend this functionnality in order to
    be able to apply the translation to XSL files stored outside Koha
    directories hierarchy. Useful to translate site-specific XSLs defined
    with XSLTResultsDisplay, and other sysprefs.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

-----------------------------------------------------------------------

Summary of changes:
 misc/translator/LangInstaller.pm |   39 ++++++++++----
 misc/translator/tmpl_process3.pl |  106 ++++++++++++++++++++------------------
 misc/translator/translate        |   12 +++-
 3 files changed, 91 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
main Koha release repository