[Mapbender-commits] r7688 - in trunk/mapbender: http/plugins
resources/locale/de_DE/LC_MESSAGES tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Mar 4 02:16:21 EST 2011
Author: armin11
Date: 2011-03-03 23:16:21 -0800 (Thu, 03 Mar 2011)
New Revision: 7688
Modified:
trunk/mapbender/http/plugins/mb_sessionWmc.js
trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
trunk/mapbender/tools/mod_mailAbo.php
Log:
Bugfixing and translations
Modified: trunk/mapbender/http/plugins/mb_sessionWmc.js
===================================================================
--- trunk/mapbender/http/plugins/mb_sessionWmc.js 2011-03-04 06:41:35 UTC (rev 7687)
+++ trunk/mapbender/http/plugins/mb_sessionWmc.js 2011-03-04 07:16:21 UTC (rev 7688)
@@ -111,7 +111,7 @@
},
callback: function (obj, result, message) {
window.resetSession = true;
- //unset the get api params cause the will load the old state!
+ //unset the get api params cause they will load the old state!
var currentURL = location;
var newHref = currentURL.protocol+'//'+currentURL.host+currentURL.pathname;
window.location.href = newHref;
Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2011-03-04 06:41:35 UTC (rev 7687)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2011-03-04 07:16:21 UTC (rev 7688)
@@ -1763,7 +1763,7 @@
#: ../http/php/mod_abo_show.php:41
msgid "Confirmation of subscribers notification"
-msgstr "Bestätigung der Abonenntenbenachrichtigung"
+msgstr "Bestätigung der Abonnentenbenachrichtigung"
#: ../http/php/mod_abo_show.php:43
msgid "Mapbender monitoring subscriber"
@@ -1771,7 +1771,7 @@
#: ../http/php/mod_abo_show.php:44
msgid "Mapbender subscribers notification"
-msgstr "Abonenntenbenachrichtigung"
+msgstr "Abonnentenbenachrichtigung"
#: ../http/php/mod_abo_show.php:45
msgid "The following services are affected"
@@ -1779,11 +1779,11 @@
#: ../http/php/mod_abo_show.php:46
msgid "e-mail form for notifications to the subscribers of the following WMS"
-msgstr ""
+msgstr "EMail Formular für die Benachrichtigung der Abonnenten folgender WMS "
#: ../http/php/mod_abo_show.php:47
msgid "Subscriber notification for Mapbender service providers"
-msgstr ""
+msgstr "Abo Benachrichtigung für die Anbieter von OWS"
#: ../http/php/mod_abo_show.php:48
msgid "Notifications have been sent. You will receive a confirmation mail shortly."
@@ -1795,7 +1795,7 @@
#: ../http/php/mod_abo_show.php:50
msgid "The subscribers to these WMS have been notified"
-msgstr "Die Abonnenten folgender WMS wurde benachrichtigt"
+msgstr "Die Abonnenten folgender WMS wurden benachrichtigt"
#: ../http/php/mod_abo_show.php:51
msgid "For further inquiries contact"
@@ -2305,12 +2305,12 @@
msgid "Preview saved"
msgstr "Vorschau gespeichert"
-msgid "Preview saved - but following service urls are not included cause the firewall prevent this!"
-msgstr "Vorschau gespeichert - aber folgende Dienste fehlen, weil die Firewall sie rausschmeißt!"
+msgid "Preview saved - but following service urls are not included !"
+msgstr "Vorschau gespeichert - aber folgende Dienste fehlen! "
msgid "Preview could not be created"
msgstr "Vorschau konnte nicht gespeichert werden"
#:../tools/mod_mailAbo.php
-msgid "test1"
-msgstr "test2"
+msgid "Mapbender was unable to access the services listed above. These service may be unreachable on short notice. Please contact the service provider listed in the service metadata. You will find the metadata by following the link mentioned above. Note: This e-mail has been sent automatically because you subscribed to this service. You can unsubscribe by logging in and clicking the unsubscribe button in the Mapbender metadata dialogue."
+msgstr "Das GeoPortal hat Probleme beim Zugriff auf die oben in dieser E-Mail genannten Dienste. Es ist möglich, dass diese kurzfristig nicht verfügbar sind. Weitere Informationen erhalten Sie auf Anfrage beim Dienstebereitsteller, der in den Metadaten des Dienstes angegeben ist. Folgen Sie dazu dem oben in dieser E-Mail aufgeführten Link. Hinweis: Diese E-Mail wurde automatisiert erzeugt und der Versand von Ihnen beantragt. Diese E-Mail-Benachrichtigung können Sie jederzeit abbestellen, indem Sie das Abonnement über die Metadatenanzeige im GeoPortal deaktivieren."
Modified: trunk/mapbender/tools/mod_mailAbo.php
===================================================================
--- trunk/mapbender/tools/mod_mailAbo.php 2011-03-04 06:41:35 UTC (rev 7687)
+++ trunk/mapbender/tools/mod_mailAbo.php 2011-03-04 07:16:21 UTC (rev 7688)
@@ -38,7 +38,7 @@
$cnt++;
}
$cnt=0;
-$mail_user_topic = _mb("Mapbender subscribers notification"); // "GeoPortal.rlp Mitteilung WMS Abonennten"
+$mail_user_topic = _mb("Mapbender subscribers notification"); // "GeoPortal.rlp Mitteilung WMS Abonnenten"
$number_of_users_text = _mb("Number of users"); // "Zahl der eingetragenen User IDs"
$subscribed_wms_text = _mb("All WMS subscribed by this user"); // "Alle abonnierten WMS des Users"
$wms_with_problems_text = _mb("WMS with problems"); // "WMS mit Problemen"
@@ -47,7 +47,7 @@
$body_text = _mb("Mapbender was unable to access the services listed above. " .
"These service may be unreachable on short notice. Please contact the " .
"service provider listed in the service metadata. You will find the " .
- "metadata by following the link mentioned above.\n" .
+ "metadata by following the link mentioned above. " .
"Note: This e-mail has been sent automatically because you subscribed " .
"to this service. You can unsubscribe by logging in and clicking the " .
"unsubscribe button in the Mapbender metadata dialogue."
@@ -104,11 +104,15 @@
$res_wms_t = db_prep_query($sql, $v_wms_t, $t_wms_t);
$row_wms_t = db_fetch_array($res_wms_t);
if ($wms_monitor_status == '-1') {
- $metadataUrl = preg_replace(
- "/(.*)frames\/login.php/",
- "$1php/mod_layerMetadata.php?id=",
- LOGIN
- );
+ if (isset(MAPBENDER_PATH) && MAPBENDER_PATH != '') {
+ $metadataUrl = MAPBENDER_PATH."/php/mod_showMetadata.php?resource=layer&id=";
+ } else {
+ $metadataUrl = preg_replace(
+ "/(.*)frames\/login.php/",
+ "$1php/mod_showMetadata.php?resource=layer&id=",
+ LOGIN
+ );
+ }
echo "WMS: ".$wmsid."\n";
$body .= _mb($wms_unreachable_text, $row_wms_t["wms_title"], $wmsid) .
" (" . $wms_monitor_timestamp_end . ")\n" .
More information about the Mapbender_commits
mailing list