From 960838e0f13c19cd22920ee4b26cb81d70fa1a34 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Fri, 24 Feb 2012 09:19:12 +0800
Subject: [PATCH] MDL-27862 Themes: Strings updated on theme selection pages

---
 lang/en/admin.php |  5 ++++-
 theme/index.php   | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lang/en/admin.php b/lang/en/admin.php
index 6f70f51c11d..dd95248be8a 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -392,6 +392,7 @@ $string['curlrecommended'] = 'Installing the optional cURL library is highly rec
 $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';
@@ -924,6 +925,8 @@ $string['searchresults'] = 'Search results';
 $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';
@@ -985,7 +988,7 @@ $string['themedesignermode'] = 'Theme designer mode';
 $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';
diff --git a/theme/index.php b/theme/index.php
index 7424d2b3859..a2b19f16bf8 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -76,14 +76,11 @@ if ($reset and confirm_sesskey()) {
 // 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');
@@ -91,7 +88,7 @@ if (!empty($CFG->enabledevicedetection) && empty($device)) {
 
     // 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 @@ if (!empty($CFG->enabledevicedetection) && empty($device)) {
 } 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 @@ if (!empty($CFG->enabledevicedetection) && empty($device)) {
         $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);