From b4553e9bfea66a6144a743b89484e2e67bbcda77 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 29 Oct 2021 15:16:07 +0200 Subject: [PATCH] wait #4627 @1.5 --- .../FluidbookTranslate/ExcelExportOperation.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelExportOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelExportOperation.php index f865e988a..06756c6f7 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelExportOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelExportOperation.php @@ -84,7 +84,16 @@ trait ExcelExportOperation protected function _getTranslations($alldata, $locale) { - $data = $alldata[$locale]; + if (isset($alldata[$locale])) { + $data = $alldata[$locale]; + } else { + $e = explode('_', $locale); + if (isset($alldata[$e[0]])) { + $data = $alldata[$e[0]]; + } else { + $data = $alldata['en']; + } + } $res = []; foreach ($data as $k => $v) { if ($k === 'k') { -- 2.39.5