From 4ddf241a6c53134ab851f309b76d26fb4c986805 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Mon, 6 Jul 2020 14:35:25 +0200
Subject: [PATCH] UX: Rename "analog" to "scan"

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 frontend/src/component/navigation.vue | 4 ++--
 frontend/src/dialog/photo/info.vue    | 6 +++---
 frontend/src/model/photo.js           | 2 +-
 internal/entity/photo.go              | 2 +-
 internal/form/photo.go                | 2 +-
 internal/form/photo_search.go         | 2 +-
 internal/query/photo_results.go       | 2 +-
 internal/query/photo_search.go        | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue
index c0c12668a..f77b5f82f 100644
--- a/frontend/src/component/navigation.vue
+++ b/frontend/src/component/navigation.vue
@@ -98,10 +98,10 @@
             </v-list-tile-content>
           </v-list-tile>
 
-          <v-list-tile :to="{name: 'photos', query: { q: 'analog:true' }}" :exact="true" @click="">
+          <v-list-tile :to="{name: 'photos', query: { q: 'scan:true' }}" :exact="true" @click="">
             <v-list-tile-content>
               <v-list-tile-title>
-                <translate key="Analog">Analog</translate>
+                <translate key="Scans">Scans</translate>
               </v-list-tile-title>
             </v-list-tile-content>
           </v-list-tile>
diff --git a/frontend/src/dialog/photo/info.vue b/frontend/src/dialog/photo/info.vue
index 6d9d20884..c072eeb5f 100644
--- a/frontend/src/dialog/photo/info.vue
+++ b/frontend/src/dialog/photo/info.vue
@@ -103,14 +103,14 @@
         </tr>
         <tr>
           <td>
-            <translate key="Analog">Analog</translate>
+            <translate key="Scan">Scan</translate>
           </td>
           <td>
             <v-switch
                     @change="save"
                     hide-details
-                    v-model="model.Analog"
-                    :label="model.Analog ? $gettext('Yes') : $gettext('No')"
+                    v-model="model.Scan"
+                    :label="model.Scan ? $gettext('Yes') : $gettext('No')"
             ></v-switch>
           </td>
         </tr>
diff --git a/frontend/src/model/photo.js b/frontend/src/model/photo.js
index eb04b85ce..8f1b2ae77 100644
--- a/frontend/src/model/photo.js
+++ b/frontend/src/model/photo.js
@@ -54,7 +54,7 @@ export class Photo extends RestModel {
             Type: TypeImage,
             Favorite: false,
             Private: false,
-            Analog: false,
+            Scan: false,
             TakenAt: "",
             TakenAtLocal: "",
             TakenSrc: "",
diff --git a/internal/entity/photo.go b/internal/entity/photo.go
index 1bf805f67..0b101334e 100644
--- a/internal/entity/photo.go
+++ b/internal/entity/photo.go
@@ -49,7 +49,7 @@ type Photo struct {
 	OriginalName     string       `gorm:"type:varbinary(768);" json:"OriginalName" yaml:"OriginalName,omitempty"`
 	PhotoFavorite    bool         `json:"Favorite" yaml:"Favorite,omitempty"`
 	PhotoPrivate     bool         `json:"Private" yaml:"Private,omitempty"`
-	PhotoAnalog      bool         `json:"Analog" yaml:"Analog,omitempty"`
+	PhotoScan        bool         `json:"Scan" yaml:"Scan,omitempty"`
 	TimeZone         string       `gorm:"type:varbinary(64);" json:"TimeZone" yaml:"-"`
 	PlaceID          string       `gorm:"type:varbinary(42);index;" json:"PlaceID" yaml:"-"`
 	LocationID       string       `gorm:"type:varbinary(42);index;" json:"LocationID" yaml:"-"`
diff --git a/internal/form/photo.go b/internal/form/photo.go
index 47d11bf7a..dfa874a0d 100644
--- a/internal/form/photo.go
+++ b/internal/form/photo.go
@@ -34,7 +34,7 @@ type Photo struct {
 	PhotoFavorite    bool      `json:"Favorite"`
 	PhotoPrivate     bool      `json:"Private"`
 	PhotoReview      bool      `json:"Review"`
-	PhotoAnalog      bool      `json:"Analog"`
+	PhotoScan        bool      `json:"Scan"`
 	LocationID       string    `json:"LocationID"`
 	LocationSrc      string    `json:"LocationSrc"`
 	GPSAccuracy      int       `json:"GPSAccuracy"`
diff --git a/internal/form/photo_search.go b/internal/form/photo_search.go
index 60541b45c..fb8b60e88 100644
--- a/internal/form/photo_search.go
+++ b/internal/form/photo_search.go
@@ -19,7 +19,7 @@ type PhotoSearch struct {
 	Primary   bool      `form:"primary"`
 	Video     bool      `form:"video"`
 	Photo     bool      `form:"photo"`
-	Analog    bool      `form:"analog"`
+	Scan      bool      `form:"scan"`
 	Duplicate bool      `form:"duplicate"`
 	Error     bool      `form:"error"`
 	Hidden    bool      `form:"hidden"`
diff --git a/internal/query/photo_results.go b/internal/query/photo_results.go
index dcb3541be..626e27337 100644
--- a/internal/query/photo_results.go
+++ b/internal/query/photo_results.go
@@ -38,7 +38,7 @@ type PhotoResult struct {
 	PhotoExposure    string        `json:"Exposure"`
 	PhotoQuality     int           `json:"Quality"`
 	PhotoResolution  int           `json:"Resolution"`
-	PhotoAnalog      bool          `json:"Analog"`
+	PhotoScan        bool          `json:"Scan"`
 	CameraID         uint          `json:"CameraID"` // Camera
 	CameraSerial     string        `json:"CameraSerial"`
 	CameraSrc        string        `json:"CameraSrc"`
diff --git a/internal/query/photo_search.go b/internal/query/photo_search.go
index cc855d1d1..a65995f84 100644
--- a/internal/query/photo_search.go
+++ b/internal/query/photo_search.go
@@ -190,8 +190,8 @@ func PhotoSearch(f form.PhotoSearch) (results PhotoResults, count int, err error
 		s = s.Where("photos.photo_favorite = 1")
 	}
 
-	if f.Analog {
-		s = s.Where("photos.photo_analog = 1")
+	if f.Scan {
+		s = s.Where("photos.photo_scan = 1")
 	}
 
 	if f.Country != "" {