Commit c93aef8d authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1492663: Need both lowercase and uppercase journal strings



behatnotneeded: the change makes the string identifier 'blogs' be 'Blogs'
and the output should still show 'Journals' which we test for

Change-Id: I8342d535cf0ee169f8d22a89a4ea071fb22da64c
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 12a063c6
......@@ -180,7 +180,7 @@ class PluginBlocktypeBlog extends PluginBlocktype {
$elements[] = array(
'type' => 'html',
'name' => 'notice',
'value' => '<div class="metadata">' . get_string('blogcopiedfromanotherview', 'artefact.blog', get_string('blog', 'artefact.blog')) . '</div>',
'value' => '<div class="metadata">' . get_string('blogcopiedfromanotherview', 'artefact.blog', get_string('Blog', 'artefact.blog')) . '</div>',
);
}
return $elements;
......@@ -229,7 +229,7 @@ class PluginBlocktypeBlog extends PluginBlocktype {
return array(
'name' => 'artefactid',
'type' => 'artefactchooser',
'title' => get_string('blog', 'artefact.blog'),
'title' => get_string('Blog', 'artefact.blog'),
'defaultvalue' => $default,
'blocktype' => 'blog',
'limit' => 10,
......
......@@ -161,7 +161,7 @@ class PluginBlocktypeRecentposts extends PluginBlocktype {
return array(
'name' => 'artefactids',
'type' => 'artefactchooser',
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
'defaultvalue' => $default,
'blocktype' => 'recentposts',
'limit' => 10,
......
......@@ -58,7 +58,7 @@ class HtmlExportBlog extends HtmlExportArtefactPlugin {
$smarty->assign('stryouhaveblogs', $stryouhaveblogs);
return array(
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
'description' => $smarty->fetch('export:html/blog:summary.tpl'),
);
}
......
......@@ -33,7 +33,7 @@ $blogs = (object) array(
$subsectionheading = false;
$institutionname = $groupid = null;
if ($institution = param_alphanum('institution', null)) {
define('TITLE', get_string('blogs','artefact.blog'));
define('TITLE', get_string('Blogs','artefact.blog'));
if ($institution == 'mahara') {
$institutionname = $institution;
if (!($USER->get('admin'))) {
......@@ -54,11 +54,11 @@ if ($institution = param_alphanum('institution', null)) {
else if ($groupid = param_alphanum('group', null)) {
$blogs->group = $groupid;
$group = get_record('group', 'id', $groupid, 'deleted', 0);
$subsectionheading = get_string('blogs','artefact.blog');
$subsectionheading = get_string('Blogs','artefact.blog');
define('TITLE', $group->name);
}
else {
define('TITLE', get_string('blogs','artefact.blog'));
define('TITLE', get_string('Blogs','artefact.blog'));
}
PluginArtefactBlog::set_blog_nav($institution, $institutionname, $groupid);
......
......@@ -13,8 +13,10 @@ defined('INTERNAL') || die();
$string['pluginname'] = 'Journals';
$string['blog'] = 'Journal';
$string['blogs'] = 'Journals';
$string['Blog'] = 'Journal';
$string['Blogs'] = 'Journals';
$string['blog'] = 'journal';
$string['blogs'] = 'journals';
$string['siteblogs'] = 'Site journals';
$string['institutionblogs'] = 'Institution journals';
$string['groupblogs'] = 'Group journals';
......
......@@ -35,13 +35,13 @@ class PluginArtefactBlog extends PluginArtefact {
$map['manageinstitutions/blogs'] = array(
'path' => 'manageinstitutions/blogs',
'url' => 'artefact/blog/index.php?institution=1',
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
'weight' => 75,
);
$map['configsite/blogs'] = array(
'path' => 'configsite/blogs',
'url' => 'artefact/blog/index.php?institution=mahara',
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
'weight' => 65,
);
......@@ -83,7 +83,7 @@ class PluginArtefactBlog extends PluginArtefact {
'path' => 'content/blogs',
'weight' => 40,
'url' => 'artefact/blog/index.php',
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
);
return array('content/blogs' => $tab);
}
......
......@@ -21,7 +21,7 @@ require_once('license.php');
safe_require('artefact', 'blog');
safe_require('artefact', 'file');
if (!PluginArtefactBlog::is_active()) {
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('blog','artefact.blog')));
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('Blog','artefact.blog')));
}
/*
* For a new post, the 'blog' parameter will be set to the blog's
......
......@@ -20,7 +20,7 @@ require_once('pieforms/pieform.php');
require_once('license.php');
safe_require('artefact', 'blog');
if (!PluginArtefactBlog::is_active()) {
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('blog','artefact.blog')));
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('Blog','artefact.blog')));
}
$id = param_integer('id');
......
......@@ -20,7 +20,7 @@ require(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
safe_require('artefact', 'blog');
require_once(get_config('libroot') . 'pieforms/pieform.php');
if (!PluginArtefactBlog::is_active()) {
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('blog','artefact.blog')));
throw new AccessDeniedException(get_string('plugindisableduser', 'mahara', get_string('Blog','artefact.blog')));
}
$id = param_integer('id', null);
......
......@@ -1834,7 +1834,7 @@ function group_get_menu_tabs() {
$menu['blogs'] = array(
'path' => 'groups/blogs',
'url' => 'artefact/blog/index.php?group=' . $group->id,
'title' => get_string('blogs', 'artefact.blog'),
'title' => get_string('Blogs', 'artefact.blog'),
'weight' => 65,
);
if (group_role_can_edit_views($group, $role)) {
......
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