trans-coord/gnun/server/gnun GNUmakefile Change...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/02/28 12:14:08

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        * GNUmakefile (generate-translinks): Use
        `translist-head.html' and `translist-tail.html' instead of
        `translinks-head.html' and `translinks-tail.html'.
        Change the format of the entries.
        * doc/gnun.texi (languages.txt): Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.84&r2=1.85

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- GNUmakefile 18 Feb 2013 06:26:20 -0000      1.155
+++ GNUmakefile 28 Feb 2013 12:14:08 -0000      1.156
@@ -419,12 +419,12 @@
 # Compile translations list
 define generate-translinks
 $(call add-file,$(1).translist); \
-file=$(1).translist; cp translinks-head.html $$$${file}; \
+file=$(1).translist; cp translist-head.html $$$${file}; \
 $(GREP) -v "^#" languages.txt \
   | while read language; do \
-      code=$$$${language%%     *}; \
+      code=$$$${language%%     *}; class=""; \
       case $$$${code} in \
-        en ) suffix=""; \
+        en ) suffix=""; class=' class="original"'; \
              url_suffix=$(if $(findstring no, $(MULTIVIEWS)),"",".en") ;; \
         * ) suffix=.$$$${code}; url_suffix="$$$${suffix}" ;; \
       esac; \
@@ -433,13 +433,12 @@
       url_stem=$(subst /po/,/,$(subst $(rootdir),,$(1))); \
       article=$(subst /po/,/,$(1)); \
       if test -f $$$${article}$$$${suffix}.html; then \
-        echo '<!-- '$$$${lang}' -->' >> $$$${file}; \
-        echo -n '<li><a href="'$$$${url_stem}$$$${url_suffix}.html'">' \
+        echo -n '<span'$$$$class'><a 
href="'$$$${url_stem}$$$${url_suffix}.html'">' \
                  >> $$$${file}; \
-        echo $$$${name}'</a>&nbsp;['$$$${code}']</li>' >> $$$${file}; \
+        echo $$$${name}'</a>&nbsp;['$$$${code}']</span>&nbsp;&nbsp;' >> 
$$$${file}; \
       fi; \
     done; \
-cat translinks-tail.html >> $$$${file};
+cat translist-tail.html >> $$$${file};
 endef
 
 # Replace SSI directives to include initial translations list with

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- ChangeLog   18 Feb 2013 06:26:21 -0000      1.358
+++ ChangeLog   28 Feb 2013 12:14:08 -0000      1.359
@@ -1,3 +1,11 @@
+2013-02-28  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (generate-translinks): Use
+       `translist-head.html' and `translist-tail.html' instead of
+       `translinks-head.html' and `translinks-tail.html'.  Change
+       the format of the entries.
+       * doc/gnun.texi (languages.txt): Update.
+
 2013-02-18  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (update-po): Suppress fuzzy matching for

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- doc/gnun.texi       1 Feb 2013 06:01:49 -0000       1.84
+++ doc/gnun.texi       28 Feb 2013 12:14:08 -0000      1.85
@@ -1000,8 +1000,8 @@
 comment (when it begins with ``#'') or a definition for a language.  A
 language is defined by three @key{TAB}-separated fields.  The first field
 defines the language suffix; it is used in file names and in texts of
-the links.  The second field is the name of the language in English;
-it is used in HTML comments.  The third field defines the name of the
+the links.  The second field is the name of the language in English.
+The third field defines the name of the
 language in that language itself; it is used in texts of the links,
 and it should be in UTF-8.  For example:
 
@@ -1012,18 +1012,15 @@
 The generated list of translations may look like this:
 
 @example
-<!-- begin translinks file -->
+<!-- begin translist file -->
 <div id="translations">
-<ul class="translations-list">
-<!-- German -->
-<li><a href="/distros/screenshot.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/distros/screenshot.html">English</a>&nbsp;[en]</li>
-<!-- Polish -->
-<li><a href="/distros/screenshot.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
+<p>
+<span class="original"><a 
href="/distros/screenshot.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
+<span><a 
href="/distros/screenshot.de.html">Deutsch</a>&nbsp;[de]</span>&nbsp;&nbsp;
+<span><a 
href="/distros/screenshot.pl.html">polski</a>&nbsp;[pl]</span>&nbsp;&nbsp;
+</p>
 </div> <!-- id="translations" -->
-<!-- end translinks file -->
+<!-- end translist file -->
 @end example
 
 @node Compendia