From 4e32add0ac059e7c7b2c76b18f18b054837589bc Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Fri, 12 Aug 2016 14:45:45 +0800
Subject: [PATCH] MDL-55340 mod_feedback: export question labels

This was present in export in 3.0 but got lost during export
refactoring in 3.1
---
 mod/feedback/classes/complete_form.php   |  4 ++--
 mod/feedback/classes/responses_table.php | 10 +++++++++-
 mod/feedback/lang/en/feedback.php        |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mod/feedback/classes/complete_form.php b/mod/feedback/classes/complete_form.php
index 2bca6e48831..d933b500e87 100644
--- a/mod/feedback/classes/complete_form.php
+++ b/mod/feedback/classes/complete_form.php
@@ -399,8 +399,8 @@ class mod_feedback_complete_form extends moodleform {
      */
     protected function add_item_label($item, $element) {
         if (strlen($item->label) && ($this->mode == self::MODE_EDIT || $this->mode == self::MODE_VIEW_TEMPLATE)) {
-            $name = $element->getLabel();
-            $name = '('.format_string($item->label).') '.$name;
+            $name = get_string('nameandlabelformat', 'mod_feedback',
+                (object)['label' => format_string($item->label), 'name' => $element->getLabel()]);
             $element->setLabel($name);
         }
     }
diff --git a/mod/feedback/classes/responses_table.php b/mod/feedback/classes/responses_table.php
index 663c3c54f36..ea0b1eba52b 100644
--- a/mod/feedback/classes/responses_table.php
+++ b/mod/feedback/classes/responses_table.php
@@ -314,7 +314,15 @@ class mod_feedback_responses_table extends table_sql {
 
             $tablecolumns[] = "val{$nr}";
             $itemobj = feedback_get_item_class($item->typ);
-            $tableheaders[] = $itemobj->get_display_name($item, $headernamepostfix);
+            $columnheader = $itemobj->get_display_name($item, $headernamepostfix);
+            if (!$this->is_downloading()) {
+                $columnheader = shorten_text($columnheader);
+            }
+            if (strval($item->label) !== '') {
+                $columnheader = get_string('nameandlabelformat', 'mod_feedback',
+                    (object)['label' => format_string($item->label), 'name' => $columnheader]);
+            }
+            $tableheaders[] = $columnheader;
         }
 
         // Add 'Delete entry' column.
diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 2cc4ebb6062..ae333ebe0c6 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -195,6 +195,7 @@ $string['multiplesubmit'] = 'Allow multiple submissions';
 $string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
 $string['name'] = 'Name';
 $string['name_required'] = 'Name required';
+$string['nameandlabelformat'] = '({$a->label}) {$a->name}';
 $string['next_page'] = 'Next page';
 $string['no_handler'] = 'No action handler exists for';
 $string['no_itemlabel'] = 'No label';