fix search return localized values

qor · Jul 5, 2018 · 3e0e49f · 3e0e49f
1 parent 05c1410
commit 3e0e49f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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