From 0330497d1deb3ac6d59fdd126a4ea3b65381bd09 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antonella@standardnotes.org>
Date: Fri, 30 Apr 2021 16:48:38 -0300
Subject: [PATCH] fix: change lock mentions to prevent editing

---
 app/assets/javascripts/strings.ts                   |  8 ++++----
 app/assets/javascripts/views/editor/editor-view.pug | 10 +++++-----
 app/assets/javascripts/views/notes/notes_view.ts    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/strings.ts b/app/assets/javascripts/strings.ts
index 21d00ee01..b3de2183b 100644
--- a/app/assets/javascripts/strings.ts
+++ b/app/assets/javascripts/strings.ts
@@ -35,13 +35,13 @@ export const STRING_GENERIC_SAVE_ERROR =
 export const STRING_DELETE_PLACEHOLDER_ATTEMPT =
   'This note is a placeholder and cannot be deleted. To remove from your list, simply navigate to a different note.';
 export const STRING_ARCHIVE_LOCKED_ATTEMPT =
-  "This note is locked. If you'd like to archive it, unlock it, and try again.";
+  "This note has editing disabled. If you'd like to archive it, enable editing, and try again.";
 export const STRING_UNARCHIVE_LOCKED_ATTEMPT =
-  "This note is locked. If you'd like to archive it, unlock it, and try again.";
+  "This note has editing disabled. If you'd like to unarchive it, enable editing, and try again.";
 export const STRING_DELETE_LOCKED_ATTEMPT =
-  "This note is locked. If you'd like to delete it, unlock it, and try again.";
+  "This note had editing disabled. If you'd like to delete it, enable editing, and try again.";
 export const STRING_EDIT_LOCKED_ATTEMPT =
-  "This note is locked. If you'd like to edit its options, unlock it, and try again.";
+  "This note has editing disabled. If you'd like to edit its options, enable editing, and try again.";
 export function StringDeleteNote(title: string, permanently: boolean) {
   return permanently
     ? `Are you sure you want to permanently delete ${title}?`
diff --git a/app/assets/javascripts/views/editor/editor-view.pug b/app/assets/javascripts/views/editor/editor-view.pug
index b5dc4386e..256e143a9 100644
--- a/app/assets/javascripts/views/editor/editor-view.pug
+++ b/app/assets/javascripts/views/editor/editor-view.pug
@@ -10,9 +10,9 @@
     .sn-component
       .sk-app-bar.no-edges(
         ng-if='self.noteLocked',
-        ng-init="self.lockText = 'Note Locked'",
-        ng-mouseleave="self.lockText = 'Note Locked'",
-        ng-mouseover="self.lockText = 'Unlock'"
+        ng-init="self.lockText = 'Note Editing Disabled'",
+        ng-mouseleave="self.lockText = 'Note Editing Disabled'",
+        ng-mouseover="self.lockText = 'Enable Editing'"
         )
         .left
           .sk-app-bar-item(ng-click='self.toggleLockNote()')
@@ -89,8 +89,8 @@
                   )
                 menu-row(
                   action='self.selectedMenuItem(true); self.toggleLockNote()'
-                  desc="'Locking notes prevents unintentional editing'",
-                  label="self.noteLocked ? 'Unlock' : 'Lock'"
+                  desc="'Prevent unintentional editing of a note'",
+                  label="self.noteLocked ? 'Enable Editing' : 'Prevent Editing'"
                   )
                 menu-row(
                   action='self.selectedMenuItem(true); self.toggleProtectNote()'
diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 4f3b49cf8..718cae459 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -665,7 +665,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
     }
     if (note.locked) {
       flags.push({
-        text: "Locked",
+        text: "Editing Disabled",
         class: 'neutral'
       });
     }