[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog GNUmakef...
|
From: |
Yavor Doganov |
|
Subject: |
trans-coord/gnun/server/gnun ChangeLog GNUmakef... |
|
Date: |
Tue, 10 Nov 2009 15:16:00 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Yavor Doganov <yavor> 09/11/10 15:16:00
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile NEWS gnun-validate-html
gnun-validate-html.in
gnun/server/gnun/doc: gnun.texi web-trans.texi
Log message:
Support for the new split template files.
* gnun-validate-html.in: Expand #include directives in a loop to
handle nasty nested ones properly.
* GNUmakefile (localized-includes): Add the new server templates
head-include-1, head-include-2, body-include-1 and body-include-2.
(template-files): Remove banner. Add head-include-2,
body-include-1 and body-include-2.
(verbatim-templates): Add all new non-gettextized templates.
* doc/gnun.texi (Main Variables) <TEMPLATE_LINGUAS>:
(sync): Update the list of template files.
(New Translation): Replace the example for `banner'.
(Webmaster Tips): Substitute `header.html' with
`head-include-1.html'; the encoding is declared there now.
* doc/web-trans.texi (Submitting as PO, New Team): Complete list
of template files.
(SSI): Add new items for each new template, explain their purpose.
(CSS, topbanner): Correct the filename that imports the CSS.
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/web-trans.texi?cvsroot=trans-coord&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- ChangeLog 30 Sep 2009 07:11:15 -0000 1.168
+++ ChangeLog 10 Nov 2009 15:16:00 -0000 1.169
@@ -1,3 +1,24 @@
+2009-11-10 Yavor Doganov <address@hidden>
+
+ Support for the new split template files.
+ * gnun-validate-html.in: Expand #include directives in a loop to
+ handle nasty nested ones properly.
+ * GNUmakefile (localized-includes): Add the new server templates
+ head-include-1, head-include-2, body-include-1 and body-include-2.
+ (template-files): Remove banner. Add head-include-2,
+ body-include-1 and body-include-2.
+ (verbatim-templates): Add all new non-gettextized templates.
+ * doc/gnun.texi (Main Variables) <TEMPLATE_LINGUAS>:
+ (sync): Update the list of template files.
+ (New Translation): Replace the example for `banner'.
+ (Webmaster Tips): Substitute `header.html' with
+ `head-include-1.html'; the encoding is declared there now.
+ * doc/web-trans.texi (Submitting as PO, New Team): Complete list
+ of template files.
+ (SSI): Add new items for each new template, explain their purpose.
+ (CSS, topbanner): Correct the filename that imports the CSS.
+ * NEWS: Update.
+
2009-09-30 Yavor Doganov <address@hidden>
* GNUmakefile (vcs): Fix conditional.
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- GNUmakefile 30 Sep 2009 07:11:15 -0000 1.72
+++ GNUmakefile 10 Nov 2009 15:16:00 -0000 1.73
@@ -77,13 +77,17 @@
# FIXME: footer-short and footer-min are remnants from the old-new
# design; they should go at some point.
-localized-includes := header banner footer footer-short footer-min
+localized-includes := header head-include-1 head-include-2 banner \
+ body-include-1 body-include-2 footer \
+ footer-short footer-min
include gnun.mk
### Special variables for the `www' master templates ###
template-dir := $(rootdir)/server
-template-files := banner \
+template-files := head-include-2 \
+ body-include-1 \
+ body-include-2 \
footer-text
template-translated-base := $(addprefix $(template-dir)/,$(template-files))
template-pots := $(addsuffix .pot, \
@@ -615,19 +619,22 @@
abs-files-to-sync := $(subst $(rootdir)/,,$(files-to-sync))
# Templates that are not gettextized, but are necessary to reside in
# trans-coord for HTML validation at build time.
-verbatim-templates := $(addprefix server/,header.html footer.html \
- header.af.html footer.af.html \
- header.ar.html footer.ar.html \
- header.bg.html footer.bg.html \
- header.ca.html footer.ca.html \
- header.es.html footer.es.html \
- header.fr.html footer.fr.html \
- header.it.html footer.it.html \
- header.pt.html footer.pt.html \
- header.pt-br.html footer.pt-br.html \
- header.ru.html footer.ru.html \
- header.tr.html footer.tr.html \
- header.zh-cn.html footer.zh-cn.html \
+verbatim-templates := $(addprefix server/, \
+ header.html head-include-1.html banner.html footer.html \
+ header.af.html head-include-1.af.html banner.af.html footer.af.html \
+ header.ar.html head-include-1.ar.html banner.ar.html footer.ar.html \
+ header.bg.html head-include-1.bg.html banner.bg.html footer.bg.html \
+ header.ca.html head-include-1.ca.html banner.ca.html footer.ca.html \
+ header.es.html head-include-1.es.html banner.es.html footer.es.html \
+ header.fr.html head-include-1.fr.html banner.fr.html footer.fr.html \
+ header.it.html head-include-1.it.html banner.it.html footer.it.html \
+ header.pt.html head-include-1.pt.html banner.pt.html footer.pt.html \
+ header.pt-br.html head-include-1.pt-br.html banner.pt-br.html \
+ footer.pt-br.html \
+ header.ru.html head-include-1.ru.html banner.ru.html footer.ru.html \
+ header.tr.html head-include-1.tr.html banner.tr.html footer.tr.html \
+ header.zh-cn.html head-include-1.zh-cn.html banner.zh-cn.html \
+ footer.zh-cn.html \
whatsnew.html whatsnew.include)
.PHONY: sync
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- NEWS 28 Sep 2009 12:10:21 -0000 1.21
+++ NEWS 10 Nov 2009 15:16:00 -0000 1.22
@@ -22,6 +22,14 @@
and Subversion (in that order). This is useful for other sites
that are maintained with Subversion, such as windows7sins.org.
+** Bugs fixed in 0.4.
+
+*** `gnun-validate-html' properly supports nested SSI directives.
+ As a bonus, it can validate now plain XHTML files with no SSI
+ #include statements.
+
+*** Adapt to the new layout of the gnu.org server templates.
+
* Changes in GNUnited Nations 0.3.1 (2009-08-02)
** GNUmakefile.team supports GNU Bzr repositories.
Index: gnun-validate-html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnun-validate-html 3 Aug 2009 13:34:47 -0000 1.9
+++ gnun-validate-html 10 Nov 2009 15:16:00 -0000 1.10
@@ -68,14 +68,22 @@
# Create two tempfiles and mark them for deletion on exit.
TMP1=`mktemp -t gnun.1.XXXXXX`
TMP2=`mktemp -t gnun.2.XXXXXX`
-trap "rm -f $TMP1 $TMP2" EXIT
+TMP3=`mktemp -t gnun.3.XXXXXX`
+trap "rm -f $TMP1 $TMP2 $TMP3" EXIT
# Expand input file's #include directives and save the result in
# $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" \
- | m4 -P -EE -I $ROOT > $TMP1
+cat $1 > $TMP1
-# Execute xmllint on $TMP1 and save it's output to $TMP2.
+while true; do
+ grep --quiet '<!--#include virtual' $TMP1 || break
+ sed --in-place \
+ "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" $TMP1
+ m4 -P -EE -I $ROOT $TMP1 > $TMP3
+ cp $TMP3 $TMP1
+done
+
+# Execute xmllint on $TMP1 and save its output to $TMP2.
set +o pipefail
set +e
cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
Index: gnun-validate-html.in
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnun-validate-html.in 3 Aug 2009 13:34:47 -0000 1.7
+++ gnun-validate-html.in 10 Nov 2009 15:16:00 -0000 1.8
@@ -68,14 +68,22 @@
# Create two tempfiles and mark them for deletion on exit.
TMP1=`mktemp -t gnun.1.XXXXXX`
TMP2=`mktemp -t gnun.2.XXXXXX`
-trap "rm -f $TMP1 $TMP2" EXIT
+TMP3=`mktemp -t gnun.3.XXXXXX`
+trap "rm -f $TMP1 $TMP2 $TMP3" EXIT
# Expand input file's #include directives and save the result in
# $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" \
- | @M4@ -P -EE -I $ROOT > $TMP1
+cat $1 > $TMP1
-# Execute xmllint on $TMP1 and save it's output to $TMP2.
+while true; do
+ grep --quiet '<!--#include virtual' $TMP1 || break
+ sed --in-place \
+ "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/m4_include(\`\1')/g" $TMP1
+ @M4@ -P -EE -I $ROOT $TMP1 > $TMP3
+ cp $TMP3 $TMP1
+done
+
+# Execute xmllint on $TMP1 and save its output to $TMP2.
set +o pipefail
set +e
cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- doc/gnun.texi 28 Sep 2009 12:10:23 -0000 1.13
+++ doc/gnun.texi 10 Nov 2009 15:16:00 -0000 1.14
@@ -616,14 +616,14 @@
same email message again if the file is still present in the
@code{files-to-sync} variable during a subsequent invocation.
-In addition, @code{sync} synchronizes all ``verbatim'' server
-templates that are not under @acronym{GNUN}'s control, such as
address@hidden/header.html}, @file{server/footer.html} and their
-translations, as defined in the @code{verbatim-templates} variable.
-This is important, as these files may change in the master repository,
-while the validation of the html files in the development repository
-will be performed with the old templates expanded, thus making this
-specific test more or less bogus.
+In addition, @code{sync} synchronizes all ``verbatim'' server templates
+that are not under @acronym{GNUN}'s control, such as
address@hidden/header.html}, @file{server/banner.html},
address@hidden/footer.html} and their translations, as defined in the
address@hidden variable. This is important, as these files
+may change in the master repository, while the validation of the html
+files in the development repository will be performed with the old
+templates expanded, thus making this specific test more or less bogus.
@code{VCS=always} has no effect on this target, as well as
@code{VALIDATE}.
@@ -731,11 +731,14 @@
@item TEMPLATE_LINGUAS
A space-separated list with languages. Add here your language code
@emph{if and only if} you have all the @acronym{SSI} templates
-translated, and have already committed in the repository both
address@hidden/po/address@hidden and
address@hidden/po/address@hidden, as well as the templates
+translated, and have already committed in the repository all these
+template files: @file{server/@/po/@/address@hidden,
address@hidden/@/po/@/address@hidden,
address@hidden/@/po/@/address@hidden,
address@hidden/@/po/@/address@hidden, as well as the templates
that are not under @acronym{GNUN}'s control and are translated manually,
-like @file{server/address@hidden and
+like @file{server/address@hidden,
address@hidden/address@hidden and
@file{server/address@hidden
@cindex HOME_LINGUAS
@@ -900,7 +903,7 @@
@table @samp
@item Project-Id-Version
Add here the filename of the original article, without the
-sub-directory, like ``banner.html'' or ``free-sw.html''.
+sub-directory, like ``body-include-1.html'' or ``free-sw.html''.
@item POT-Creation-Date
Do not edit this field, it is already set when the POT is created.
@@ -1552,8 +1555,8 @@
This is required because the English text in the articles serves as a
replacement of the translation when the latter is not complete. So if
you use, say, the character @'e (e-acute) directly in an English
-page---which is UTF-8 as declared in @file{server/header.html}, it
-will appear broken on those translated pages who use a different
+page---which is UTF-8 as declared in @file{server/head-include-1.html},
+it will appear broken on those translated pages who use a different
encoding. This specific advice is pretty much mandatory---the build
fails if the original article contains such characters---but we are
ready to fix any errors a webmaster makes.
Index: doc/web-trans.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/web-trans.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/web-trans.texi 28 Jul 2009 18:04:25 -0000 1.7
+++ doc/web-trans.texi 10 Nov 2009 15:16:00 -0000 1.8
@@ -5,7 +5,7 @@
@settitle GNU Web Translators Manual
@c FIXME: Would be nice to have it in the format `%:b %:d, %:y', but
@c in English.
address@hidden lastupdate 28.07.2009
address@hidden lastupdate 10.11.2009
@afourpaper
@c %**end of header
@@ -254,9 +254,11 @@
available as PO files. These templates are short, and translating them
shouldn't take much time. If the language code is present in the
@code{TEMPLATE_LINGUAS} variable at @file{server/gnun/gnun.mk}, then you
-don't have to do anything. If not, the required files are
address@hidden/po/address@hidden and
address@hidden/po/address@hidden can translate and
+don't have to do anything. If it is not, the required files are
address@hidden/@/po/@/address@hidden,
address@hidden/@/po/@/address@hidden,
address@hidden/@/po/@/address@hidden and
address@hidden/@/po/@/address@hidden can translate and
submit them in the usual way, together with the translation of the
essay.
@@ -421,10 +423,12 @@
recommended in the beginning of this section), check if your language
code is present in the variable @code{TEMPLATE_LINGUAS} at
@file{server/gnun/gnun.mk}. If it is not, the first thing to do is to
-translate and submit to @email{web-translators@@gnu.org} the files
address@hidden/po/address@hidden and
address@hidden/po/address@hidden, together with your first
-message stating that you would like to establish a new team. @xref{New
+translate and submit to @email{web-translators@@gnu.org} the following
+files (all in the @file{server/po/} directory):
address@hidden@var{lang}.po},
address@hidden@var{lang}.po}, @address@hidden
+and @address@hidden, together with your first message
+stating that you would like to establish a new team. @xref{New
Translation, , , gnun, The GNUnited Nations Manual}.
@itemize @minus
@@ -1190,12 +1194,21 @@
@table @file
@item server/banner.html
+This file contains only @code{#include} directives, so the
+``translation'' should be identical, with filenames modified to have the
address@hidden extension.
+
address@hidden server/body-include-1.html
+Contains the top menu with useful ``skip to'' links.
+
address@hidden server/body-include-2.html
This is the file containing the menus, the FSF widget, and any visible
announcements made from time to time. If a string gets ``fuzzy'' or
``new'' here, it will appear in English in all translations, until
address@hidden/po/address@hidden is updated. Note that some
-validation errors originate from an error in
address@hidden/address@hidden
address@hidden/po/address@hidden is updated. Note that
+some validation errors originate from an error in
address@hidden/address@hidden or some other template
+file.
@item server/footer-text.html
This is a very short file currently containing the ``back to top'' link.
@@ -1214,6 +1227,18 @@
dir="rtl">
@end example
address@hidden server/head-include-1.html
+This file (included from @file{server/header.html}) is very important:
+the encoding is defined here. Note that it is applicable for all
+translations, so it is not possible to have different articles in
+different encodings. Even if a specific PO file is deliberately encoded
+in another encoding, the generated HTML will contain the encoding
+declared in the @code{<meta>} element at
address@hidden/address@hidden, so browsers will obey it.
+
address@hidden server/head-include-2.html
+Imports the standard CSS, which can be overriden. @xref{CSS}.
+
@item server/footer.html
This is a very short and simple file (at least at the time of writing),
containing another @code{#include} directive. It is maintained
@@ -1257,15 +1282,18 @@
@command{grep} to check this.
@end table
-The files @file{header.html}, @file{banner.html}, @file{footer.html} and
address@hidden in the @file{server} sub-directory are what
-webmasters call ``the server templates''. These files are included in
-almost every article, translated or not. They are somewhat important,
-as an error made in translating them propagates everywhere. The server
-templates, the homepages, and whatsnew (a.k.a. ``GNU News'') are being
-rebuilt by @acronym{GNUN} whenever there is a change in the original
-English files; the @code{GRACE} variable has no effect for them.
address@hidden Variables, , , gnun, The GNUnited Nations Manual}.
+The files @file{header.html}, @file{head-include-1.html},
address@hidden, @file{banner.html},
address@hidden, @file{body-include-2.html},
address@hidden and @file{footer-text.html} in the @file{server}
+sub-directory are what webmasters call ``the server templates''. These
+files are included in almost every article, translated or not. They are
+somewhat important, as an error made in translating them propagates
+everywhere. The server templates, the homepages, and whatsnew
+(a.k.a. ``GNU News'') are being rebuilt by @acronym{GNUN} whenever there
+is a change in the original English files; the @code{GRACE} variable has
+no effect for them. @xref{Runtime Variables, , , gnun, The GNUnited
+Nations Manual}.
@node CSS
@section How To Use Custom CSS
@@ -1276,7 +1304,7 @@
languages have much longer expressions, and that is natural. To include
your own CSS, create a file @address@hidden and add it
@emph{after} the original @file{style.css} in your
address@hidden/po/address@hidden, i.e.
address@hidden/po/address@hidden, i.e.
@example
# type: style
@@ -1343,7 +1371,7 @@
@item
If not done already for other reasons, update
address@hidden@var{lang}.po} to include the language specific
address@hidden@var{lang}.po} to include the language specific
@address@hidden @xref{CSS}.
@end enumerate
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun ChangeLog GNUmakef...,
Yavor Doganov <=