From 3e0e49ffaa01998b8a357ef0bd453309c74ec580 Mon Sep 17 00:00:00 2001 From: sg3des Date: Thu, 5 Jul 2018 23:24:27 +0300 Subject: [PATCH] fix search return localized values --- i18n.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/i18n.go b/i18n.go index be054e5..199259c 100644 --- a/i18n.go +++ b/i18n.go @@ -322,6 +322,7 @@ func (i18n *I18n) ConfigureQorResource(res resource.Resourcer) { for key, translation := range translations { if (keyword == "") || (strings.Index(strings.ToLower(translation.Key), keyword) != -1 || strings.Index(strings.ToLower(translation.Value), keyword) != -1) { + if _, ok := matchedTranslations[key]; !ok { var t = matchedTranslation{ Key: key, @@ -336,6 +337,12 @@ func (i18n *I18n) ConfigureQorResource(res resource.Resourcer) { } } + if localeTranslations, ok := translationsMap[editingLocale]; ok { + if v, ok := localeTranslations[key]; ok { + t.EditingValue = v.Value + } + } + matchedTranslations[key] = t keys = append(keys, key) } @@ -365,7 +372,7 @@ func (i18n *I18n) ConfigureQorResource(res resource.Resourcer) { } if pagination.CurrentPage > 0 { - pagination.Pages = pagination.Total / pagination.PerPage + pagination.Pages = pagination.Total/pagination.PerPage + 1 } context.Searcher.Pagination = pagination