Set up language properties in RestController::mappings, and set a def…

…ault $propertyLang for the jskos response
NatLibFi · Dec 24, 2019 · 6255be5 · 6255be5
1 parent 50b1af1
commit 6255be5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/controller/RestController.php b/controller/RestController.php
@@ -639,6 +639,7 @@ public function data($request)
      */
     public function mappings(Request $request)
     {
+        $this->setLanguageProperties($request->getLang());
         $vocab = $request->getVocab();
 
         $uri = $request->getUri();

diff --git a/model/ConceptMappingPropertyValue.php b/model/ConceptMappingPropertyValue.php
@@ -173,7 +173,7 @@ public function getNotation()
     public function asJskos($queryExVocabs = true, $lang = null, $hrefLink = null)
     {
         $propertyLabel = $this->getLabel($lang, $queryExVocabs);
-        $propertyLang = null;
+        $propertyLang = $lang;
         if (!is_string($propertyLabel)) {
             $propertyLang = $propertyLabel->getLang();
             $propertyLabel = $propertyLabel->getValue();