Merge pull request #70 from Julien-cpsn/69-validate-should-be-confirm

Changed "Validate" to "Confirm" to avoid the English language police
Julien-cpsn · May 7, 2024 · 2305ad4 · 2305ad4
2 parents 2c82866 + ec5bb3c
commit 2305ad4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/key_bindings_templates/default_key_bindings.toml b/key_bindings_templates/default_key_bindings.toml
@@ -18,7 +18,7 @@ display_help = "Ctrl-h" # Take care to not overlap other inputs, the help can be
 # Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
 [keybindings.generic.text_inputs.text_input]
 cancel = "Esc"
-validate = "Enter"
+confirm = "Enter"
 
 delete_backward = "Delete"
 delete_forward = "Backspace"

diff --git a/key_bindings_templates/vim_key_bindings.toml b/key_bindings_templates/vim_key_bindings.toml
@@ -18,7 +18,7 @@ display_help = "Shift-h" # Take care to not overlap other inputs, the help can b
 # Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
 [keybindings.generic.text_inputs.text_input]
 cancel = "Esc"
-validate = "Enter"
+confirm = "Enter"
 
 delete_backward = "Delete"
 delete_forward = "Backspace"

diff --git a/src/app/app_states.rs b/src/app/app_states.rs
@@ -202,7 +202,7 @@ impl AppState {
             ],
             CreatingNewCollection => vec![
                 GoBackToMainMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                CreateNewCollection(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                CreateNewCollection(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 CreatingCollectionDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 CreatingCollectionDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -212,7 +212,7 @@ impl AppState {
             ],
             CreatingNewRequest => vec![
                 GoBackToMainMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                CreateNewRequest(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                CreateNewRequest(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 CreatingRequestDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 CreatingRequestDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -243,7 +243,7 @@ impl AppState {
             ],
             RenamingCollection => vec![
                 GoBackToMainMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                RenameCollection(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                RenameCollection(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 RenamingCollectionDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 RenamingCollectionDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -253,7 +253,7 @@ impl AppState {
             ],
             RenamingRequest => vec![
                 GoBackToMainMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                RenameRequest(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                RenameRequest(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 RenamingRequestDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 RenamingRequestDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -380,7 +380,7 @@ impl AppState {
             },
             EditingRequestUrl => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestUrl(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestUrl(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestUrlDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestUrlDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -390,7 +390,7 @@ impl AppState {
             ],
             EditingRequestParam => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestQueryParam(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestQueryParam(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestQueryParamDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestQueryParamDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -400,7 +400,7 @@ impl AppState {
             ],
             EditingRequestAuthUsername => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestAuthUsername(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestAuthUsername(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestAuthUsernameDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestAuthUsernameDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -410,7 +410,7 @@ impl AppState {
             ],
             EditingRequestAuthPassword => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestAuthPassword(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestAuthPassword(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestAuthPasswordDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestAuthPasswordDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -420,7 +420,7 @@ impl AppState {
             ],
             EditingRequestAuthBearerToken => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestAuthBearerToken(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestAuthBearerToken(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestAuthBearerTokenDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestAuthBearerTokenDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -430,7 +430,7 @@ impl AppState {
             ],
             EditingRequestHeader => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestHeader(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestHeader(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestHeaderDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestHeaderDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -440,7 +440,7 @@ impl AppState {
             ],
             EditingRequestBodyTable => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestBodyTable(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestBodyTable(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestBodyTableDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestBodyTableDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -450,7 +450,7 @@ impl AppState {
             ],
             EditingRequestBodyFile => vec![
                 GoBackToRequestMenu(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.cancel], "Cancel", Some("Cancel"))),
-                ModifyRequestBodyFile(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.validate], "Validate", Some("Validate"))),
+                ModifyRequestBodyFile(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.confirm], "Confirm", Some("Confirm"))),
 
                 EditingRequestBodyFileDeleteCharBackward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_backward], "Delete char backward", Some("Delete"))),
                 EditingRequestBodyFileDeleteCharForward(EventKeyBinding::new(vec![key_bindings.generic.text_inputs.text_input.delete_forward], "Delete char forward", Some("Backspace"))),
@@ -546,7 +546,7 @@ impl AppState {
                 RequestSettingsMoveDown(EventKeyBinding::new(vec![key_bindings.generic.navigation.move_cursor_down], "Move down", Some("Down"))),
                 RequestSettingsToggleSetting(EventKeyBinding::new(vec![key_bindings.generic.navigation.move_cursor_left, key_bindings.generic.navigation.move_cursor_right], "Toggle setting", Some("Toggle"))),
 
-                ModifyRequestSettings(EventKeyBinding::new(vec![key_bindings.generic.navigation.select], "Validate", Some("Validate"))),
+                ModifyRequestSettings(EventKeyBinding::new(vec![key_bindings.generic.navigation.select], "Confirm", Some("Confirm"))),
             ]
         }
     }

diff --git a/src/app/files/key_bindings.rs b/src/app/files/key_bindings.rs
@@ -42,7 +42,7 @@ nest! {
                 /// Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
                 pub text_input: #[derive(Copy, Clone, Deserialize)] pub struct TextInput {
                     pub cancel: KeyCombination,
-                    pub validate: KeyCombination,
+                    pub confirm: KeyCombination,
 
                     pub delete_backward: KeyCombination,
                     pub delete_forward: KeyCombination,
@@ -170,7 +170,7 @@ impl Default for KeyBindings {
                 text_inputs: TexInputs {
                     text_input: TextInput {
                         cancel: key!(esc),
-                        validate: key!(enter),
+                        confirm: key!(enter),
 
                         delete_backward: key!(delete),
                         delete_forward: key!(backspace),