From b3c789463137a6577671942a996c31baeccdcdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= <lahmann@ub.uni-leipzig.de>
Date: Mon, 23 May 2016 18:22:20 +0200
Subject: [PATCH] refs #7693: * fixed wrong translation strings in acquisition
form and action
---
module/finc/src/finc/Controller/MyResearchController.php | 4 ++--
themes/finc/templates/myresearch/acquisition.phtml | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/module/finc/src/finc/Controller/MyResearchController.php b/module/finc/src/finc/Controller/MyResearchController.php
index d7d389f6aaa..4f0885961f1 100644
--- a/module/finc/src/finc/Controller/MyResearchController.php
+++ b/module/finc/src/finc/Controller/MyResearchController.php
@@ -60,8 +60,8 @@ class MyResearchController extends \VuFind\Controller\MyResearchController
private function _getSubjectList()
{
if (count($this->_subjectlist) <= 0) {
- $this->_subjectlist = (isset($this->getConfig()->CustomSite->subject)
- ? $this->getConfig()->CustomSite->subject->toArray() : []
+ $this->_subjectlist = (isset($this->getConfig()->CustomSite->field_of_study)
+ ? $this->getConfig()->CustomSite->field_of_study->toArray() : []
);
}
return $this->_subjectlist;
diff --git a/themes/finc/templates/myresearch/acquisition.phtml b/themes/finc/templates/myresearch/acquisition.phtml
index c9774d6c92b..dd62b072e21 100644
--- a/themes/finc/templates/myresearch/acquisition.phtml
+++ b/themes/finc/templates/myresearch/acquisition.phtml
@@ -14,14 +14,13 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
<form class="form-horizontal" method="post" action="" name="acquisitionForm">
<h6><?=$this->transEsc('PDA::pda_form_suggestions_limit') ?></h6>
<div class="form-group row">
- <label class="col-sm-3 medium-3 columns control-label" for="subject"><?=$this->transEsc('PDA::pda_form_branch_of_study_label') ?><span class="required">*</span></label>
+ <label class="col-sm-3 medium-3 columns control-label" for="subject"><?=$this->transEsc('PDA::pda_form_field_of_study_label') ?><span class="required">*</span></label>
<div class="col-sm-9 medium-9 columns">
<select name="subject" class="form-control auto">
- <option value="-1"><?=$this->transEsc('PDA::pda_form_subject_text') ?></option>
+ <option value="-1"><?=$this->transEsc('PDA::pda_form_field_of_study_text') ?></option>
<? if (isset($subjectlist) && is_array($subjectlist)): ?>
<? foreach ($subjectlist as $value): ?>
- <option
- value="<?= $value ?>" <? if (isset($values['subject']) && ($values['subject'] != '-1') && ($values['subject'] == $value)): ?> selected="selected"<? endif; ?>><?= $this->transEsc('PDA::subject_' . $value) ?></option>
+ <option value="<?=$this->transEsc("PDA::fos_" . $value)?>" <? if (isset($values['subject']) && ($values['subject'] != '-1') && ($values['subject'] == $value)): ?> selected="selected"<? endif; ?>><?= $this->transEsc('PDA::fos_' . $value) ?></option>
<? endforeach; ?>
<? endif; ?>
</select>
--
GitLab