diff --git a/admin/user.php b/admin/user.php index e1fc1888db9..707b5729877 100644 --- a/admin/user.php +++ b/admin/user.php @@ -162,7 +162,7 @@ echo $OUTPUT->heading("$usercount ".get_string('users')); } - $alphabet = explode(',', get_string('alphabet')); + $alphabet = explode(',', get_string('alphabet', 'langconfig')); $strall = get_string('all'); $baseurl = new moodle_url('user.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage)); diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 1f997c5ee21..04969441990 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -133,7 +133,6 @@ $string['allownone'] = 'Allow none'; $string['allownot'] = 'Do not allow'; $string['allparticipants'] = 'All participants'; $string['allteachers'] = 'All teachers'; -$string['alphabet'] = 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z'; $string['alphanumerical'] = 'Can only contain alphanumeric characters, hyphen (-) or period (.)'; $string['alreadyconfirmed'] = 'Registration has already been confirmed'; $string['always'] = 'Always'; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 3ce76b91d6f..e90e5d035c1 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5856,9 +5856,6 @@ class amos_string_manager implements string_manager { * @return string The String ! */ public function get_string($identifier, $component='', $a=NULL) { - if (empty($component)) { - $component = 'moodle'; - } // this will be replaced by merging of lang and langconfig static $langconfigstrs = array('alphabet' => 1, 'backupnameformat' => 1, 'decsep' => 1, 'firstdayofweek' => 1, 'listsep' => 1, 'locale' => 1, 'localewin' => 1, @@ -5870,10 +5867,14 @@ class amos_string_manager implements string_manager { 'thischarset' => 1, 'thisdirection' => 1, 'thislanguage' => 1, 'strftimedatetimeshort' => 1, 'thousandssep' => 1); - if ((empty($component) or $component === 'moodle') and isset($langconfigstrs[$identifier])) { + if ((empty($component)) and isset($langconfigstrs[$identifier])) { $component = 'core_langconfig'; } + if (empty($component)) { + $component = 'moodle'; + } + $lang = current_language(); $string = $this->load_component_strings($component, $lang); diff --git a/lib/tablelib.php b/lib/tablelib.php index 3aed63500f7..ba9f4e288c3 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -849,7 +849,7 @@ class flexible_table { && isset($this->columns['fullname'])) { $strall = get_string('all'); - $alpha = explode(',', get_string('alphabet')); + $alpha = explode(',', get_string('alphabet', 'langconfig')); // Bar of first initials diff --git a/user/index.php b/user/index.php index 78800729361..488eac198c8 100644 --- a/user/index.php +++ b/user/index.php @@ -578,7 +578,7 @@ $firstinitial = $table->get_initial_first(); $lastinitial = $table->get_initial_last(); $strall = get_string('all'); - $alpha = explode(',', get_string('alphabet')); + $alpha = explode(',', get_string('alphabet', 'langconfig')); // Bar of first initials