[Koha-cvs] CVS: koha/misc/translator Makefile,1.1,1.2 translator_doc.html,1.2,1.3 translator_doc.txt,1.6,1.7 xgettext.pl,1.13,1.14

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/misc/translator

Modified Files:
        Makefile translator_doc.html translator_doc.txt xgettext.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile    30 Dec 2004 06:48:19 -0000      1.1
--- Makefile    1 Mar 2005 13:41:28 -0000       1.2
***************
*** 2,4 ****
  
  %.txt: %.html
!       LANG=C w3m $< > $@
--- 2,7 ----
  
  %.txt: %.html
!       set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td 
nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|LANG=C w3m -T 
text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
! 
! clean:
!       rm translator_doc.txt

Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** translator_doc.html 30 Dec 2004 06:58:19 -0000      1.2
--- translator_doc.html 1 Mar 2005 13:41:28 -0000       1.3
***************
*** 4,17 ****
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts:
  
! <ul>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ul>
!     <li>create a file with all the "translatable strings" in all files in a 
directory (& its subdirectories)
!     <li>update an existing translation file.
!     <li>rebuild translated templates from english & translation file.
      </ul>
  </ul>
--- 4,18 ----
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts
! (with a number of associated perl module files):
  
! <ol>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script; and
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ol type=a>
!     <li>create a file with all the "translatable strings" in all files in a 
directory (& its subdirectories),
!     <li>update an existing translation file, and
!     <li>rebuild translated templates from English & translation file.
      </ul>
  </ul>
***************
*** 28,32 ****
      (assuming your current directory is this directory, i.e., 
misc/translator):
      <blockquote>
! ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
--- 29,33 ----
      (assuming your current directory is this directory, i.e., 
misc/translator):
      <blockquote>
! ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
***************
*** 34,45 ****
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to 
appear.
!     The use of relative paths for the English templates is recommended
!     but is not necessary;
!     it makes the resulting PO files somewhat easier to read.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po 
-r
      </blockquote>
      <p>
--- 35,48 ----
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to 
appear.
!     The use of relative paths for the English templates is recommended;
!     it makes the resulting PO files slightly shorter
!     and more usable in a team environment.
!     Absolute paths are certainly fine,
!     and might be better if there is only one translator for your language.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
      <p>
***************
*** 51,65 ****
  
  <p>
! If something changes in English version:
  <ol>
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process.pl update -i 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your new css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed
--- 54,68 ----
  
  <p>
! If something changes in the English version:
  <ol>
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your newly updated css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s 
po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** translator_doc.txt  3 Jan 2005 16:30:13 -0000       1.6
--- translator_doc.txt  1 Mar 2005 13:41:28 -0000       1.7
***************
*** 3,15 ****
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts:
  
!   * xgettext.pl, that extracts the texts in a template, and which is called by
!     the script
!   * tmpl_process3.tmpl, which can do 3 things:
!       + create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories)
!       + update an existing translation file.
!       + rebuild translated templates from english & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
--- 3,15 ----
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts (with a number of associated perl module files):
  
!  1. xgettext.pl, that extracts the texts in a template, and which is called by
!     the script; and
!  2. tmpl_process3.tmpl, which can do 3 things:
!      a. create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories),
!      b. update an existing translation file, and
!      c. rebuild translated templates from English & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
***************
*** 21,38 ****
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
!    
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
css_opac_fr_FR.po -r
!    
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is 
where
      you want the generated PO file to appear. The use of relative paths for 
the
!     English templates is recommended but is not necessary; it makes the
!     resulting PO files somewhat easier to read.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ 
-o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
!    
      (In the above example, 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
--- 21,40 ----
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
! 
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
po/css_opac_fr_FR.po -r
! 
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is 
where
      you want the generated PO file to appear. The use of relative paths for 
the
!     English templates is recommended; it makes the resulting PO files slightly
!     shorter and more usable in a team environment. Absolute paths are 
certainly
!     fine, and might be better if there is only one translator for your
!     language.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ 
-o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s 
po/css_opac_fr_FR.po -r
! 
      (In the above example, 
/home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
***************
*** 40,62 ****
      tmpl_process3.pl install).
  
! If something changes in English version:
  
   1. Update your translation file:
!    
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s 
po/css_opac_fr_FR.po -r
!    
!  2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
!     "fuzzy" and strings that are not translated.
   3. Create your translated templates:
-    
-         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o 
../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
-    
-  4. Copy new images/css files in your new directory if needed
-  
- REBUILD ALL
- ===========
- The rebuild_lang.sh script can be used to rebuild all languages officially 
supported in 2.2 release, when needed.
- Useful for developpers, probably useless for all end-users.
  
  
  WEAKNESSES
--- 42,58 ----
      tmpl_process3.pl install).
  
! If something changes in the English version:
  
   1. Update your translation file:
! 
!         ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s 
po/css_opac_fr_FR.po -r
! 
!  2. Translate your newly updated css_opac_fr_FR.po file. Look for strings
!     marked as "fuzzy" and strings that are not translated.
   3. Create your translated templates:
  
+         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ 
-o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s 
po/css_opac_fr_FR.po -r
+ 
+  4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
***************
*** 71,73 ****
    * Paul Poulain (paul.poulain address@hidden free.fr) & Jerome Vizcaino 
(vizcainj address@hidden
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli address@hidden ada.dhs.org)
\ No newline at end of file
--- 67,70 ----
    * Paul Poulain (paul.poulain address@hidden free.fr) & Jerome Vizcaino 
(vizcainj address@hidden
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli address@hidden ada.dhs.org)
! 

Index: xgettext.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** xgettext.pl 30 Dec 2004 06:48:20 -0000      1.13
--- xgettext.pl 1 Mar 2005 13:41:28 -0000       1.14
***************
*** 462,468 ****
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! It sometimes generates strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.  The cause of this is not yet known.
  
  =cut
--- 462,469 ----
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! If a Javascript string has leading spaces, it will
! generate strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.
  
  =cut