Improve name of user location map option

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index f3b8b7ccbf28b1b32e072a49831ce02051365683..7d8d0fca51d3f5766f78c1b15837f5b90ab9d9e6 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -747,7 +747,7 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
                                <optiontype>float</optiontype>
                                <defaultvalue>13.4</defaultvalue>
                        </option>
-                       <option name="google_maps_user_location_as_default">
+                       <option name="google_maps_access_user_location">
                                <categoryname>general.system.googleMaps</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>

diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index 84fdd5284e70bdd55ae81d22cf92eb78c964c7f5..4b4ecf94870a844fbec361e7e1c73ebd74ecb912 100644 (file)
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -20,7 +20,7 @@
                        zoom: {@GOOGLE_MAPS_ZOOM},
                        defaultLatitude: {@GOOGLE_MAPS_DEFAULT_LATITUDE},
                        defaultLongitude: {@GOOGLE_MAPS_DEFAULT_LONGITUDE},
-                       userLocationAsDefault: {@GOOGLE_MAPS_USER_LOCATION_AS_DEFAULT}
+                       accessUserLocation: {@GOOGLE_MAPS_ACCESS_USER_LOCATION}
                });
                
                {event name='javascriptInit'}

diff --git a/wcfsetup/install/files/js/WCF.Location.js b/wcfsetup/install/files/js/WCF.Location.js
index 001b43a6e5d121a46f8d96aa2fde231577f9819c..1bd98036d5c20a927c706d304e3420ac9dd4021f 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Location.js
+++ b/wcfsetup/install/files/js/WCF.Location.js
@@ -22,8 +22,8 @@ WCF.Location.Util = {
         * @param       integer         timeout
         */
        getLocation: function(callback, timeout) {
-               var $userLocationAsDefault = WCF.Location.GoogleMaps.Settings.get('userLocationAsDefault');
-               if (navigator.geolocation && $userLocationAsDefault !== null && $userLocationAsDefault) {
+               var $accessUserLocation = WCF.Location.GoogleMaps.Settings.get('accessUserLocation');
+               if (navigator.geolocation && $accessUserLocation !== null && $accessUserLocation) {
                        navigator.geolocation.getCurrentPosition(function(position) {
                                callback(position.coords.latitude, position.coords.longitude);
                        }, function() {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a02308591d9a835d0a12bfe901f7af14c08960a7..3bd871d322ee5b658940732c0680089fad075ab2 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1010,8 +1010,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Zoom durch Doppelklick zulassen]]></item>
                <item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Standard-Kartenposition (Breitengrad)]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Standard-Kartenposition (Längengrad)]]></item>
-               <item name="wcf.acp.option.google_maps_user_location_as_default"><![CDATA[Aktuelle Benutzerposition verwenden]]></item>
-               <item name="wcf.acp.option.google_maps_user_location_as_default.description"><![CDATA[Bei der Angabe von Positionen wird die aktuelle Position des Benutzers als Ausgangspunkt auf der Karte verwendet.]]></item>
+               <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Aktuelle Benutzerposition verwenden]]></item>
+               <item name="wcf.acp.option.google_maps_access_user_location.description"><![CDATA[Bei der Angabe von Positionen wird die aktuelle Position des Benutzers als Ausgangspunkt auf der Karte verwendet.]]></item>
                <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[„Benutzer online“-Darstellung für Benutzernamen verwenden]]></item>
                <item name="wcf.acp.option.module_privacy_policy_page"><![CDATA[Datenschutzerklärung aktivieren]]></item>
                <item name="wcf.acp.option.module_privacy_policy_page.description"><![CDATA[Die Datenschutzerklärung informiert Nutzer über die Erfassung personenbezogener Daten.]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 571044b92fb1981bd8807be31c6d9ddae07562f2..61674f3fd7a83185873d63bb87d11409d4ddfcd4 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1009,8 +1009,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Enable Zoom by Double-Clicking]]></item>
                <item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Default Map Position (Latitude)]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></item>
-               <item name="wcf.acp.option.google_maps_user_location_as_default"><![CDATA[Use Current User Location]]></item>
-               <item name="wcf.acp.option.google_maps_user_location_as_default.description"><![CDATA[When entering a location, the current location of the user is used as start point on the map.]]></item>
+               <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Use Current User Location]]></item>
+               <item name="wcf.acp.option.google_maps_access_user_location.description"><![CDATA[When entering a location, the current location of the user is used as start point on the map.]]></item>
                <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[Apply “Users Online” markings for usernames]]></item>
                <item name="wcf.acp.option.module_privacy_policy_page"><![CDATA[Enable Privacy Policy Page]]></item>
                <item name="wcf.acp.option.module_privacy_policy_page.description"><![CDATA[Inform users regarding the use of their personal data.]]></item>