From 1f92f294dd799e71a686682a3b83a8e048f70d3f Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sun, 19 Sep 2021 13:35:44 +0200 Subject: [PATCH] People: Normalize names #22 --- frontend/package-lock.json | 12 ++-- frontend/src/component/navigation.vue | 28 ++++---- frontend/src/dialog/photo/edit.vue | 4 +- frontend/src/locales/de.mo | Bin 37080 -> 37081 bytes frontend/src/locales/de.po | 68 ++++++++++-------- frontend/src/locales/translations.json | 2 +- frontend/src/locales/translations.pot | 52 +++++++------- frontend/src/model/rest.js | 9 +++ frontend/src/model/subject.js | 6 ++ frontend/src/pages/people.vue | 9 ++- frontend/src/pages/settings/general.vue | 36 +++++----- frontend/tests/unit/model/rest_test.js | 2 + go.mod | 4 +- go.sum | 8 +-- internal/api/photo_search_geo.go | 2 +- internal/api/subject.go | 6 ++ internal/entity/label.go | 8 +-- internal/entity/marker.go | 2 +- internal/entity/subject.go | 16 +++-- .../{geo_search.go => photo_search_geo.go} | 18 ++--- ...earch_test.go => photo_search_geo_test.go} | 14 ++-- internal/search/photos_geo.go | 2 +- internal/search/photos_geo_test.go | 34 ++++----- pkg/txt/names.go | 37 ++++++++++ pkg/txt/names_test.go | 39 ++++++++++ 25 files changed, 267 insertions(+), 151 deletions(-) rename internal/form/{geo_search.go => photo_search_geo.go} (82%) rename internal/form/{geo_search_test.go => photo_search_geo_test.go} (75%) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c193ea6af..b7f863ce3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1887,9 +1887,9 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=" }, "node_modules/@types/node": { - "version": "16.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz", - "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==" + "version": "16.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.3.tgz", + "integrity": "sha512-5UmMznRvrwKqisJ458JbNoq3AyXHxlAKMkGtNe143W1SkZ1BVgvCHYBzn7wD66J+smE+BolqA1mes5BeXlWY6w==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -15535,9 +15535,9 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=" }, "@types/node": { - "version": "16.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz", - "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==" + "version": "16.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.3.tgz", + "integrity": "sha512-5UmMznRvrwKqisJ458JbNoq3AyXHxlAKMkGtNe143W1SkZ1BVgvCHYBzn7wD66J+smE+BolqA1mes5BeXlWY6w==" }, "@types/parse-json": { "version": "4.0.0", diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue index a9b6fe812..7f6611760 100644 --- a/frontend/src/component/navigation.vue +++ b/frontend/src/component/navigation.vue @@ -181,6 +181,20 @@ + + + person + + + + + People + {{ config.count.people }} + + + + favorite @@ -209,20 +223,6 @@ - - - emoji_people - - - - - People - {{ config.count.people }} - - - - date_range diff --git a/frontend/src/dialog/photo/edit.vue b/frontend/src/dialog/photo/edit.vue index 3d311d40a..061465c89 100644 --- a/frontend/src/dialog/photo/edit.vue +++ b/frontend/src/dialog/photo/edit.vue @@ -52,9 +52,9 @@ - emoji_people + people_alt