Commit 674ba4f0 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Language changes in menu & page titles: remove 'My' & change 'Home' to 'Dashboard'


Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent d4c7762c
......@@ -34,7 +34,7 @@ define('SECTION_PAGE', 'index');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
safe_require('artefact', 'blog');
define('TITLE', get_string('myblogs','artefact.blog'));
define('TITLE', get_string('blogs','artefact.blog'));
if ($delete = param_integer('delete', 0)) {
$blog = artefact_instance_from_id($delete);
......
......@@ -77,8 +77,6 @@ $string['insertimage'] = 'Insert image';
$string['moreoptions'] = 'More options';
$string['mustspecifytitle'] = 'You must specify a title for your post';
$string['mustspecifycontent'] = 'You must specify some content for your post';
$string['myblogs'] = 'My Blogs';
$string['myblog'] = 'My Blog';
$string['name'] = 'Name';
$string['newattachmentsexceedquota'] = 'The total size of the new files that you have uploaded to this post would exceed your quota. You may be able to save the post if you remove some of the attachments you have just added.';
$string['newblog'] = 'New Blog';
......
<h3>My Blogs</h3>
<h3>Blogs</h3>
<p>A blog is a journal-like tool that allows you to record your thoughts and experiences.</p>
<p>By default, your blogs can only be seen by you. By adding a blog to a view that is shared with others you can allow people to read it and post comments.</p>
<p>You can have as many different blogs as you want.</p>
......@@ -55,11 +55,11 @@ class PluginArtefactBlog extends PluginArtefact {
);
if ($USER->get_account_preference('multipleblogs')) {
$tab['url'] = 'artefact/blog/';
$tab['title'] = get_string('myblogs', 'artefact.blog');
$tab['title'] = get_string('blogs', 'artefact.blog');
}
else {
$tab['url'] = 'artefact/blog/view/';
$tab['title'] = get_string('myblog', 'artefact.blog');
$tab['title'] = get_string('blog', 'artefact.blog');
}
return array($tab);
}
......
......@@ -32,7 +32,7 @@ define('SECTION_PLUGINNAME', 'file');
define('SECTION_PAGE', 'index');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('myfiles', 'artefact.file'));
define('TITLE', get_string('Files', 'artefact.file'));
safe_require('artefact', 'file');
$form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefact/file/index.php'));
......
<h3>My Files</h3>
<h3>Files</h3>
<p>Your files area is a repository for folders and files to use within your portfolio.</p>
<p>The number of files you may upload into your files area is dependant on your set file storage limit which is displayed in the quota box on the right of the screen.</p>
<p>You can use drag and drop to organise your files and folders.</p>
......
<h3>Site Files</h3>
<p>The Site Files area works in nearly the same way as the main site's My Files area. Files uploaded to this area are available to any logged in user and where placed in the 'public' folder, are available to any user with the correct URL.</p>
<p>The Site Files area works in nearly the same way as a user's Files area. Files uploaded to this area are available to any logged in user and where placed in the 'public' folder, are available to any user with the correct URL.</p>
......@@ -52,7 +52,7 @@ class PluginArtefactFile extends PluginArtefact {
array(
'path' => 'myportfolio/files',
'url' => 'artefact/file/',
'title' => get_string('myfiles', 'artefact.file'),
'title' => get_string('Files', 'artefact.file'),
'weight' => 40,
),
array(
......
......@@ -30,7 +30,6 @@ defined('INTERNAL') || die();
$string['pluginname'] = 'Profile';
$string['profile'] = 'Profile';
$string['myfiles'] = 'My Files';
$string['mandatory'] = 'Mandatory';
$string['public'] = 'Public';
......
......@@ -35,7 +35,7 @@ define('SECTION_PAGE', 'index');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
safe_require('artefact', 'plans');
define('TITLE', get_string('myplans','artefact.plans'));
define('TITLE', get_string('Plans','artefact.plans'));
// offset and limit for pagination
$offset = param_integer('offset', 0);
......@@ -55,7 +55,7 @@ $smarty->assign_by_ref('plans', $plans);
$smarty->assign('strnoplansaddone',
get_string('noplansaddone', 'artefact.plans',
'<a href="' . get_config('wwwroot') . 'artefact/plans/new.php">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string("myplans", "artefact.plans")));
$smarty->assign('PAGEHEADING', hsc(get_string("Plans", "artefact.plans")));
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:plans:index.tpl');
......
......@@ -34,12 +34,12 @@ $string['deletethisplan'] = 'Delete plan: \'%s\'';
$string['editplan'] = 'Edit Plan';
$string['editingplan'] = 'Editing Plan';
$string['managetasks'] = 'Manage tasks';
$string['myplans'] = 'My Plans';
$string['newplan'] = 'New plan';
$string['noplansaddone'] = 'No plans yet. %sAdd one%s!';
$string['noplans'] = 'No plans to display';
$string['plan'] = 'Plan';
$string['plans'] = 'Plans';
$string['Plans'] = 'Plans';
$string['plandeletedsuccessfully'] = 'Plan deleted successfully.';
$string['plannotdeletedsuccessfully'] = 'There was an error deleting plan.';
$string['plannotsavedsuccessfully'] = 'There was an error submitting this form. Please check the marked fields and try again.';
......@@ -48,7 +48,7 @@ $string['planstasks'] = 'Plan \'%s\' tasks.';
$string['planstasksdesc'] = 'Add tasks below or using the button to the right to begin to build your plan.';
$string['saveplan'] = 'Save plan';
$string['title'] = 'Title';
$string['titledesc'] = 'The title will be used to display each task in the My Plans blocktype.';
$string['titledesc'] = 'The title will be used to display each task in the Plans blocktype.';
/* Tasks */
$string['alltasks'] = 'All tasks';
......
......@@ -48,7 +48,7 @@ class PluginArtefactPlans extends PluginArtefact {
array(
'path' => 'myportfolio/plans',
'url' => 'artefact/plans/',
'title' => get_string('myplans', 'artefact.plans'),
'title' => get_string('Plans', 'artefact.plans'),
'weight' => 60,
),
);
......
......@@ -35,7 +35,7 @@ define('SECTION_PAGE', 'index');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once('pieforms/pieform.php');
require_once('collection.php');
define('TITLE', get_string('mycollections', 'collection'));
define('TITLE', get_string('Collections', 'collection'));
// offset and limit for pagination
$offset = param_integer('offset', 0);
......@@ -73,7 +73,7 @@ $smarty->assign('collections', $data->data);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('strnocollectionsaddone',
get_string('nocollectionsaddone','collection','<a href="' . get_config('wwwroot') . 'collection/edit.php?new=1">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string('mycollections', 'collection')));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->display('collection/index.tpl');
?>
......@@ -30,11 +30,11 @@ define('PUBLIC', 1);
define('MENUITEM', '');
define('HOME', 1);
require('init.php');
define('TITLE', get_string('home'));
// Check for whether the user is logged in, before processing the page. After
// this, we can guarantee whether the user is logged in or not for this page.
if (!$USER->is_logged_in()) {
define('TITLE', get_string('home'));
$pagename = 'loggedouthome';
$lang = param_alphanumext('lang', null);
if (!empty($lang)) {
......@@ -43,6 +43,7 @@ if (!$USER->is_logged_in()) {
}
}
else {
define('TITLE', get_string('dashboard', 'view'));
$pagename = 'home';
}
......
......@@ -291,7 +291,7 @@ $string['whocancreatepublicgroupsdescription'] = 'Which users will be able to ma
$string['about'] = 'About';
$string['discardpageedits'] = 'Discard your changes to this page?';
$string['editsitepagespagedescription'] = 'Here you can edit the content of some pages around the site, such as the homepage (for logged in and out users separately), and the pages linked to in the footer.';
$string['home'] = 'Home';
$string['home'] = 'Home (Dashboard)';
$string['loadsitepagefailed'] = 'Failed to load site page';
$string['loggedouthome'] = 'Logged out home';
$string['pagename'] = 'Page name';
......
......@@ -43,6 +43,7 @@ $string['back'] = 'Back';
$string['collection'] = 'collection';
$string['Collection'] = 'Collection';
$string['collections'] = 'Collections';
$string['Collections'] = 'Collections';
$string['collectionaccess'] = 'Collection access';
$string['collectionaccesseditedsuccessfully'] = 'Collection access saved successfully';
$string['collectioneditaccess'] = 'You are editing access for %d Views in this Collection';
......@@ -69,7 +70,6 @@ $string['emptycollectionnoeditaccess'] = 'You cannot edit access to empty collec
$string['emptycollection'] = 'Empty collection';
$string['incorrectaccesstype'] = 'Attention: access type \'secret URL\' is unavailable to be set as override access type. This has been ignored and existing view accesses retained. However, if the selected override view had other access types these have been used and existing view access types removed.';
$string['manageviews'] = 'Manage views';
$string['mycollections'] = 'My Collections';
$string['name'] = 'Collection name';
$string['newcollection'] = 'New Collection';
$string['nocollectionsaddone'] = 'No collections yet. %sAdd one%s!';
......
......@@ -467,7 +467,6 @@ $string['unknownerror'] = 'An unknown error occurred (0x20f91a0)';
// menu
$string['home'] = 'Home';
$string['myportfolio'] = 'My Portfolio';
$string['myviews'] = ' My Views';
$string['settings'] = 'Settings';
$string['myfriends'] = 'My Friends';
$string['findfriends'] = 'Find Friends';
......
......@@ -55,7 +55,6 @@ $string['showdescription'] = 'Show Description';
// my views
$string['artefacts'] = 'Artefacts';
$string['myviews'] = 'My Views';
$string['groupviews'] = 'Group Views';
$string['institutionviews'] = 'Institution Views';
$string['reallyaddaccesstoemptyview'] = 'Your View contains no blocks. Do you really want to give these users access to the View?';
......
......@@ -1954,7 +1954,7 @@ function mahara_standard_nav() {
array(
'path' => '',
'url' => '',
'title' => get_string('home'),
'title' => get_string('dashboard', 'view'),
'weight' => 10,
'accesskey' => 'h',
),
......@@ -1968,7 +1968,7 @@ function mahara_standard_nav() {
array(
'path' => 'myportfolio/views',
'url' => 'view/',
'title' => get_string('myviews'),
'title' => get_string('Views', 'view'),
'weight' => 10,
),
array(
......@@ -1987,7 +1987,7 @@ function mahara_standard_nav() {
array(
'path' => 'myportfolio/collection',
'url' => 'collection/',
'title' => get_string('mycollections', 'collection'),
'title' => get_string('Collections', 'collection'),
'weight' => 20,
),
array(
......
......@@ -36,7 +36,7 @@ require(dirname(dirname(__FILE__)) . '/init.php');
require_once(get_config('libroot') . 'view.php');
require_once('pieforms/pieform.php');
require_once('group.php');
define('TITLE', get_string('myviews', 'view'));
define('TITLE', get_string('Views', 'view'));
$limit = param_integer('limit', 10);
$offset = param_integer('offset', 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment