MDL-7242 eliminate last use of location to refer to city in profile where

it causes problems for translators
merged from MOODLE_19_STABLE

diff --git a/lib/weblib.php b/lib/weblib.php
index b55943e0906a6d7205c232617489a6eb0cea9a79..ce20d1fffa3c241c86868f1eae5638c64c31038f 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4377,7 +4377,7 @@ function print_user($user, $course, $messageselect=false, $return=false) {
     if (empty($string)) {     // Cache all the strings for the rest of the page
 
         $string->email       = get_string('email');
-        $string->location    = get_string('location');
+        $string->city = get_string('city');
         $string->lastaccess  = get_string('lastaccess');
         $string->activity    = get_string('activity');
         $string->unenrol     = get_string('unenrol');
@@ -4424,7 +4424,7 @@ has_capability('moodle/course:viewhiddenuserfields', $context)) {
         $output .= $string->email .': <a href="mailto:'. $user->email .'">'. $user->email .'</a><br />';
     }
     if (($user->city or $user->country) and (!isset($hiddenfields['city']) or !isset($hiddenfields['country']))) {
-        $output .= $string->location .': ';
+        $output .= $string->city .': ';
         if ($user->city && !isset($hiddenfields['city'])) {
             $output .= $user->city;
         }