Commit graph

264 commits

Author SHA1 Message Date
kb2qzv
3760ff3edd Translated (need polishing) strings file generated by tmpl_process3.pl and xgettext.pl 2004-02-25 22:45:35 +00:00
acli
0d6288178e Minor updates 2004-02-25 08:16:34 +00:00
acli
63508b81cb This should now handle spurious "strange attribute syntax" much more sanely. 2004-02-25 08:16:24 +00:00
acli
8451615142 Ugly hack to avoid screenfuls of spurious warnings about "Possible SGML
closed tag notation"
2004-02-25 06:56:42 +00:00
acli
fc4cd326b1 Try to be a little bit more helpful with "Strange attribute syntax..."
warnings. (Actually, is syntax like foo="bar"foo="bar" actually valid?)
2004-02-25 06:49:35 +00:00
acli
3c20689a73 After the previous change, the scanner will hang if the input is malformed
in a certain way, such as having a <title> but not matching </title>.
This should fix it.
2004-02-25 06:25:29 +00:00
acli
3cc7be72c7 This should make it handle commenting out of whole blocks of HTML better.
It seems to be still correct, and it is no longer complaining about syntax
errors when seeing commented-out HTML (esp. with TMPL_* directives).

Don't try to translate stuff between <title>...</title> too, the stuff in
the middle is supposed to be PCDATA.
2004-02-25 06:08:41 +00:00
acli
09b4e498e2 Bug in previous checkin, because we can't get the number of warnings from
the child.
2004-02-25 03:39:49 +00:00
acli
a399dcefad Benedict wants some message at the end that says success or failure.
It's a good idea too.
2004-02-25 03:37:27 +00:00
acli
f6fa24c75d tmpl_process3.pl did not know how to handle absolute pathnames in -i.
(Actually, xgettext.pl did not know how to handle them in the files listed
in the list of files.)

If the po file is empty (corrupted), $href->{'""'} will be undefined.
We just blindly dereferenced this null value without checking.
2004-02-24 14:20:46 +00:00
kb2qzv
b46ac460b4 reversing back to $filter = text-extract.pl. 2004-02-24 08:15:28 +00:00
kb2qzv
2ebce78b5b change $filter value so it defaults to the most recent text-extract2.pl script 2004-02-24 08:01:59 +00:00
acli
b3912abb60 Minor corrections 2004-02-24 03:21:37 +00:00
acli
d00bb9795c Minor updates 2004-02-24 00:48:18 +00:00
acli
8eca8478bb We now have a --help option.
Minor comment update

Removed forced backups and the comment about interrupting xgettext.pl
corrupting the po file, now that we seem to be detecting the situation.
2004-02-24 00:47:53 +00:00
acli
c33a411129 The timestamps in the generated PO file should make a little bit more sense
this way. In any case hard-coding a date didn't make any sense at all.
2004-02-23 22:16:08 +00:00
acli
7657c143da "Title" problem fixed in English templates 2004-02-23 21:39:21 +00:00
acli
e3ef4f78b9 -v option (undocumented) for more verbose output 2004-02-23 20:04:33 +00:00
acli
7975e2ad2e Fixed bug in "create" action reported by Benedict 2004-02-23 20:04:04 +00:00
acli
0a78568959 Bit a bit lenient on whether a file name has been set 2004-02-23 19:56:47 +00:00
acli
620eb8f436 Consistency fix 2004-02-23 19:18:54 +00:00
acli
3ed061c026 Fixed a bug which caused </script> to be not recognized as a tag 2004-02-23 18:49:56 +00:00
acli
b10a690cba Oops, "Title" is untranslatable. Need to fix the English templates some time 2004-02-23 06:48:26 +00:00
acli
e590eb3911 Update including correction 2004-02-23 06:38:51 +00:00
acli
a1080fc70b From the old translation 2004-02-23 06:28:12 +00:00
acli
300c7a7b3c Minor update 2004-02-23 06:11:53 +00:00
acli
09ab9d4769 Interim update 2004-02-23 06:05:56 +00:00
acli
b6f552e6e2 Interim update 2004-02-23 05:56:19 +00:00
acli
d03a71a5e2 More bugs that prevented some strings from being translated properly.
This time it's a trimming bug.
2004-02-23 05:51:30 +00:00
acli
dda8e7d233 Off-by-one bug 2004-02-23 04:36:56 +00:00
acli
ae4bf41171 Minor dialect correction 2004-02-23 04:29:28 +00:00
acli
dae8ab184b Bug that prevented msgid's with French characters from being translated
should now be really fixed.
2004-02-23 04:26:04 +00:00
acli
56d4a4d0ba Charset "translation" line 2004-02-23 04:19:24 +00:00
acli
ec6562b7d3 Oops, forgot to take out some debugging print statements 2004-02-23 04:02:06 +00:00
acli
3e140b7053 More interim updates 2004-02-23 04:00:38 +00:00
acli
422739c80d Interim update 2004-02-23 03:15:01 +00:00
acli
77a1d8682d Fold all consecutive whitespaces into single blanks. This avoids problems
when minor whitespace changes occur in the original templates; it also
makes the strings much easier to read (e.g., instead of "foo\n\n\t\t  bar",
xgettext.pl will now always generate "foo bar" and tmpl_process3.pl will
understand it to be the same as the original string).
2004-02-23 01:21:03 +00:00
acli
10a00d1b50 Preliminary support for "analysis" of strings with <a> tags.
Early termination of analysis if we encounter some strings, such as </h1>
or | or ||, in order to avoid extracting strings that are unnecessarily
long and which doesn't add any meaningful context.
2004-02-22 21:34:40 +00:00
acli
03695ce811 Try to relax the criteria for allowing groups of tokens without TMPL_VAR
to be combined together into one string. This seems to have the desired
effect (that "<b>foo</b> bar" type strings are now recognized in one piece).

