Merge "Bug 1820927: language string clash in view.php lang file"

htdocs/lang/en.utf8/view.php

@@ -471,9 +471,9 @@ $string['mostcomments1'] = 'Most comments';
 
 // View types
 $string['dashboard'] = 'Dashboard';
-$string['profile'] = 'Profile';
-$string['portfolio'] = 'Portfolio';
-$string['grouphomepage'] = 'Group homepage';
+$string['Profile'] = 'Profile';
+$string['Portfolio'] = 'Portfolio';
+$string['Grouphomepage'] = 'Group homepage';
 
 $string['grouphomepagedescription'] = 'The group homepage contains the content that appears on the "About" tab for this group';
 $string['pageaccessrules'] = 'Page access rules';

htdocs/lib/group.php

@@ -2570,7 +2570,7 @@ function install_system_grouphomepage_view() {
         'template'    =>  View::SITE_TEMPLATE,
         'numrows'     => 1,
         'columnsperrow' => array((object)array('row' => 1, 'columns' => 1)),
-        'title'       => get_string('grouphomepage', 'view'),
+        'title'       => get_string('Grouphomepage', 'view'),
     ));
     $view->set_access(array(array(
         'type' => 'loggedin'

htdocs/lib/statistics.php

@@ -2680,7 +2680,7 @@ function view_type_graph($type = null) {
     if (count($viewtypes) > 1) {
         $dataarray = array();
         foreach ($viewtypes as &$t) {
-            $dataarray[get_string($t->type, 'view')] = $t->views;
+            $dataarray[get_string(ucfirst($t->type), 'view')] = $t->views;
         }
         arsort($dataarray);
 

htdocs/lib/view.php

@@ -6437,7 +6437,7 @@ class View {
             return get_string('dashboardviewtitle', 'view');
         }
         if ($this->type == 'grouphomepage') {
-            return get_string('grouphomepage', 'view');
+            return get_string('Grouphomepage', 'view');
         }
         return $this->title;
     }

htdocs/view/blocks.php

@@ -86,7 +86,7 @@ else if ($view->get('type') == 'dashboard') {
     define('TITLE', $title );
 }
 else if ($view->get('type') == 'grouphomepage') {
-    $title = get_string('grouphomepage', 'view');
+    $title = get_string('Grouphomepage', 'view');
     if ($view->get('template') != View::SITE_TEMPLATE) {
         $groupurl = group_homepage_url(get_group_by_id($view->get('group'), true), false);
     }