From 37b9827f341c4d0f9c2f82a40c4aae946d65dbe9 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Fri, 6 Jan 2012 08:58:56 +0000 Subject: [PATCH] MDL-31040 Correct LTR language issue and inconsistency in display --- course/lib.php | 20 ++++++++++++-------- lang/en/moodle.php | 2 ++ lib/ajax/ajaxlib.php | 7 +++---- lib/ajax/section_classes.js | 12 ++++++------ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/course/lib.php b/course/lib.php index cb5077c676953..ecfa79f4c2988 100644 --- a/course/lib.php +++ b/course/lib.php @@ -3065,11 +3065,12 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=- $str->duplicate = get_string("duplicate"); $str->hide = get_string("hide"); $str->show = get_string("show"); - $str->clicktochange = get_string("clicktochange"); - $str->forcedmode = get_string("forcedmode"); - $str->groupsnone = get_string("groupsnone"); - $str->groupsseparate = get_string("groupsseparate"); - $str->groupsvisible = get_string("groupsvisible"); + $str->groupsnone = get_string('clicktochangeinbrackets', 'moodle', get_string("groupsnone")); + $str->groupsseparate = get_string('clicktochangeinbrackets', 'moodle', get_string("groupsseparate")); + $str->groupsvisible = get_string('clicktochangeinbrackets', 'moodle', get_string("groupsvisible")); + $str->forcedgroupsnone = get_string('forcedmodeinbrackets', 'moodle', get_string("groupsnone")); + $str->forcedgroupsseparate = get_string('forcedmodeinbrackets', 'moodle', get_string("groupsseparate")); + $str->forcedgroupsvisible = get_string('forcedmodeinbrackets', 'moodle', get_string("groupsvisible")); $sesskey = sesskey(); } @@ -3103,28 +3104,31 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=- if ($mod->groupmode !== false) { if ($mod->groupmode == SEPARATEGROUPS) { $grouptitle = $str->groupsseparate; + $forcedgrouptitle = $str->forcedgroupsseparate; $groupclass = 'editing_groupsseparate'; $groupimage = $OUTPUT->pix_url('t/groups') . ''; $grouplink = $path.'/mod.php?id='.$mod->id.'&groupmode=0&sesskey='.$sesskey; } else if ($mod->groupmode == VISIBLEGROUPS) { $grouptitle = $str->groupsvisible; + $forcedgrouptitle = $str->forcedgroupsvisible; $groupclass = 'editing_groupsvisible'; $groupimage = $OUTPUT->pix_url('t/groupv') . ''; $grouplink = $path.'/mod.php?id='.$mod->id.'&groupmode=1&sesskey='.$sesskey; } else { $grouptitle = $str->groupsnone; + $forcedgrouptitle = $str->forcedgroupsnone; $groupclass = 'editing_groupsnone'; $groupimage = $OUTPUT->pix_url('t/groupn') . ''; $grouplink = $path.'/mod.php?id='.$mod->id.'&groupmode=2&sesskey='.$sesskey; } if ($mod->groupmodelink) { - $groupmode = ''. + $groupmode = ''. ''; } else { - $groupmode = ''; + 'alt="'.$forcedgrouptitle.'" />'; } } else { $groupmode = ""; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index cd0d9372eab18..7eece4edaafd2 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -236,6 +236,7 @@ $string['clickhere'] = 'Click here ...'; $string['clicktohideshow'] = 'Click to expand or collapse'; $string['clicktochange'] = 'Click to change'; +$string['clicktochangeinbrackets'] = '{$a} (Click to change)'; $string['closewindow'] = 'Close this window'; $string['collapseall'] = 'Collapse all'; $string['commentincontext'] = 'Find this comment in context'; @@ -673,6 +674,7 @@ $string['followingrequired'] = 'The following items are required'; $string['force'] = 'Force'; $string['forcedmode'] = 'forced mode'; +$string['forcedmodeinbrackets'] = '{$a} (forced mode)'; $string['forcelanguage'] = 'Force language'; $string['forceno'] = 'Do not force'; $string['forcepasswordchange'] = 'Force password change'; diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php index 37d0f29001404..f7d378f287ea0 100644 --- a/lib/ajax/ajaxlib.php +++ b/lib/ajax/ajaxlib.php @@ -149,10 +149,9 @@ function print_javascript($courseid, $return=false) { $output .= " main.portal.strings['moveleft']='".addslashes_js(get_string('moveleft'))."';\n"; $output .= " main.portal.strings['moveright']='".addslashes_js(get_string('moveright'))."';\n"; $output .= " main.portal.strings['update']='".addslashes_js(get_string('update'))."';\n"; - $output .= " main.portal.strings['groupsnone']='".addslashes_js(get_string('groupsnone'))."';\n"; - $output .= " main.portal.strings['groupsseparate']='".addslashes_js(get_string('groupsseparate'))."';\n"; - $output .= " main.portal.strings['groupsvisible']='".addslashes_js(get_string('groupsvisible'))."';\n"; - $output .= " main.portal.strings['clicktochange']='".addslashes_js(get_string('clicktochange'))."';\n"; + $output .= " main.portal.strings['groupsnone']='".addslashes_js(get_string('clicktochangeinbrackets', 'moodle', get_string('groupsnone')))."';\n"; + $output .= " main.portal.strings['groupsseparate']='".addslashes_js(get_string('clicktochangeinbrackets', 'moodle', get_string('groupsseparate')))."';\n"; + $output .= " main.portal.strings['groupsvisible']='".addslashes_js(get_string('clicktochangeinbrackets', 'moodle', get_string('groupsvisible')))."';\n"; $output .= " main.portal.strings['deletecheck']='".addslashes_js(get_string('deletecheckfull','','_var_'))."';\n"; $output .= " main.portal.strings['resource']='".addslashes_js(get_string('resource'))."';\n"; $output .= " main.portal.strings['activity']='".addslashes_js(get_string('activity'))."';\n"; diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js index 0daf295df3a1a..fc1b36d2eb1ad 100644 --- a/lib/ajax/section_classes.js +++ b/lib/ajax/section_classes.js @@ -620,9 +620,9 @@ resource_class.prototype.init_buttons = function() { } // Language strings. - var strgroupsnone = main.portal.strings['groupsnone']+' ('+main.portal.strings['clicktochange']+')'; - var strgroupsseparate = main.portal.strings['groupsseparate']+' ('+main.portal.strings['clicktochange']+')'; - var strgroupsvisible = main.portal.strings['groupsvisible']+' ('+main.portal.strings['clicktochange']+')'; + var strgroupsnone = main.portal.strings['groupsnone']; + var strgroupsseparate = main.portal.strings['groupsseparate']; + var strgroupsvisible = main.portal.strings['groupsvisible']; this.commandContainer = commandContainer; var buttons = commandContainer.getElementsByTagName('a'); @@ -846,13 +846,13 @@ resource_class.prototype.toggle_groupmode = function() { switch (this.groupmode) { case 0: - newtitle = main.portal.strings['groupsnone']+' ('+main.portal.strings['clicktochange']+')'; + newtitle = main.portal.strings['groupsnone']; break; case 1: - newtitle = main.portal.strings['groupsseparate']+' ('+main.portal.strings['clicktochange']+')'; + newtitle = main.portal.strings['groupsseparate']; break; case 2: - newtitle = main.portal.strings['groupsvisible']+' ('+main.portal.strings['clicktochange']+')'; + newtitle = main.portal.strings['groupsvisible']; break; }