trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Yavor Doganov]

CVSROOT:        /cvsroot/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/03/15 23:12:18

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile TODO 

Log message:
        (MSGMERGE, MSGFMT, PO4A-GETTEXTIZE)
        (PO4A-TRANSLATE, SED, M4, PO4A-GETTEXTIZEFLAGS)
        (PO4A-TRANSLATEFLAGS, PO4A_XHTMLFLAGS): Define as simply expanded
        variables.
        (template-translated, home-translated, root-articles)
        ($(template-dir)/%.$(1).html, $(rootdir)/home.$(1).shtml)
        ($(subst /po/,/,$(1).html)): Wrap long lines.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ChangeLog   15 Mar 2008 14:56:32 -0000      1.47
+++ ChangeLog   15 Mar 2008 23:12:17 -0000      1.48
@@ -1,3 +1,13 @@
+2008-03-16  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile (MSGMERGE, MSGFMT, PO4A-GETTEXTIZE)
+       (PO4A-TRANSLATE, SED, M4, PO4A-GETTEXTIZEFLAGS)
+       (PO4A-TRANSLATEFLAGS, PO4A_XHTMLFLAGS): Define as simply expanded
+       variables.
+       (template-translated, home-translated, root-articles)
+       ($(template-dir)/%.$(1).html, $(rootdir)/home.$(1).shtml)
+       ($(subst /po/,/,$(1).html)): Wrap long lines.
+
 2008-03-15  Yavor Doganov  <address@hidden>
 
        * gnun.texi (New Translation, Webmaster Tips): Typo fix.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- GNUmakefile 15 Mar 2008 09:46:16 -0000      1.21
+++ GNUmakefile 15 Mar 2008 23:12:17 -0000      1.22
@@ -15,17 +15,17 @@
 # You should have received a copy of the GNU General Public License
 # along with GNUnited Nations.  If not, see <http://www.gnu.org/licenses/>.
 
-MSGMERGE = msgmerge
-MSGFMT = msgfmt
-PO4A-GETTEXTIZE = po4a-gettextize
-PO4A-TRANSLATE = po4a-translate
-SED = sed
-M4 = m4
+MSGMERGE := msgmerge
+MSGFMT := msgfmt
+PO4A-GETTEXTIZE := po4a-gettextize
+PO4A-TRANSLATE := po4a-translate
+SED := sed
+M4 := m4
 
-PO4A-GETTEXTIZEFLAGS =
-PO4A-TRANSLATEFLAGS = --keep=0
+PO4A-GETTEXTIZEFLAGS :=
+PO4A-TRANSLATEFLAGS := --keep=0
 
-PO4A_XHTMLFLAGS = --format=xhtml -o ontagerror=silent \
+PO4A_XHTMLFLAGS := --format=xhtml -o ontagerror=silent \
                    -o "attributes=<meta>content" \
                    -o "untranslated=W<gnun> W<script>" \
                    -o "translated=W<pre>"
@@ -77,7 +77,8 @@
                  footer-text
 template-translated-base := $(addprefix $(template-dir)/,$(template-files))
 template-lang = $(addsuffix .$(1).html,$(template-translated-base))
-template-translated := $(foreach t-lang,$(TEMPLATE_LINGUAS),$(call 
template-lang,$(t-lang)))
+template-translated := $(foreach t-lang,$(TEMPLATE_LINGUAS), \
+                        $(call template-lang,$(t-lang)))
 ifeq ($(VERBOSE),yes)
 $(info template-translated = $(template-translated))
 endif
@@ -85,7 +86,8 @@
 
 ### Special variables for the home pages ###
 home-lang = $(rootdir)/home.$(1).shtml
-home-translated := $(foreach h-lang,$(HOME_LINGUAS),$(call 
home-lang,$(h-lang)))
+home-translated := $(foreach h-lang,$(HOME_LINGUAS), \
+                    $(call home-lang,$(h-lang)))
 ifeq ($(VERBOSE),yes)
 $(info home-translated = $(home-translated))
 endif
@@ -96,7 +98,8 @@
 # it is much better if translators do not have to add manually anything.
 articles := $(foreach dir,$(ALL_DIRS),$(addprefix $(dir)/po/,$(value $(dir))))
 articles-pot := $(addprefix $(rootdir)/,$(articles:%=%.pot))
-root-articles := $(foreach root-article,$(ROOT),$(addprefix 
$(rootdir)/po/,$(root-article)))
+root-articles := $(foreach root-article,$(ROOT), \
+                  $(addprefix $(rootdir)/po/,$(root-article)))
 root-articles-pot := $(root-articles:%=%.pot)
 ALL_POTS := $(articles-pot) $(root-articles-pot)
 ALL_BASE := $(ALL_POTS:%.pot=%)
