[Mapbender-commits] r7553 - in trunk/mapbender: http/javascripts
http/php http/plugins resources/locale/de_DE/LC_MESSAGES
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Feb 10 07:58:30 EST 2011
Author: armin11
Date: 2011-02-10 04:58:30 -0800 (Thu, 10 Feb 2011)
New Revision: 7553
Modified:
trunk/mapbender/http/javascripts/initWmcObj.php
trunk/mapbender/http/php/mod_getServiceDisclaimer.php
trunk/mapbender/http/php/mod_getWmcDisclaimer.php
trunk/mapbender/http/php/mod_showMetadata.php
trunk/mapbender/http/plugins/wfsConfTree.js
trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
More german translation and i18 , bufixes
Modified: trunk/mapbender/http/javascripts/initWmcObj.php
===================================================================
--- trunk/mapbender/http/javascripts/initWmcObj.php 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/http/javascripts/initWmcObj.php 2011-02-10 12:58:30 UTC (rev 7553)
@@ -24,30 +24,21 @@
$resultObj = array(
"noPermission" => array(
- "message" => "Sie als Nutzer '" .
+ "message" => _mb("You as User")." '" .
Mapbender::session()->get("mb_user_name") . "' " .
- "haben keine Berechtigung auf folgende Layer zuzugreifen.",
+ _mb("have no authorization to access following layers."),
"wms" => array()
),
"withoutId" => array(
- "message" => "Folgende Layer stammen aus einer dem " .
- "Geoportal.rlp unbekannten Quelle. Es kann daher nicht " .
- "überprüft werden, ob die Links verwaist sind oder ob " .
- "die Dienste überhaupt Daten liefern.",
+ "message" => _mb("Following layers come from an unkown origin. There is no information about the links. They may be broken and the underlaying services may not exist anymore!"),
"wms" => array(),
),
"unavailable" => array(
- "message" => "Bei folgenden Diensten kam es während " .
- "des letzten Monitorings zu Problemen. Es ist möglich, dass " .
- "diese Dienste derzeit keine Informationen zur Verfügung stellen " .
- "können.",
+ "message" => _mb("The last monitoring had problems with the following layers. Maybe the underlying services will not be able to answer the requests for sometime."),
"wms" => array()
),
"invalidId" => array(
- "message" => "Folgende Dienste/Layer sind aus der " .
- "Registrierungsstelle gelöscht worden. Es kann daher nicht " .
- "überprüft werden, ob die Links verwaist sind oder ob " .
- "die Dienste überhaupt Daten liefern.",
+ "message" => _mb("Following layers have been removed from the registry. They may be broken and the underlaying services may not exist anymore!"),
"wms" => array()
),
"wmcTou" => array(
@@ -409,7 +400,7 @@
//get terms of use from wms objects which are in the remaining wmc and are not already accepted for this session
$validWMS = $wmcGetApi->getValidWms();
-$translation['wms'] = "Kartendienst";
+$translation['wms'] = _mb("MapService");
$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_map.png' alt='".$translation['wms']." - picture' title='".$translation['wms']."'>";
$languageCode = 'de';
$hostName = $_SERVER['HTTP_HOST'];
@@ -429,22 +420,20 @@
$mapbenderProtocol = "http://";
$mapbenderBaseUrl = "http://".$hostName;
}
-
-
-
-
-
-
-
$touServiceConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../../php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
- $tou .= $touServiceConnector->file;
+ $touForWMS = $touServiceConnector->file;
+ //add only those who have no special tou defined -
+ if ($touForWMS != ''){
+ $tou .= $touForWMS;
+ }
//set the tou to be accepted - TODO maybe do this after the button which deletes the message window - from a ajax request.
+
$classTou->set('wms',$WMS['id']);
- }
+ }
}
+
if ($tou != "") {
- $tou = "Die zu ladende Konfiguration enthält verschiedene Dienste " .
- "mit folgenden Nutzungsbedigungen:<br>".$tou;
+ $tou = _mb("The configuration, which should be loaded, consists of different services which have the following terms of use:")."<br>".$tou;
}
$resultObj["wmcTou"]["message"] = $tou;
Modified: trunk/mapbender/http/php/mod_getServiceDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getServiceDisclaimer.php 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/http/php/mod_getServiceDisclaimer.php 2011-02-10 12:58:30 UTC (rev 7553)
@@ -308,14 +308,15 @@
}
}
} else {
- //if nothing about restrictions is defined
+ /*//if nothing about restrictions is defined
if ($asTable){
echo $tableBegin;
echo $t_a.$htmlHeader['noInformation'].$t_b.$t_c."<br>";
echo $tableEnd;
} else {
echo $htmlHeader['noInformation']."<br>" ;
- }
+ }*/
+ echo "";//since it is not neccessary to give information about nothing ;-)
}
?>
Modified: trunk/mapbender/http/php/mod_getWmcDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getWmcDisclaimer.php 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/http/php/mod_getWmcDisclaimer.php 2011-02-10 12:58:30 UTC (rev 7553)
@@ -62,16 +62,19 @@
$translation['wmcDisclaimerHeader'] = 'Das vorliegende Dokument enthält Datenquellen von unterschiedlichen Stellen. Diese unterliegen den im folgenden aufgeführten Nutzungsbedingungen:';
$translation['wms'] = "Kartendienst";
$translation['wfs'] = "Datendienst";
+ $translation['noTouInformation'] = 'Es sind keine Informationen über Nutzungsbedingungen verfügbar!';
break;
case "en":
$translation['wmcDisclaimerHeader'] = 'The document includes data resources from different organizations. The following parapgraph shows the different terms of use for the includes resources:';
$translation['wms'] = "Web Map Service";
$translation['wfs'] = "Web Feature Service";
+ $translation['noTouInformation'] = 'No informations about terms of use are available!';
break;
default: #to english
$translation['wmcDisclaimerHeader'] = 'The document includes data resources from different organizations. The following parapgraph shows the different terms of use for the includes resources:';
$translation['wms'] = "Web Map Service";
$translation['wfs'] = "Web Feature Service";
+ $translation['noTouInformation'] = 'No informations about terms of use are available!';
}
@@ -106,8 +109,16 @@
foreach($validWMS as $WMS) {
echo $resourceSymbol." <a href='".$mapbenderBaseUrl.$_SERVER['SCRIPT_NAME']."/../mod_showMetadata.php?resource=wms&layout=tabs&id=".$WMS['id']."&languageCode=".$languageCode."'>".$WMS['title']."</a><br>";
+
$touServiceConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../mod_getServiceDisclaimer.php?type=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
- $wmstou = $touServiceConnector->file;
+ $touForWMS = $touServiceConnector->file;
+ //
+ if ($touForWMS == ''){
+ $wmstou = $translation['noTouInformation'];
+ } else {
+ $wmstou = $touForWMS;
+ }
+ //$wmstou = $touServiceConnector->file;
#$wmstou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
echo $wmstou."<br>";
}
Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/http/php/mod_showMetadata.php 2011-02-10 12:58:30 UTC (rev 7553)
@@ -169,6 +169,7 @@
$translation['graphicUnavailable'] = 'Grahische Übersicht nicht aktiviert';
$translation['notMonitored'] = 'Informationen über die Qualität sind nur verfügbar, wenn das Service Monitoring aktiv ist!';
$translation['wmcQualityText'] = 'Für Web Map Context Dokumente entfällt die Angabe zur Qualität!';
+ $translation['noTouInformation'] = 'Es sind keine Informationen über Nutzungsbedingungen verfügbar!';
break;
case "en":
$translation['overview'] = 'Overview';
@@ -232,6 +233,7 @@
$translation['graphicUnavailable'] = 'Graphical Overview not active';
$translation['notMonitored'] = 'Information about Quality is only available if the service monitoring is activated!';
$translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
+ $translation['noTouInformation'] = 'No informations about terms of use are available!';
break;
default: #to english
$translation['overview'] = 'Overview';
@@ -295,6 +297,7 @@
$translation['graphicUnavailable'] = 'Graphical Overview not active';
$translation['notMonitored'] = 'Information about Quality is only available if the service monitoring is activated!';
$translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
+ $translation['noTouInformation'] = 'No informations about terms of use are available!';
}
//Array with infos about the different elements which are shown in the tabs
@@ -899,8 +902,11 @@
$touWmcConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../mod_getWmcDisclaimer.php?&id=".$resourceMetadata['contentid']."&languageCode=".$languageCode."&hostName=".$hostName);
$tou = $touWmcConnector->file;
}
-
-$html .= $tou;
+if ($tou == ''){
+ $html .= $translation['noTouInformation'];
+} else {
+ $html .= $tou;
+}
$html .= '</p>';
$html .= '</div>';
//**************************termsOfUse part end******************************
Modified: trunk/mapbender/http/plugins/wfsConfTree.js
===================================================================
--- trunk/mapbender/http/plugins/wfsConfTree.js 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/http/plugins/wfsConfTree.js 2011-02-10 12:58:30 UTC (rev 7553)
@@ -60,7 +60,7 @@
height: 600,
autoOpen: false,
buttons:{
- translatedI18nObject.labelClose : function(){
+ "schliessen" : function(){
$(this).dialog("close");
}
}
Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2011-02-10 11:19:50 UTC (rev 7552)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2011-02-10 12:58:30 UTC (rev 7553)
@@ -2224,4 +2224,25 @@
msgid "Examples (first 20 entries):"
msgstr "Beispielinhalte (erste 20 Datensätze):"
+#: ../http/javascripts/initWmcObj.php
+msgid "You as User"
+msgstr "Sie als Nutzer"
+msgid "have no authorization to access following layers."
+msgstr "haben keine Berechtigung auf folgende Layer zuzugreifen."
+
+msgid "Following layers come from an unkown origin. There is no information about the links. They may be broken and the underlaying services may not exist anymore!"
+msgstr "Folgende Layer stammen aus einer der Registry unbekannten Quelle. Es kann daher nicht überprüft werden, ob die Links verwaist sind oder ob die Dienste überhaupt Daten liefern."
+
+msgid "The last monitoring had problems with the following layers. Maybe the underlying services will not be able to answer the requests for sometime."
+msgstr "Bei folgenden Diensten kam es während des letzten Monitorings zu Problemen. Es ist möglich, dass diese Dienste derzeit keine Informationen zur Verfügung stellen können."
+
+msgid "Following layers have been removed from the registry. They may be broken and the underlaying services may not exist anymore!"
+msgstr "Folgende Dienste/Layer sind aus der Registrierungsstelle gelöscht worden. Es kann daher nicht überprüft werden, ob die Links verwaist sind oder ob die Dienste überhaupt Daten liefern."
+
+msgid "MapService"
+msgstr "Kartendienst"
+
+msgid "The configuration, which should be loaded, consists of different services which have the following terms of use:"
+msgstr "Die zu ladende Konfiguration enthält verschiedene Dienste mit folgenden Nutzungsbedigungen:"
+
More information about the Mapbender_commits
mailing list