Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [257] trunk
|
From: <aca...@us...> - 2007-03-13 17:36:24
|
Revision: 257
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=257&view=rev
Author: acarboni
Date: 2007-03-13 10:36:10 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
Removed variables substitution is string files
Modified Paths:
--------------
trunk/installer/installer-config.xml
trunk/web/loc/cn/xml/strings.xml
trunk/web/loc/en/xml/strings.xml
trunk/web/loc/es/xml/strings.xml
trunk/web/loc/fr/xml/strings.xml
trunk/web/xsl/file-download.xsl
trunk/web/xsl/main-page.xsl
Modified: trunk/installer/installer-config.xml
===================================================================
--- trunk/installer/installer-config.xml 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/installer/installer-config.xml 2007-03-13 17:36:10 UTC (rev 257)
@@ -85,9 +85,6 @@
<executable targetfile="$INSTALL_PATH/bin/stop-geonetwork.sh" />
<parsable targetfile="$INSTALL_PATH/docs/post-install.txt" type="plain"/>
- <parsable targetfile="$INSTALL_PATH/web/loc/en/xml/strings.xml" type="xml"/>
- <parsable targetfile="$INSTALL_PATH/web/loc/fr/xml/strings.xml" type="xml"/>
- <parsable targetfile="$INSTALL_PATH/web/loc/es/xml/strings.xml" type="xml"/>
<parsable targetfile="$INSTALL_PATH/web/xml/repositories.xml" type="xml"/>
<parsable targetfile="$INSTALL_PATH/web/xml/schema-mappings.xml" type="xml"/>
Modified: trunk/web/loc/cn/xml/strings.xml
===================================================================
--- trunk/web/loc/cn/xml/strings.xml 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/loc/cn/xml/strings.xml 2007-03-13 17:36:10 UTC (rev 257)
@@ -95,7 +95,6 @@
<meta name="DC.date" content="01-11-2005"/>
<meta name="DC.type" scheme="DCMIType" content="InteractiveResource"/>
<meta name="DC.format" content="text/html; charset=UTF-8"/>
- <meta name="DC.identifier" content="http://$WEBSERVER_HOST/geonetwork"/>
<meta name="DC.language" content="Chinese English French Spanish"/>
<meta name="DC.coverage" content="Global"/>
</header_meta>
Modified: trunk/web/loc/en/xml/strings.xml
===================================================================
--- trunk/web/loc/en/xml/strings.xml 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/loc/en/xml/strings.xml 2007-03-13 17:36:10 UTC (rev 257)
@@ -119,11 +119,9 @@
<meta name="DC.creator" content="GeoNetwork Team"/>
<meta name="DC.subject" lang="English French" content="GeoNetwork opensource metadata ISO19115 ISO19139 ISO GIS remote sensing data shapefiles spatial data satellite images map maps interactive opengis mapping 19115 19139 geographic z39.50 catalog clearinghouse coverages grid raster data opensource open source network"/>
<meta name="DC.description" lang="English French" content="GeoNetwork opensource provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
-<!-- <meta name="DC.publisher" content="$ORGANIZATION"/> -->
<meta name="DC.date" content="01-11-2005"/>
<meta name="DC.type" scheme="DCMIType" content="InteractiveResource"/>
<meta name="DC.format" content="text/html; charset=UTF-8"/>
-<!-- <meta name="DC.identifier" content="http://$WEBSERVER_HOST/$SERVLET"/> -->
<meta name="DC.language" content="English French"/>
<meta name="DC.coverage" content="Global"/>
</header_meta>
@@ -164,7 +162,9 @@
<li>To enhance understanding of the benefits of geographic information</li>
</ul>
</mainpage1>
- <mainpage2> GeoNetwork opensource allows to easily share geographically referenced thematic information between different organizations. For more information please contact: <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a> or send us <a href="/$SERVLET/srv/en/feedback">feedback</a>
+ <mainpage2>
+ GeoNetwork opensource allows to easily share geographically referenced thematic
+ information between different organizations. For more information please contact
</mainpage2>
<mainhelp1> How to search... </mainhelp1>
<mainhelp2> Hide help... </mainhelp2>
@@ -220,9 +220,6 @@
<newPassword>New Password</newPassword>
<newUser>Add a new User to the Database</newUser>
<none>none</none>
- <nofilefound1>Sorry, the download file was not found. Please send us a </nofilefound1>
- <nofilefound2>feedback message</nofilefound2>
- <nofilefound3> or an email ($ADMIN_MAIL) with the title and the following Metadata id: </nofilefound3>
<noHelp>Sorry, no help available</noHelp>
<noInfo>Sorry, no info available</noInfo>
<noLogin>You are not logged in</noLogin>
@@ -301,8 +298,7 @@
<copyright2>
<p>All rights reserved.<br/> Your generic copyright statement </p>
</copyright2>
- <moreinfo>For more information you can contact us via email at <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a>, or send us <a href="/$SERVLET/srv/en/feedback">feedback</a>
- </moreinfo>
+ <moreinfo>For more information you can contact us via email at </moreinfo>
<message>The username or the password is wrong.<br/>Press the 'back' button and try again.</message>
<protocolChoice value="WWW:LINK-1.0-http--link">Web address (URL)</protocolChoice>
<protocolChoice value="WWW:DOWNLOAD-1.0-http--download">File for download</protocolChoice>
Modified: trunk/web/loc/es/xml/strings.xml
===================================================================
--- trunk/web/loc/es/xml/strings.xml 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/loc/es/xml/strings.xml 2007-03-13 17:36:10 UTC (rev 257)
@@ -76,15 +76,13 @@
<meta name="keywords" content="GeoNetwork opensource metadatos ISO19115 ISO19139 ISO GIS teledetección datos shapefiles datos espaciales imágenes de satélite mapa mapas interactivos opengis mapping 19115 19139 geographic z39.50 catalogo clearinghouse coberturas mallas raster data opensource open source network"/>
<meta name="description" content="GeoNetwork opensource proporciona a través de internet acceso a mapas interactivos, imágenes de satélite y bases de datos espaciales relacionadas. El propósito es mejorar el acceso a y la integración de datos espaciales e información. GeoNetwork opensource permite compartir fácilmente datos espaciales entre los usuarios"/>
<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
- <meta name="DC.title" lang="Spanish" content="$ORGANIZATION Portal GeoNetwork para datos espaciales e información"/>
+ <meta name="DC.title" lang="Spanish" content="Portal GeoNetwork para datos espaciales e información"/>
<meta name="DC.creator" content="Equipo GeoNetwork"/>
<meta name="DC.subject" lang="Spanish" content="GeoNetwork metadata ISO19115 ISO19139 ISO GIS remote sensing data shapefiles spatial data satellite images map maps interactive opengis mapping 19115 19139 geographic z39.50 catalog clearinghouse coverages grid raster data opensource open source network"/>
- <meta name="DC.description" lang="Spanish" content="$ORGANIZATION GeoNetwork provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
- <meta name="DC.publisher" content="$ORGANIZATION"/>
+ <meta name="DC.description" lang="Spanish" content="GeoNetwork provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
<meta name="DC.date" content="01-11-2005"/>
<meta name="DC.type" scheme="DCMIType" content="InteractiveResource"/>
<meta name="DC.format" content="text/html; charset=UTF-8"/>
- <meta name="DC.identifier" content="http://$WEBSERVER_HOST/$SERVLET"/>
<meta name="DC.language" content="English French Spanish"/>
<meta name="DC.coverage" content="Global"/>
</header_meta>
@@ -132,7 +130,9 @@
<li>Enfatizar los beneficios que proporcionan la comprensión de la Información Geográfica</li>
</ul>
</mainpage1>
- <mainpage2> El proyecto GeoNetwork opensource promueve que se comparta la información temática y georeferenciada disponible entre las organizaciones. Si desea más información, puede enviar un mensaje: <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a> o bien enviar sus <a href="/$SERVLET/srv/es/feedback">sugerencias</a> a través de un formulario en la Web. <p/>
+ <mainpage2>
+ El proyecto GeoNetwork opensource promueve que se comparta la información temática y georeferenciada
+ disponible entre las organizaciones. Si desea más información, puede enviar un mensaje
</mainpage2>
<mainhelp1> Como buscar... </mainhelp1>
<mainhelp2> Ocultar la ayuda... </mainhelp2>
@@ -184,9 +184,6 @@
<newMdDes>Añade un nuevo metadato</newMdDes>
<newMetadata>Nuevo Metadato</newMetadata>
<newUser>Añade un nuevo usuario a la Base de datos</newUser>
- <nofilefound1>Disculpe las molestias, no se ha podido encontrar el fichero solicitado para su descarga. Envienos un </nofilefound1>
- <nofilefound2>mensaje de comentarios</nofilefound2>
- <nofilefound3> o un correo electrónico ($ADMIN_MAIL) con el título del metadatos y el id: </nofilefound3>
<noHelp>Disculpe las molestias, no hay ayuda disponible</noHelp>
<noInfo>Disculpe las molestias, no hay información disponible</noInfo>
<online>Mapa Interactivo</online>
@@ -252,7 +249,7 @@
<copyright2>
<p>Reservados todos los derechos.<br/> Escriba su propio copyright. </p>
</copyright2>
- <moreinfo>Para mayor información usted puede contactar por correo electrónico en <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a>, o enviarnos un <a href="/$SERVLET/srv/es/feedback">comentario</a>
+ <moreinfo>Para mayor información usted puede contactar por correo electrónico en </a>
</moreinfo>
<message>El nombre de usuario o la contaseña son incorrectos.<br/>Presione el botón 'atrás' e intentelo de nuevo.</message>
<protocolChoice value="WWW:LINK-1.0-http--link">Dirección Web (URL)</protocolChoice>
Modified: trunk/web/loc/fr/xml/strings.xml
===================================================================
--- trunk/web/loc/fr/xml/strings.xml 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/loc/fr/xml/strings.xml 2007-03-13 17:36:10 UTC (rev 257)
@@ -101,15 +101,13 @@
<meta name="keywords" content="GeoNetwork opensource metadata ISO19115 ISO19139 ISO GIS remote sensing data shapefiles spatial data satellite images map maps interactive opengis mapping 19115 19139 geographic z39.50 catalog clearinghouse coverages grid raster data opensource open source network"/>
<meta name="description" content="GeoNetwork opensource provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
- <meta name="DC.title" lang="French" content="$ORGANIZATION GeoNetwork portal to spatial data and information"/>
+ <meta name="DC.title" lang="French" content="GeoNetwork portal to spatial data and information"/>
<meta name="DC.creator" content="GeoNetwork Team"/>
<meta name="DC.subject" lang="French" content="GeoNetwork opensource metadata ISO19115 ISO19139 ISO GIS remote sensing data shapefiles spatial data satellite images map maps interactive opengis mapping 19115 19139 geographic z39.50 catalog clearinghouse coverages grid raster data opensource open source network"/>
- <meta name="DC.description" lang="French" content="$ORGANIZATION GeoNetwork provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
- <meta name="DC.publisher" content="$ORGANIZATION"/>
+ <meta name="DC.description" lang="French" content="GeoNetwork provides Internet access to interactive maps, satellite imagery and related spatial databases. It's purpose is to improve access to and integrated use of spatial data and information. GeoNetwork opensource allows to easily share spatial data among different users"/>
<meta name="DC.date" content="01-11-2005"/>
<meta name="DC.type" scheme="DCMIType" content="InteractiveResource"/>
<meta name="DC.format" content="text/html; charset=UTF-8"/>
- <meta name="DC.identifier" content="http://$WEBSERVER_HOST/$SERVLET"/>
<meta name="DC.language" content="English French Spanish"/>
<meta name="DC.coverage" content="Global"/>
</header_meta>
@@ -157,7 +155,7 @@
</mainpage1>
<mainpage2>
GeoNetwork opensource permet de partager des informations géographiques thématiques entre organisations.
- Pour plus d'information, contacter : <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a> ou envoyer nous <a href="/$SERVLET/srv/fr/feedback"> vos commentaires </a>
+ Pour plus d'information, contacter
</mainpage2>
<mainhelp1>
Comment chercher ...
@@ -233,9 +231,6 @@
<newPassword>Nouveau mot de passe</newPassword>
<newUser>Ajouter un utilisateur</newUser>
<none>Aucun</none>
- <nofilefound1>Désolé, le fichier à télécharger n'a pas été trouvé. Envoyez nous </nofilefound1>
- <nofilefound2>un message</nofilefound2>
- <nofilefound3> ou un email ($ADMIN_MAIL) avec l'identifiant suivant : </nofilefound3>
<noHelp>Désolé, pas d'aide disponible</noHelp>
<noInfo>Désolé, pas d'information disponible</noInfo>
<noLogin>Vous n'étes pas connecté.</noLogin>
@@ -313,7 +308,7 @@
<p>Tout droit réservé.<br/>
</p>
</copyright2>
- <moreinfo>Pour plus d'information, contacter : <a href="mailto:$ADMIN_MAIL">$ADMIN_MAIL</a>, ou envoyer nous <a href="/$SERVLET/srv/fr/feedback"> vos commentaires </a></moreinfo>
+ <moreinfo>Pour plus d'information, contacter : </moreinfo>
<message>Le nom ou mot de passe est incorrect.<br/>Appuyer sur le bouton 'retour'.</message>
<protocolChoice value="WWW:LINK-1.0-http--link">Adresse Internet (URL)</protocolChoice>
<protocolChoice value="WWW:DOWNLOAD-1.0-http--download">Fichier à télécharger</protocolChoice>
Modified: trunk/web/xsl/file-download.xsl
===================================================================
--- trunk/web/xsl/file-download.xsl 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/xsl/file-download.xsl 2007-03-13 17:36:10 UTC (rev 257)
@@ -13,6 +13,7 @@
<h2><xsl:value-of select="/root/gui/strings/messageDownload"/></h2>
<p/>
<xsl:copy-of select="/root/gui/strings/moreinfo"/>
+ <a href="mailto:{/root/gui/env/feedback/email}"><xsl:value-of select="/root/gui/env/feedback/email"/></a>
</xsl:with-param>
<xsl:with-param name="buttons">
<button class="content" onclick="load('{/root/gui/locService}/metadata.show?id={/root/request/id}')"><xsl:value-of select="/root/gui/strings/back"/></button>
Modified: trunk/web/xsl/main-page.xsl
===================================================================
--- trunk/web/xsl/main-page.xsl 2007-03-13 16:58:52 UTC (rev 256)
+++ trunk/web/xsl/main-page.xsl 2007-03-13 17:36:10 UTC (rev 257)
@@ -163,6 +163,7 @@
<td valign="top">
<xsl:copy-of select="/root/gui/strings/mainpage1"/>
<xsl:copy-of select="/root/gui/strings/mainpage2"/>
+ <a href="mailto:{/root/gui/env/feedback/email}"><xsl:value-of select="/root/gui/env/feedback/email"/></a>
</td>
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|