@@ -194,11 +197,13 @@
        @echo Updating PO file...
        $(MSGMERGE) --update $$@ $$< && touch $$@
 
-$(template-dir)/%.$(1).html: $(template-dir)/%.html 
$(template-dir)/po/%.$(1).po
+$(template-dir)/%.$(1).html: $(template-dir)/%.html \
+                            $(template-dir)/po/%.$(1).po
        $$(addfile)
        PO=$(template-dir)/po/$$(*F).$(1).po ; $(check-po)
        PO=$(template-dir)/po/$$(*F).$(1).po OUT=$$@ ; $(generate-html)
-       $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $$@
+       $(SED) --in-place \
+         ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $$@
 endef
 
 $(foreach t-lang,$(TEMPLATE_LINGUAS),$(eval $(call template-rules,$(t-lang))))
@@ -234,18 +239,29 @@
        PO=$(rootdir)/po/home.$(1).po ; $(check-po)
        PO=$(rootdir)/po/home.$(1).po OUT=$(rootdir)/po/home.$(1).m4 ; \
          $(generate-html)
-       $(SED) --in-place 
"s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
-       $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" 
$(rootdir)/po/home.$(1).m4
-       $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $(rootdir)/po/home.$(1).m4
+       $(SED) --in-place \
+         "s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(1)\2/g" \
+         $(rootdir)/po/home.$(1).m4
+       $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" \
+         $(rootdir)/po/home.$(1).m4
+       $(SED) --in-place \
+         ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' \
+         $(rootdir)/po/home.$(1).m4
        for inc in $(localized-includes); do \
-               $(SED) --in-place "s/\(<!--#include 
virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(1)\2/g" $(rootdir)/po/home.$(1).m4; \
-       done;
+         $(SED) --in-place \
+         "s/\(<!--#include virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(1)\2/g" \
+         $(rootdir)/po/home.$(1).m4; \
+       done
 # Polish is special case, because Apache treats gnusflashes.pl.include
 # as a Perl file.  This is hopefuly a temprorary situation.
 ifeq ($(1), pl)
-       $(SED) --in-place "s/\(<!--#include file=\"gnusflashes*\)\(.include\" 
-->\)/\1.polish\2/g" $(rootdir)/po/home.pl.m4
+       $(SED) --in-place \
+         "s/\(<!--#include file=\"gnusflashes*\)\(.include\" 
-->\)/\1.polish\2/g" \
+         $(rootdir)/po/home.pl.m4
 else
-       [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place 
"s/\(<!--#include file=\"gnusflashes*\)\(.include\" -->\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
+       [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place \
+         "s/\(<!--#include file=\"gnusflashes*\)\(.include\" 
-->\)/\1.$(1)\2/g" \
+         $(rootdir)/po/home.$(1).m4
 endif
        $(M4) $(rootdir)/po/home.$(1).m4 > $$@
 # To validate Catalan translations, add `ca' after `bg' and update the
@@ -290,20 +306,25 @@
        $$(addfile)
        PO=$(1).po ; $(check-po)
        PO=$(1).po OUT=$(1).m4 ; $(generate-html)
-       $(SED) --in-place 
"s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1).m4
+       $(SED) --in-place \
+         "s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1).m4
        $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" $(1).m4
-       $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $(1).m4
+       $(SED) --in-place \
+         ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' \
+         $(1).m4
        for inc in $(localized-includes); do \
-               $(SED) --in-place "s/\(<!--#include 
virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(2)\2/g" $(1).m4; \
-       done;
+         $(SED) --in-place \
+         "s/\(<!--#include virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(2)\2/g" \
+         $(1).m4; \
+       done
        $(M4) $(1).m4 > $$@
        $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl-addr) \
          $$@ || (sleep 1 ; touch $(1).po ; exit 1)
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))
-# FIXME: This is close to hell.  There should be an easier way to do it.
-$(foreach po-base,$(ALL_POS_BASE),$(eval $(call 
article-rules,$(po-base),$(subst .,,$(suffix $(po-base))))))
+$(foreach po-base,$(ALL_POS_BASE), \
+  $(eval $(call article-rules,$(po-base),$(subst .,,$(suffix $(po-base))))))
 ### End of all articles' rules ###
 
 # If VCS=always, add all necessary files.  The templates' POT are not

Index: TODO
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- TODO        14 Mar 2008 21:34:02 -0000      1.11
+++ TODO        15 Mar 2008 23:12:17 -0000      1.12
@@ -4,12 +4,6 @@
 
 ** #include directives propagate in the POT.
 
-** GNU Coding Standards compliance.
-
-*** Standardize all variables'/rules' names.
-
-*** Wrap long lines where possible.
-
 ** Useless references to the source in POT/PO.
    The POT are generated with references to the .proto files, which is
    useless and only clutters the diff.  If a large page is modified in