Skip to content
Browse files

MDL-27862 Themes: Strings updated on theme selection pages

  • Loading branch information...
1 parent 476626d commit 06d09486b5eeff60880704aa4f8aa5f0d97d1ff2 @rajeshtaneja rajeshtaneja committed Feb 24, 2012
Showing with 12 additions and 8 deletions.
  1. +4 −1 lang/en/admin.php
  2. +8 −7 theme/index.php
View
5 lang/en/admin.php
@@ -376,6 +376,7 @@
$string['curlrequired'] = 'The cURL PHP extension is now required by Moodle, in order to communicate with Moodle repositories.';
$string['curltimeoutkbitrate'] = 'Bitrate to use when calculating cURL timeouts (Kbps)';
$string['curltimeoutkbitrate_help'] = 'This setting is used to calculate an appropriate timeout during large cURL requests. As part of this calculation an HTTP HEAD request is made to determine the size of the content. Setting this to 0 disables this request from being made.';
+$string['currenttheme'] = 'Current theme';
$string['customcheck'] = 'Other checks';
$string['custommenu'] = 'Custom menu';
$string['custommenuitems'] = 'Custom menu items';
@@ -875,6 +876,8 @@
$string['sectionerror'] = 'Section error!';
$string['secureforms'] = 'Use additional form security';
$string['security'] = 'Security';
+$string['selectdevice'] = 'Select device';
+$string['selecttheme'] = 'Select theme for {$a} device';
$string['server'] = 'Server';
$string['serverchecks'] = 'Server checks';
$string['serverlimit'] = 'Server limit';
@@ -938,7 +941,7 @@
$string['themelist'] = 'Theme list';
$string['themenoselected'] = 'No theme selected';
$string['themeresetcaches'] = 'Clear theme caches';
-$string['themeselect'] = 'Select theme';
+$string['themeselect'] = 'Change theme';
$string['themeselector'] = 'Theme selector';
$string['themesettings'] = 'Theme settings';
$string['therewereerrors'] = 'There were errors in your data';
View
15 theme/index.php
@@ -76,22 +76,19 @@
// Otherwise, show either a list of devices, or is enabledevicedetection set to no or a
// device is specified show a list of themes.
-echo $OUTPUT->header('themeselector');
-echo $OUTPUT->heading(get_string('themes'));
-
-echo $OUTPUT->single_button(new moodle_url('index.php', array('sesskey' => sesskey(), 'reset' => 1)), get_string('themeresetcaches', 'admin'));
-
$table = new html_table();
$table->data = array();
+$heading = '';
if (!empty($CFG->enabledevicedetection) && empty($device)) {
+ $heading = get_string('selectdevice', 'admin');
// Display a list of devices that a user can select a theme for.
$strthemenotselected = get_string('themenoselected', 'admin');
$strthemeselect = get_string('themeselect', 'admin');
// Display the device selection screen
$table->id = 'admindeviceselector';
- $table->head = array(get_string('devicetype', 'admin'), get_string('theme'), get_string('info'));
+ $table->head = array(get_string('devicetype', 'admin'), get_string('currenttheme', 'admin'), get_string('info'));
$devices = get_device_type_list();
foreach ($devices as $device) {
@@ -132,7 +129,7 @@
} else {
// Either a device has been selected of $CFG->enabledevicedetection is off so display a list
// of themes to select.
-
+ $heading = get_string('selecttheme', 'admin', $device);
if (empty($device)) {
// if $CFG->enabledevicedetection is off this will return 'default'
$device = get_device_type();
@@ -194,6 +191,10 @@
$table->rowclasses[$themename] = join(' ', $rowclasses);
}
}
+echo $OUTPUT->header('themeselector');
+echo $OUTPUT->heading($heading);
+
+echo $OUTPUT->single_button(new moodle_url('index.php', array('sesskey' => sesskey(), 'reset' => 1)), get_string('themeresetcaches', 'admin'));
echo html_writer::table($table);

0 comments on commit 06d0948

Please sign in to comment.
Something went wrong with that request. Please try again.