[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile NEWS C...
|
From: |
Pavel Kharitonov |
|
Subject: |
trans-coord/gnun/server/gnun GNUmakefile NEWS C... |
|
Date: |
Mon, 26 Nov 2012 14:13:14 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 12/11/26 14:13:13
Modified files:
gnun/server/gnun: GNUmakefile NEWS ChangeLog
gnun/server/gnun/doc: gnun.texi web-trans.texi
Log message:
Eliminate hardcoded home and templates.
* GNUmakefile (template-files, home-lang, home-translated):
Remove variables.
(template-translated-base, template-pots): Remove `template-files'.
(all, no-grace-items, substitute-localized-urls)
(vcs-add-always): Remove `home-translated' as a dependency.
(validate-all): Don't validate `home-translated'.
(template-rules, template-dir-rules, rules for homepages):
Remove functions and rules.
* doc/gnun.texi (Runtime Variables, Main Variables, GNU News):
Eliminate references to homepages, `HOME_LINGUAS',
`template-files'; use `extra-templates' as a reference
to the list of templates.
(Main Variables) <ROOT>: Mention `home.html'.
(GNU News): Don't say gnusflashes are used in homepages.
(Localised URLs): Fix a typo "s,homepage,directory,".
* doc/web-trans.texi (New Team): Replace `whatsnews.html' with
more actual `planetfeeds.html'.
(Commits): Replace `HOME_LINGUAS' in the example with
`FUZZY_DIFF_LINGUAS'.
(SSI): Omit `gnuflashes.include' and `whatsnew.include'.
Document `server/skip-translations.html' and `server/top-addendum.html'.
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.307&r2=1.308
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/web-trans.texi?cvsroot=trans-coord&r1=1.35&r2=1.36
Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- GNUmakefile 26 Nov 2012 06:45:23 -0000 1.144
+++ GNUmakefile 26 Nov 2012 14:13:04 -0000 1.145
@@ -121,19 +121,12 @@
### Special variables for the `www' master templates ###
template-dir := $(rootdir)/server
-template-files := head-include-2 \
- body-include-1 \
- body-include-2 \
- footer-text \
- outdated
-template-translated-base := $(addprefix $(template-dir)/,$(template-files))
-template-translated-base += $(addprefix $(rootdir)/,$(extra-templates) \
+template-translated-base := $(addprefix $(rootdir)/,$(extra-templates) \
$(optional-templates))
# Guard with a conditional to avoid silent `ls' failures during
# variables' computation when only the package is being built.
ifneq ($(_have-Makefile),yes)
template-pots := $(addsuffix .pot, \
- $(addprefix $(template-dir)/po/,$(template-files)) \
$(foreach template,$(extra-templates), \
$(dir $(addprefix $(rootdir)/, \
$(template)))po/$(notdir $(template)))) \
@@ -163,15 +156,6 @@
endif
### End of variables declaration (whatsnew) ###
-### Special variables for the home pages ###
-home-lang = $(rootdir)/home.$(1).html
-home-translated := $(foreach h-lang,$(HOME_LINGUAS), \
- $(call home-lang,$(h-lang)))
-ifeq ($(VERBOSE),yes)
-$(info home-translated = $(home-translated))
-endif
-### End of variables declaration (homepages) ###
-
find-po = $(wildcard $(1).*.po)
### Special variables for `no-grace' items ###
no-grace-items := $(no-grace-articles)
@@ -205,12 +189,12 @@
include Makefile
else
all: compendia $(template-pots) $(template-translated) $(gnunews) \
- $(home-translated) $(ALL_POTS) \
+ $(ALL_POTS) \
$(articles-translated) $(patsubst %.pot,%.translist,$(ALL_POTS)) \
final-stage
endif
no-grace-items: $(template-pots) $(template-translated) \
- $(home-translated) $(no-grace-translated) \
+ $(no-grace-translated) \
$(patsubst %.pot,%.translist,$(no-grace-pot)) final-stage
.PHONY: substitute-localized-urls update-localized-URLs final-stage
@@ -224,7 +208,7 @@
-include localized-urls.mk
# Substitute and unsubstitute localised URLs in translations.
-substitute-localized-urls: $(home-translated) $(articles-translated)
+substitute-localized-urls: $(articles-translated)
$(foreach source, ${localized-url-sources}, \
langs=$$(echo ${rootdir}/${source}.*.html | \
$(SED) 's%${rootdir}/${source}\.%%g;s/\.html//g;s/\*//'); \
@@ -745,60 +729,12 @@
$$(addfile)
endef
-$(foreach h-lang,$(HOME_LINGUAS),$(eval $(call generic-var,$(h-lang))))
+$(foreach h-lang,$(TEMPLATE_LINGUAS),$(eval $(call generic-var,$(h-lang))))
$(foreach po-base,$(ALL_POS_BASE), \
$(eval $(call generic-var,$(subst .,,$(suffix $(po-base))))))
$(foreach g-lang,$(sort $(GENERIC_LINGUAS)), \
$(eval $(call generic-rules,$(g-lang))))
-### Specific rules for the templates ###
-define template-rules
-.PRECIOUS: $(template-dir)/po/$(1).$(2).po
-$(template-dir)/po/$(1).$(2).po: $(template-dir)/po/$(1).pot $(MASTER-$(2))
-# If the POT is new, it is natural that teams cannot translate it at
-# once. Create a copy for every PO file in TEMPLATE_LINGUAS so that
-# the build can continue without errors.
-# FIXME: Check if this approach works with gettext >> 0.14.
- [ -f $$@ ] || (cp $$< $$@ ; $(VCSSKIP) $(vcs) add $$@)
-# Since we handle the case when new templates are added by webmasters,
-# it is OK to ignore errors from these, at least until fencepost has
-# an old version of gettext. The HTML validation errors should be
-# clear even if the bug is in the server templates translations.
- -PO=$$@ ; $(check-po)
- $(call update-po,$$@,$$<,$(2))
-
-$(template-dir)/$(1).$(2).html: $(template-dir)/$(1).html \
- $(template-dir)/po/$(1).$(2).po
-# If the PO file is invalid and is not fixed within the next GNUN
-# build, touch the proper prerequisite to trigger another rebuild.
-# Otherwise, next time make doesn't execute the recipe as it considers
-# the target up-to-date. This safeguards against sneaking of an empty
-# and/or corrupt articles which are then #include'd in others thus
-# rendering them invalid.
- PO=$(template-dir)/po/$(1).$(2).po ; $(check-po) \
- || (touch $$$$PO ; exit 1)
- $$(addfile)
- $(call generate-html,$(2),$(template-dir)/po/$(1).$(2).po,$$@)
- $(call merge-empty-lines,$$@)
-endef
-
-define template-dir-rules
-$(template-dir)/po/$(1).proto: $(template-dir)/$(1).html
- cp $$< $$@
- $$(add-gnun-tags)
-
-$(template-dir)/po/$(1).pot: $(template-dir)/po/$(1).proto
- $$(addfile)
- $$(generate-pot)
-
-$(foreach t-lang,$(TEMPLATE_LINGUAS), \
- $(eval $(call template-rules,$(1),$(t-lang))))
-endef
-
-$(foreach t-file,$(template-files), \
- $(eval $(call template-dir-rules,$(t-file))))
-### End of the templates-specific rules ###
-
### Specific rules for extra templates ###
# Essentially duplicate rules for templates, but define per-template
# rules rather than use static patterns
@@ -995,61 +931,6 @@
cp $@ $(template-dir)
### End of the whatsnew-specific rules ###
-### Specific rules for the homepages ###
-$(rootdir)/po/home.proto: $(rootdir)/home.html
-# Delete the target if the script exits with a non-zero status in
-# order to prevent further messing up in the chain. For extra safety,
-# exit with an error so that make does not proceed to the next
-# command.
- $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
- $(generate-proto)
-
-$(rootdir)/po/home.pot: $(rootdir)/po/home.proto
- $(addfile)
- $(fixperm)
- $(generate-pot)
-
-define home-rules
-$(rootdir)/po/$(2).$(1).po: $(rootdir)/po/$(2).pot $(MASTER-$(1))
- PO=$$@ ; $(check-po)
- $$(fixperm)
- $(call update-po,$$@,$$<,$(1))
-
-$(rootdir)/$(2).$(1).html: $(rootdir)/po/$(2).proto \
- $(rootdir)/po/$(2).$(1).po generic.$(1).html
-# Check if the language is present in TEMPLATE_LINGUAS.
-ifeq (,$(call find-language,$(1),$(TEMPLATE_LINGUAS)))
-ifndef NOTIFYSKIP
- echo 'The "$(1)" language code is not defined in TEMPLATE_LINGUAS.' \
- | mail $(transl-addr) -s \
- "[GNUN Error] Could not build $$(subst $$(rootdir)/,,$$@)"
-else
- @echo 'The "$(1)" language code is not defined in TEMPLATE_LINGUAS.'
-endif
- exit 1
-endif # eq (,$(call find-language,$(1),$(TEMPLATE_LINGUAS)))
-# If $PO is not valid, then the generated page could be broken even
-# for the reader. Ensure that the build still barfs next time if the
-# translator doesn't fix it quickly.
- PO=$(rootdir)/po/$(2).$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
- $(call generate-html,$(1), \
- $(rootdir)/po/$(2).$(1).po,$(rootdir)/po/$(2).$(1).m4)
- $(call post-generate-html,$(rootdir)/po/$(2).$(1).m4,$(1))
- $(call extract-outdated-date,$(rootdir)/po/$(2).$(1).po) > /dev/null \
- || ($(call add-file,$(rootdir)/po/$(2).$(1)-en.html); \
- cp $(rootdir)/$(2).html $(rootdir)/po/$(2).$(1)-en.html)
- -$(RM) address@hidden
- $(M4) $(rootdir)/po/$(2).$(1).m4 > address@hidden
- $(call validate-article,$(rootdir)/po/$(2).$(1))
- $(call add-file,$$@)
- $$(fixperm)
- mv address@hidden $$@
-endef
-
-$(foreach h-lang,$(HOME_LINGUAS), \
- $(eval $(call home-rules,$(h-lang),home)))
-### End of the homepages-specific rules ###
-
### Rules for all other articles ###
define article-pot-rules
$(1).proto: $(subst /po/,/,$(1).html)
@@ -1171,7 +1052,7 @@
# there is no sense in adding home.pot as this should happen only once.
# WARNING: This is implemented just in case.
ifneq (,$(findstring always,$(VCS)))
-vcs-add-always: $(template-translated) $(home-translated) $(ALL_POTS) \
+vcs-add-always: $(template-translated) $(ALL_POTS) \
$(articles-translated) $(gnunews) $(wildcard generic.*.html) \
substitute-localized-urls
-$(vcs) add $(filter-out substitute-localized-urls,$^)
@@ -1374,7 +1255,7 @@
# Note that the HTML file with translation may or may not exist yet,
# so we should test it; also, if the HTML file is not newer than PO,
# it may be a very old translation whose format validation is not supported.
- for html in $(articles-translated) $(home-translated); do \
+ for html in $(articles-translated); do \
po=$${html%html}po; po=$${po%/*}/po/$${po##*/}; \
if test -f $${html} && test $${html} -nt $${po}; then \
echo Validating $${html}...; \
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- NEWS 24 Nov 2012 12:26:51 -0000 1.70
+++ NEWS 26 Nov 2012 14:13:07 -0000 1.71
@@ -2,6 +2,10 @@
* Changes in GNUnited Nations 0.7 (????-??-??)
+** The rules for home and original templates are not hardcoded
+ any more. The home page is defined as a no-grace `root' page,
+ the templates are declared in the `extra-templates' variable.
+
** New scripts:
*** `gnun-diff-po'
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -b -r1.307 -r1.308
--- ChangeLog 26 Nov 2012 06:45:23 -0000 1.307
+++ ChangeLog 26 Nov 2012 14:13:08 -0000 1.308
@@ -1,5 +1,34 @@
2012-11-26 Pavel Kharitonov <address@hidden>
+ Eliminate hardcoded home and templates.
+
+ * GNUmakefile (template-files, home-lang, home-translated):
+ Remove variables.
+ (template-translated-base, template-pots): Remove
+ `template-files'.
+ (all, no-grace-items, substitute-localized-urls)
+ (vcs-add-always): Remove `home-translated' as a dependency.
+ (validate-all): Don't validate `home-translated'.
+ (template-rules, template-dir-rules, rules for homepages):
+ Remove functions and rules.
+ * doc/gnun.texi (Runtime Variables, Main Variables, GNU News):
+ Eliminate references to homepages, `HOME_LINGUAS',
+ `template-files'; use `extra-templates' as a reference
+ to the list of templates.
+ (Main Variables) <ROOT>: Mention `home.html'.
+ (GNU News): Don't say gnusflashes are used in homepages.
+ (Localised URLs): Fix a typo "s,homepage,directory,".
+ * doc/web-trans.texi (New Team): Replace `whatsnews.html' with
+ more actual `planetfeeds.html'.
+ (Commits): Replace `HOME_LINGUAS' in the example with
+ `FUZZY_DIFF_LINGUAS'.
+ (SSI): Omit `gnuflashes.include' and `whatsnew.include'.
+ Document `server/skip-translations.html' and
+ `server/top-addendum.html'.
+ * NEWS: Update.
+
+2012-11-26 Pavel Kharitonov <address@hidden>
+
* GNUmakefile (article-pot-rules) <$(1).translist>: Depend
on all possible HTML files rather than on those existing
at make launch time.
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- doc/gnun.texi 19 Nov 2012 15:14:28 -0000 1.65
+++ doc/gnun.texi 26 Nov 2012 14:13:10 -0000 1.66
@@ -496,7 +496,7 @@
for the specific language an article is being generated, an empty file
will be added. Finally, any missing PO and their HTML counterparts of
the server templates will be added, computed on the basis of the
address@hidden variable.
address@hidden and @code{optional-templates} variables.
@item VCS=always
Because GNU Make considers the targets up-to-date after a successful
@@ -562,7 +562,7 @@
@cindex output, detailed
@item VERBOSE=yes
If defined, the value of the variables @code{templates-translated},
address@hidden, @code{ALL_POTS}, @code{articles-translated} and
address@hidden, @code{articles-translated} and
@code{gnunews} will be printed to the standard output. This is off by
default, but recommended in general since it will show a bug in the
computation of the basic variables.
@@ -580,7 +580,7 @@
changes in the original. The translator has time (the ``grace'' period
as defined in this variable) to review the changes and unfuzzy the
strings, while keeping the online translation intact. Note that this
-variable has no effect on the homepage, the server templates, gnunews
+variable has no effect on the server templates, gnunews
and all articles defined in the variable @code{no-grace-articles}.
@cindex OUTDATED-GRACE
@@ -658,7 +658,7 @@
@subsubsection The @code{no-grace-items} Target
The @code{no-grace-items} target regenerates a limited set of articles
-that are not affected by the grace period, namely, the homepage, the
+that are not affected by the grace period, namely, the
server templates, gnunews, and all articles defined in the variable
@code{no-grace-articles} (@pxref{GRACE,,grace period}).
@@ -842,8 +842,7 @@
GNUnited Nations' internals. From a purely technical point of view,
there is no difference.}, ideally after performing some local tests. A
translation team leader should update only @code{FUZZY_DIFF_LINGUAS},
address@hidden and
address@hidden; everything else is supposed to be built
address@hidden; everything else is supposed to be built
automagically, without manual intervention. If not, that is a bug that
should be reported and fixed.
@@ -854,16 +853,8 @@
@item TEMPLATE_LINGUAS
A space-separated list with languages. Add here your language code
@emph{if and only if} you have all the SSI templates translated, and
-have already committed all @anchor{hardcoded templates}template files:
-
address@hidden @minus
address@hidden @file{server/@/po/@/address@hidden
address@hidden @file{server/@/po/@/address@hidden
address@hidden @file{server/@/po/@/address@hidden
address@hidden @file{server/@/po/@/address@hidden
address@hidden @file{server/@/po/@/address@hidden,
address@hidden itemize
-
+have already committed all template files listed in
+the @code{extra-templates} variable in @file{server/@/gnun/@/gnun.mk},
as well as the templates that are not under GNUN's control and are
translated manually, like
@@ -882,10 +873,9 @@
@anchor{extra-templates}
@item extra-templates
-The @var{extra-templates} variable lists additional templates under GNUN
+The @code{extra-templates} variable lists templates under GNUN
control; they are rebuilt from corresponding
address@hidden@var{lang}.po files like those hardcoded in GNUmakefile
-(@pxref{hardcoded templates});
address@hidden@var{lang}.po files;
when the @address@hidden file is absent, GNUN initializes
and commits a file with empty @code{msgstr}s.
@@ -895,7 +885,7 @@
@anchor{optional-templates}
@item optional-templates
-The @var{optional-templates} variable defines optional templates under
+The @code{optional-templates} variable defines optional templates under
GNUN control. Those are the templates of low priority items, like news
lines included in some pages. They are managed like the additional
templates listed in the @var{extra-templates} variable, except
@@ -917,20 +907,11 @@
the default @command{wdiff} format. @xref{wdiff, wdiff, The word
difference finder, wdiff, GNU wdiff}, for more information.
address@hidden HOME_LINGUAS
address@hidden homepage, defining
address@hidden defining homepage
address@hidden HOME_LINGUAS
-Add your language code if you have already committed
address@hidden/address@hidden, that way the homepage for your language
-will be built. It is not acceptable to have your language code
-defined in this variable, but not in @code{TEMPLATE_LINGUAS}.
-
@cindex ROOT
@cindex articles in root directory, defining
@cindex defining articles in the root dir
@item ROOT
-Add here articles that are in the server root, like
+Add here articles that are in the server root, like @file{home.html},
@file{keepingup.html} and @file{provide.html}. Always write only the
basename of the article, i.e. if you add these two articles, the value
of @code{ROOT} should be @code{keepingup provide}. This is true for
@@ -1409,7 +1390,7 @@
known as ``GNU News''. Entries are added in a special plain text
file, @file{server/whatsnew.txt} and are used to build
@file{server/whatsnew.include} and @file{gnusflashes.include}. The
-former is used by @file{server/whatsnew.html}, while the latter is
+former is used by @file{server/whatsnew.html}, while the latter was
included in the homepage.
GNUN has additional rules for building @file{whatsnew.pot}, which
@@ -1419,10 +1400,7 @@
@address@hidden There is nothing unusual in this
POT file, so it should be translated like any other. When you commit
@address@hidden, it will be used to generate all three
-localized files. In addition, if there is a homepage for this language,
-it will be rebuilt when @address@hidden is
-generated for the first time in order the translated homepage to include
-it instead of @file{gnusflashes.include}.
+localized files.
Note that localized RSS feeds are not supported on purpose, as it would
be annoying for subscribers if new items appear in English and then once
@@ -1440,7 +1418,7 @@
@itemize
@item
When you install a new translation of an article (that is different
-from a server template or the homepage), all you need to do is to add
+from a server template), all you need to do is to add
your PO file in the appropriate @file{/po} sub-directory.
In the next build, your @address@hidden@var{lang}.html} will be
@@ -1451,7 +1429,7 @@
@item
If you don't feel comfortable editing @file{gnun.mk}, do not worry.
Someone from the GNUN maintainers will notice and will amend
address@hidden or @code{HOME_LINGUAS} for you, as appropriate.
address@hidden for you, as appropriate.
@item
Dealing with obsolete strings. Elements which are removed from the
@@ -2000,7 +1978,7 @@
the working copy and substitute the strings in the HTML file of the
translation.
-GNUN relies on URLs being absolute, starting from the root homepage
+GNUN relies on URLs being absolute, starting from the root directory
as required in
@url{http://www.gnu.org/server/fsf-html-style-sheet.html#FilenameAndURLGuidelines}.
Index: doc/web-trans.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/web-trans.texi,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- doc/web-trans.texi 29 Sep 2012 05:42:20 -0000 1.35
+++ doc/web-trans.texi 26 Nov 2012 14:13:13 -0000 1.36
@@ -259,7 +259,7 @@
submit them in the usual way, together with the translation of the
essay.
-Additional templates are defined via the @var{extra-templates} variable
+Additional templates are defined via the @code{extra-templates} variable
in @file{server/@/gnun/@/gnun.mk}.
If you don't want to translate the templates for whatever reason---do
@@ -487,7 +487,7 @@
@uref{http://www.gnu.org/@/server/@/standards/@/translations/@/priorities.html},
although it is probably hard to start with one of them. Choose whatever
you wish, provided it is an essay and not an auxiliary page. Avoid
-translating the homepage or @file{whatsnew.html}---they are moving
+translating the homepage or @file{planetfeeds.html}---they are moving
targets and keeping up would be only a distraction for both parties in
the process. As usual, send the completed translation to
@email{web-translators@@gnu.org}.
@@ -798,7 +798,7 @@
and
@example
-(HOME_LINGUAS): Add `pa'.
+(FUZZY_DIFF_LINGUAS): Add `pa'.
@end example
This makes it easier for others to search for a particular change in the
@@ -1288,24 +1288,18 @@
and it is evident without any notices that there is no complete
and up to date translation.
address@hidden server/skip-translations.html
+The text for a link to the end of the autogenerated list of
+translations.
+
address@hidden server/top-addendum.html
+The text saying that the page is a translation.
+
@item translations.include
The list of translations for the homepage (and only the homepage). It
is maintained manually; in order the link to a translation to appear on
all of the homepages, it has to be present here.
address@hidden gnusflashes.include
-A portion of the most recent 3 news items from
address@hidden/whatsnew.html}, generated automatically. If your language
-does not have @file{server/po/address@hidden, this file will be
-used. Otherwise, if there is an existing localized homepage and you
-commit @address@hidden, the homepage will be rebuilt to
-include the translated @address@hidden
-
address@hidden server/whatsnew.include
-Generated automatically, this file is included from
address@hidden/whatsnew.html}. Translations are built automatically, and
-the localized @file{gnusflashes.include} is derived from it.
-
@item licenses/gpl-3.0-body.html
@itemx licenses/fdl-1.3-body.html
@itemx @dots{}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun GNUmakefile NEWS C...,
Pavel Kharitonov <=