However, "<h1>foo</h1>\nexplanation"-type things may now also be (arguably
wrongly) recognized as one piece.
2004-02-22 09:04:53 +00:00
acli
9268d4e11c The French character handling fix for tmpl_process3 was not checked in
for some reason.

Try to remove trailing ( in strings too.
2004-02-22 08:18:27 +00:00
acli
b7150bb0c3 Ugly hack to get rid of the close tag in pathetic "foo %s</h1>"-like strings 2004-02-22 07:00:16 +00:00
acli
fb1cfd3dd3 Templates with French characters were not handled properly in the install
step. This is now fixed.
2004-02-22 06:46:15 +00:00
acli
b2138f5d0d Handle the iso8859-1 charset somewhat, so that when the po file is in
either iso8859-1 or utf8, msgmerge(1) won't crap out. The code is ugly;
the conversion table is hard-coded, and in some place not very appropriate.

However, this does fix the case where a few strings containing French
characters can't be translated. As a side effect, tmpl_process3 can now
also be used for French or other languages using iso8859-1.
2004-02-22 05:18:52 +00:00
acli
5cc08f652b Updates 2004-02-20 09:32:14 +00:00
acli
0f1c4df62a Fixed bug where a <textarea...>#cdata</textarea> on one line won't be
scanned properly.
2004-02-20 07:52:32 +00:00
acli
12ce5c292f Minor updates 2004-02-20 07:25:38 +00:00
acli
3101a3b414 Minor update (after changing TmplTokenizer.pm) 2004-02-20 07:13:21 +00:00
acli
257b26d141 Partially allow combination of several TEXT tokens. It seems that this
gives better strings. (Always allowing combinations gives havoc, we
currently avoid this by allowing combination only if the first and last
tokens are both TEXT.)
2004-02-20 07:09:47 +00:00
acli
feb6e56449 Updates 2004-02-20 07:04:10 +00:00
acli
96534eac9a Preliminary checkin 2004-02-20 04:38:36 +00:00
acli
b6c37e376e Support %0.0s notation so that we can omit the %s as in Year%s for the
Chinese translation. (This won't work for all languages; ultimately the
English templates must be fixed.)
2004-02-20 04:38:02 +00:00
acli
0d4f569ff3 Try to not display like 40-line warnings too often 2004-02-20 02:48:39 +00:00
acli
793f49ec7f Escape ISO8859-1 characters. msgmerge still hates these strings, but at
least the po file merges.
2004-02-20 00:39:26 +00:00
acli
14a62cc0c4 Forgot to check for fuzzy-ness. 2004-02-19 21:28:14 +00:00
acli
8b57901d85 New scripts for translation into Chinese and other languages where English
word order is too different than the word order of the target language to
yield meaningful translations.

The new scripts use a different translation file format (namely standard
gettext-style PO files).

This seems to reasonably work (e.g., producing an empty en_GB translation
then installing seems to not corrupt the "translated" files), but it likely
will still contain some bugs. There is also little documentation, but try
to run perldoc on the .p[lm] files to see what's there. There are also some
spurious warnings (both from bugs in the new scripts and from buggy third-
party Locale::PO module).
2004-02-19 21:24:30 +00:00
acli
053bb685ab Warn against Apache #include directive 2004-02-18 06:56:19 +00:00
acli
7be0c493d9 Updated w.r.t. the text-extract2.pl filter. 2004-02-18 06:39:34 +00:00
acli
6e1a824374 The previous change was wrong. 2004-02-17 07:45:17 +00:00
acli
a9edbfe34c Allow trim to return the trimmed whitespace if the caller wants them. 2004-02-17 07:26:29 +00:00
acli
b318d2b8e3 Don't extract strings from the VALUE attributes of RADIO type INPUT fields;
these aren't translatable.
2004-02-17 06:30:38 +00:00
acli
4d2463c34a Insert the filename of the token into the TmplToken object too 2004-02-17 05:42:27 +00:00
acli
39dc31c2c9 Converted TmplTokenizer into a class. Everything still seems ok, but it is
not tested thoroughly.
2004-02-17 05:07:04 +00:00
acli
ae87eee049 Still more bugfixes for my own bugs.
$readahead is now an array @readahead which can contain TmplToken objects,
so "ungetting" tokens should not disturb the line number counter any more.
2004-02-17 03:17:48 +00:00
acli
c1e51c54d5 Fixed more bugs during the modularization 2004-02-17 03:02:39 +00:00
acli
09c348bd9c Further breaking up of the TmplTokenizer module.
A couple of minor fixes.
2004-02-17 02:45:27 +00:00
acli
2f7192689a Avoid direct accessing of variables inside the module 2004-02-16 23:50:56 +00:00
acli
0b6030aecd Some functions should not be in the module; these are now removed. 2004-02-16 23:46:34 +00:00
acli
59d2e35180 Pulled the tokenizer out into a module. Hope this has been done right. 2004-02-16 23:42:57 +00:00
acli
de8d0930ee Minor factoring of construction of warning messages. 2004-02-16 22:50:34 +00:00
acli
2a9be2b2e6 Don't bother warning about TMPL_VAR if the key is onclick, onblur, etc.
We don't know how to warn/what to suggest, & that will only confuse people
2004-02-14 09:50:11 +00:00
acli
1d45c47c02 Fix spurious warnings if attribute is in the form foo="bar"</TMPL_IF> 2004-02-14 09:41:28 +00:00
acli
f7b649f41b Make a reasonable suggestion for ESCAPE= if we warn about lack of it 2004-02-14 09:33:09 +00:00
acli
3fd0a52e0a Fixed spurious warning about unescaped < inside cdata 2004-02-14 09:23:34 +00:00
acli
050e1995d9 Minor change to make the "closed start tag" warning more understandable 2004-02-14 09:10:20 +00:00
acli
ce2189ef37 Don't complain about strange attribute syntax if what we see is a
reasonable templating control flow directive (if, else, unless).
2004-02-14 08:49:21 +00:00
acli
524a76f1b3 Have to make it know what "closed start tag" notation is; other it spews
out more than a screenful or text for an "unknown token" when such notation
is seen
2004-02-14 08:03:02 +00:00
acli
1b95b1698e Fixed problem recognizing tags in the form of <foo ... bar=<!-- TMPL_VAR ... >> 2004-02-14 07:49:37 +00:00
acli
2afa50bdda Don't extract TMPL_VAR's as if they were translatable 2004-02-14 07:13:09 +00:00
acli
10bec90dea Don't complain about </TMPL_IF> or </TMPL_LOOP> being strange attribute
syntax; they are fine.

The way TMPL_VAR is warned probably makes more sense now.
2004-02-14 07:07:36 +00:00
acli
0e2ff58b66 This should be still more correct regarding when to warn about TMPL_VAR
in attributes
2004-02-14 06:16:36 +00:00
acli
16992ec3f9 More correct version of previous change 2004-02-14 05:50:55 +00:00
acli
93740ec7ba Make sure that if an attribute contains < or >, a warning is given; these
warnings aren't pedantic because (1) if it's a templating directive, it
might expand into something containing a real < and/or >, and (2) if it
contains >, the browser will close the current tag, and (3) if it contains
< and the browser knows what "SGML closed start tags" are (e.g., Mozilla),
the browser will also close the current tag.
2004-02-14 05:46:38 +00:00
acli
a2f07d16f0 Hmm. I didn't know there can be whitespace before and/or after = in
attributes...
2004-02-14 05:35:04 +00:00
acli
a10bb7062a Handle leading or trailing &nbsp;'s as leading or trailing spaces.
Make sure they are all trimmed off.

$re_end_entity is now used (by the above); there are &nbsp's (no ;)
in our templates.
2004-02-13 03:49:26 +00:00
acli
b87b492773 The fixed search.marc/search.tmpl (nothing between <textarea></textarea>)
caused an eof token to be incorrectly generated by next_token(). This
is now fixed.
2004-02-13 02:42:06 +00:00
acli
5af84e39db Don't mindlessly spew out 40 lines of text in a warning message if we get
too confused.  Just say we are too confused.
2004-02-13 01:48:58 +00:00
acli
412847fe93 This way of reporting line numbers should make more sense,
esp. for pathetic cases like search.marc/search.tmpl
(missing closing " for an attribute)
2004-02-13 01:27:03 +00:00
acli
1c3cb74b82 Display something useful if the user doesn't specify -f 2004-02-13 01:20:03 +00:00
acli
1f128d7381 Don't issue warnings for unquoted attributes containing [^-\.a-zA-Z0-9]
unless --pedantic-warnings is given. These don't seem to cause any trouble,
even in Mozilla's standards compliant mode.
2004-02-13 01:14:18 +00:00
acli
1addd34bb1 Paul's problem #1 is now fixed: Bug in regular expression $re_directive.
Put my "grander plan" :-) in the comments
2004-02-13 01:03:18 +00:00
acli
250d1fcefc Don't extract purely-numeric strings like "1" either 2004-02-13 00:48:52 +00:00
acli
a49634cb34 Seems like I wasn't careful enough recognizing unknown tokens. Incomplete
tags like "<b foo" at the end of the file seems to be discarded silently by
Mozilla, even in quirks mode. We now display a warning for these (in case
these ever come up by accident).
2004-02-13 00:42:52 +00:00
acli
bed495ed3e Minor wording rewrite in warning 2004-02-12 18:25:43 +00:00
acli
906bfbc3d6 Warn about unquoted attribute values containing [^-\.a-zA-Z0-9] 2004-02-12 18:19:17 +00:00
acli
21403fd5cc extract_attributes now knows what XML-style self-closing tags are 2004-02-12 17:58:24 +00:00
acli
0a9cd4aba1 Warn about <<Prev 2004-02-12 17:44:59 +00:00
acli
33a4d5705a It now knows what << Prev is, but it may still be confused by other kinds
of tag lookalikes
2004-02-12 17:38:42 +00:00
acli
5affdbf4e7 Handle attributes which are TMPL_VAR's better. It was choking on
systempreferences.tmpl.
2004-02-12 09:38:20 +00:00
acli
2f928c4e75 Don't extract strings in hidden values 2004-02-12 09:26:54 +00:00
tipaul
58951e551f new feature : stocktaking/inventory.
Look in reports menu
(no DB changes)
2004-02-12 09:16:18 +00:00
tipaul
f247a6c8db ignoring .tmpl that are hidden files (.somthing.tmpl). hidden files are generated by tools like emacs 2004-02-12 09:13:40 +00:00
acli
0be46ba475 This should be good enough to replace text-extract.pl, but some real
testing is needed.
2004-02-12 09:02:39 +00:00
acli
7d244a0b70 This is an experimental filter, based on simple scanning, that *should*
(ultimately) work better than the standard filter based on real parsing
of the .tmpl files.
2004-02-12 08:55:14 +00:00
tipaul
af08d677c5 synch'ing 2.0.0 branch (RC4 tag) and head 2004-02-11 08:42:01 +00:00
acli
6f472dbf7b exit(-1) after usage() is not needed 2004-02-10 09:42:18 +00:00
acli
c8a9c26150 Minor correction in help text
This handling for --help works too, and is less wordy
2004-02-10 09:40:21 +00:00
acli
c195908744 Arrays are always defined. We should check its length instead. 2004-02-10 09:36:44 +00:00
acli
c1b5d94e20 Minor spelling correction.
Don't proceed if the user specified an unknown option.
2004-02-09 23:34:08 +00:00
tipaul
1e93add16b templates modified : ALL <TMPL_* XX> have been replaced by <!-- TMPL_* XX -->, because it's strict html compliant, and HTML::TreeBuilder deals better with this form. 2003-12-09 10:26:51 +00:00
tipaul
bc9f67122d some new trips : non translated strings are marked with "*****" to be easy to see.
french opac updated. works fine :-)
2003-12-08 16:26:06 +00:00
tipaul
8d695ff6d0 removing : & * at end of strings 2003-12-08 13:36:56 +00:00
tipaul
bf161df7e5 strings for opac in french 2003-12-08 13:03:49 +00:00
tipaul
2d5668bab5 improving what's discarded : script & stylesheet 2003-12-08 13:03:28 +00:00
tipaul
d74459f35a translator tool. see translator_doc.txt 2003-12-05 16:53:46 +00:00