moving search_packages form to include file
Hi.
While working on the search_packages script I thought that it might
be good to move the form on distrib/packages to an include file
(like it is done for parts of the form on Bugs/index). This
would make it easier to modify the form if the script changes.
A patch plus two new files are attached. Comments welcome.
I've put the gettext strings in a new distrib.pot because
I got the impression that others.pot is getting really big and
some splitting might be good.
Gruesse,
--
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/
? distrib/archive.en.html
? distrib/archive.mirrors
? distrib/cd.en.html
? distrib/floppyinst.en.html
? distrib/ftplist.en.html
? distrib/index.en.html
? distrib/netinst.en.html
? distrib/packages.en.html
? distrib/pre-installed.en.html
? distrib/search_packages-form.inc
Index: po/Makefile
===================================================================
RCS file: /cvs/webwml/webwml/english/po/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- po/Makefile 23 Jan 2004 23:44:09 -0000 1.42
+++ po/Makefile 14 Feb 2004 11:29:38 -0000
@@ -9,11 +9,12 @@
LOCALEROOT = $(WMLBASE)/../locale
-DOMAINS = templates bugs countries date doc l10n langs organization ports search security vendors others
+DOMAINS = templates bugs countries date distrib doc l10n langs organization ports search security vendors others
bugs_FILES = $(ENGLISHDIR)/Bugs/pkgreport-opts.inc
countries_FILES = $(TEMPLDIR)/countries.wml
date_FILES = $(TEMPLDIR)/ctime.wml
+distrib_FILES = $(ENGLISHDIR)/distrib/search_packages-form.inc
doc_FILES = $(ENGLISHDIR)/doc/books.def $(ENGLISHDIR)/doc/manuals.defs
l10n_FILES = $(ENGLISHDIR)/international/l10n/dtc.def \
$(ENGLISHDIR)/international/l10n/menu.def
@@ -52,6 +53,7 @@
$(bugs_FILES) \
$(countries_FILES) \
$(date_FILES) \
+ $(distrib_FILES) \
$(doc_FILES) \
$(l10n_FILES) \
$(langs_FILES) \
@@ -80,6 +82,9 @@
$(ENGLISHDIR)/po/date.pot: # $(date_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl date $(date_FILES) > $@
+
+$(ENGLISHDIR)/po/distrib.pot: # $(date_FILES)
+ $(ENGLISHDIR)/po/wmlxgettext.pl distrib $(distrib_FILES) > $@
$(ENGLISHDIR)/po/doc.pot: # $(doc_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl doc $(doc_FILES) > $@
Index: distrib/Makefile
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- distrib/Makefile 17 Jun 2002 00:44:00 -0000 1.30
+++ distrib/Makefile 14 Feb 2004 11:29:38 -0000
@@ -6,11 +6,14 @@
CUR_DIR=distrib
SUBS=
+GETTEXTFILES = distrib.mo
+
include $(WMLBASE)/Make.lang
archive.$(LANGUAGE).html: archive.wml $(ENGLISHDIR)/distrib/archive.mirrors \
$(TEMPLDIR)/countries.wml
-packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
+packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info \
+ $(ENGLISHDIR)/distrib/search_packages-form.inc
pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
$(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
Index: distrib/packages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/packages.wml,v
retrieving revision 1.56
diff -u -r1.56 packages.wml
--- distrib/packages.wml 14 Jan 2004 13:30:00 -0000 1.56
+++ distrib/packages.wml 14 Feb 2004 11:29:38 -0000
@@ -90,39 +90,7 @@
<toc-add-entry name="search_packages">Search package directories</toc-add-entry>
-<FORM METHOD="GET" ACTION="http://packages.debian.org/cgi-bin/search_packages.pl";>
-<LABEL FOR="kw">Keyword:</LABEL>
-<INPUT TYPE="text" SIZE="30" NAME="keywords" ID="kw">
-<INPUT TYPE="submit" VALUE="Search"> <INPUT TYPE="reset">
-<BR>
-Search on:
-<INPUT TYPE=RADIO NAME="searchon" VALUE="names" ID="onlynames" CHECKED>
-<LABEL FOR="onlynames">Package names only</LABEL>
-<INPUT TYPE=RADIO NAME="searchon" VALUE="all" ID="descs">
-<LABEL FOR="descs">Descriptions</LABEL>
-<BR>
-Allow searching on subwords:
-<INPUT TYPE="checkbox" NAME="subword" VALUE="1" CHECKED>
-<br />
-Search case insensitive:
-<input type="checkbox" name="case" value="insensitive" CHECKED>
-<BR>
-Distribution:
-<SELECT NAME="version">
- <OPTION VALUE="unstable">unstable</OPTION>
- <OPTION VALUE="testing">testing</OPTION>
- <OPTION VALUE="stable" SELECTED>stable</OPTION>
- <OPTION VALUE="all">any</OPTION>
-</SELECT>
-Section:
-<SELECT NAME="release">
- <OPTION VALUE="main">main</OPTION>
- <OPTION VALUE="contrib">contrib</OPTION>
- <OPTION VALUE="non-free">non-free</OPTION>
- <OPTION VALUE="non-us">non-US</OPTION>
- <OPTION VALUE="all" SELECTED>any</OPTION>
-</SELECT>
-</FORM>
+#include "$(ENGLISHDIR)/distrib/search_packages-form.inc"
<HR>
#use wml::debian::language_names
#use wml::debian::common_tags
<bind-gettext-domain domain="distrib" />
<form method="GET" action="http://packages.debian.org/cgi-bin/search_packages.pl";>
<label for="kw"><gettext domain="distrib">Keyword</gettext>:</label>
<input type="text" size="30" name="keywords" id="kw" />
<input type="submit" value="<gettext domain="distrib">Search</gettext>" /> <input type="reset" />
<br />
<gettext domain="distrib">Search on</gettext>:
<input type="radio" name="searchon" value="names" id="onlynames" checked="checked" />
<label for="onlynames"><gettext domain="distrib">Package names only</gettext></label>
<input type="radio" name="searchon" value="all" id="descs" />
<label for="descs"><gettext domain="distrib">Descriptions</gettext></label>
<input type="radio" name="searchon" value="sourcenames" id="src" />
<label for="src"><gettext domain="distrib">Source package names</gettext></label>
<br />
<gettext domain="distrib">Allow searching on subwords</gettext>:
<input type="checkbox" name="subword" value="1" checked="checked" />
<br />
<gettext domain="distrib">Search case sensitive</gettext>:
<input type="checkbox" name="case" value="sensitive" checked="checked" />
<br />
<gettext domain="distrib">Distribution</gettext>:
<select name="version">
<option value="unstable"><gettext domain="distrib">unstable</gettext></option>
<option value="testing"><gettext domain="distrib">testing</gettext></option>
<option value="stable" selected="selected"><gettext domain="distrib">stable</gettext></option>
<option value="all"><gettext domain="distrib">any</gettext></option>
</select>
<gettext domain="distrib">Section</gettext>:
<select name="release">
<option value="main"><gettext domain="distrib">main</gettext></option>
<option value="contrib"><gettext domain="distrib">contrib</gettext></option>
<option value="non-free"><gettext domain="distrib">non-free</gettext></option>
<option value="non-us"><gettext domain="distrib">non-US</gettext></option>
<option value="all" selected="selected"><gettext domain="distrib">any</gettext></option>
</select>
</form>
msgid ""
msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/distrib/search_packages-form.inc:7
msgid "Keyword"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:9
msgid "Search"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:11
msgid "Search on"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:13
msgid "Package names only"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:15
msgid "Descriptions"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:17
msgid "Source package names"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:19
msgid "Allow searching on subwords"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:22
msgid "Search case insensitive"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:25
msgid "Distribution"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:27
msgid "unstable"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:28
msgid "testing"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:29
msgid "stable"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:30
#: ../../english/distrib/search_packages-form.inc:38
msgid "any"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:32
msgid "Section"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:34
msgid "main"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:35
msgid "contrib"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:36
msgid "non-free"
msgstr ""
#: ../../english/distrib/search_packages-form.inc:37
msgid "non-US"
msgstr ""
Reply to: