From 6ae5ec0348ee3202a519535c6fb7eb4c9d273f9f Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 23 Mar 2015 18:42:31 +0100
Subject: [PATCH] Improve name of user location map option

---
 com.woltlab.wcf/option.xml                         | 2 +-
 com.woltlab.wcf/templates/googleMapsJavaScript.tpl | 2 +-
 wcfsetup/install/files/js/WCF.Location.js          | 4 ++--
 wcfsetup/install/lang/de.xml                       | 4 ++--
 wcfsetup/install/lang/en.xml                       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index f3b8b7ccbf..7d8d0fca51 100644
--- 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 84fdd5284e..4b4ecf9487 100644
--- 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 001b43a6e5..1bd98036d5 100644
--- 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 a02308591d..3bd871d322 100644
--- 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 571044b92f..61674f3fd7 100644
--- 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>
-- 
2.20.1