MDL-55564 output: Single select label wasn't translated

Part of MDL-55071
UniGe · Sep 23, 2016 · 58357d4 · 58357d4
1 parent cd7a164
commit 58357d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
@@ -948,9 +948,9 @@ public function export_for_template(renderer_base $output) {
             $nothing = ['' => $this->nothing];
             $hasnothing = true;
         } else if (is_array($this->nothing)) {
-            $key = key($this->nothing);
-            if ($key === 'choose' || $key === 'choosedots') {
-                $nothing = [$key => get_string('choosedots')];
+            $nothingvalue = reset($this->nothing);
+            if ($nothingvalue === 'choose' || $nothingvalue === 'choosedots') {
+                $nothing = [key($this->nothing) => get_string('choosedots')];
             } else {
                 $nothing = $this->nothing;
             }

diff --git a/theme/noname/templates/core/single_select.mustache b/theme/noname/templates/core/single_select.mustache
@@ -6,7 +6,7 @@
         <div class="form-group">
             {{#label}}
                 <label for="{{id}}" {{#labelattributes}}{{name}}="{{value}}" {{/labelattributes}}>
-                    {{label}}
+                    {{{label}}}
                 </label>
             {{/label}}
             {{#helpicon}}