From c7a7785eda77e96a99c58291d08a091a5d8846eb Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Tue, 21 Oct 2025 21:48:23 +0800 Subject: Update locales files --- locales/help_docs/en.yml | 207 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index df6ee2b..6092873 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -99,7 +99,7 @@ jvv: here: info: | Found vault *`%{name}`*! (%{num_mem} Members, %{num_pk} registered PubKeys) - Managing %{num_sheets} Sheets, %{num_vf} VirtualFiles, total %{total_size_gb} GB + Managing %{num_sheets} Sheets, %{num_vf} VirtualFiles, total %{total_size} **Tip**: To start the server, run jvv service listen @@ -123,3 +123,208 @@ jvv: service: listen: Listening for client connections in vault `%{path}` ... + +jv: + help: | + **JustEnoughVCS Local Workspace Commands** + This program connects to upstream vaults to synchronize and commit changes to local workspace files for collaborative work. + + **Common Aliases**: + jv u Download latest information, jv t Track files, jv mv -a Auto-move files, jv in/out Import or export files + + **Create Workspace**: + jv create - Create a workspace in the given directory name + jv init - Create a workspace in the current directory + + **Connect to Upstream Vault**: + jv direct - Direct your workspace to this vault + After specifying an upstream vault, your workspace will be *stained*, and you will not be able to connect to vaults with different identifiers + + jv unstain - Unstain your workspace (remove stain identifier), after which the workspace will be unrelated to any upstream vault + + **Account Management**: + jv account list - List all accounts on this computer and whether private keys are registered + jv account as - Switch current account + jv account add - Add an account to this computer + jv account remove - Delete this account + jv account mvkey - Move private key to specified account + + **Information Synchronization**: + jv update - Download latest information from upstream workspace + + **Sheet Operations**: + jv sheet list - List all sheets in the upstream workspace + jv sheet use - Use the specified sheet to start current work (automatically created if it doesn't exist) + jv sheet exit - Exit current work + + jv import - Import files from import area + jv import - Import files from reference sheet + jv export -m -n - Export specified file package to import area of other sheets + + **File Operations** + jv move - Safely rename files + jv move auto - Automatically handle local file moves or renames + jv track - Track and upload files to upstream vault + + **Query Built-in Documentation** + jv docs list - List all available documentation + jv docs - View content of specified documentation + or jv docs -e - Return temporary path of specific documentation for editor opening + **Example**: jv docs get-started -e | nano + + You can use jv --help to query more detailed help! + + **Tip**: If you need to understand JustEnoughVCS collaboration paradigms, use jv docs get-started + + account: | + **Manage Local Accounts** + **Usage**: + jv account list - List all accounts on this computer and whether private keys are registered + jv account as - Switch current account + jv account add - Add an account to this computer + jv account remove - Delete this account + jv account mvkey - Move private key to specified account + + Accounts are identity identifiers on the local computer, each account can be associated with different private keys. + You need to set up accounts before interacting with upstream vaults. + + sheet: | + **Manage File Sheets** + **Usage**: + jv sheet list - List all sheets in the upstream workspace + jv sheet use - Use the specified sheet to start current work (automatically created if it doesn't exist) + jv sheet exit - Exit current work + + Sheets are core concepts in JustEnoughVCS, each sheet represents an independent file collection. + You can switch work between different sheets, or export files from one sheet to another. + + create: | + **Create Workspace with Specified Name** + **Usage**: jv create + + **Example**: jv create my_workspace + Creates a directory named 'my_workspace' in the current directory and initializes a workspace inside it. + + Workspace is your local working environment for file synchronization and version control with upstream vaults. + + init: | + **Create Workspace in Current Directory** + **Usage**: jv init + + This command creates a workspace in the current directory, with the workspace name determined by the current directory name. + + If the current directory is not empty, this operation will fail. Please ensure you execute this command in an empty directory. + + here: | + **Query Directory Information Here** + **Usage**: jv here + + Displays detailed information about current directory files, including: + - File name, size, version number + - Current file holder + - Latest version commit information + + This is a quick way to understand the current state of your workspace directory. + + track: | + **Track Local Files** + **Usage**: jv track + + **Example**: jv track src/main.rs + First track - Create and upload the "First Version", then automatically hold them + Subsequent tracks - Update files with new versions + + Tracking files is the basic operation of version control, ensuring your changes can be synchronized to the upstream vault. + + hold: | + **Hold Files: Obtain File Edit Rights from Upstream Vault** + **Usage**: jv hold + + **Example**: jv hold src/lib.rs + When you need to edit a file, you must first hold the file's edit rights. + After holding a file, other collaborators will not be able to edit the same file simultaneously, avoiding conflicts. + + After editing, remember to track the file to save changes. + + throw: | + **Throw Files: Release File Edit Rights from Upstream Vault** + **Usage**: jv throw + + **Example**: jv throw src/config.rs + When you no longer need to edit a file, you can throw the file's edit rights. + After throwing, other collaborators can hold and edit the file. + + If you have made changes to the file but haven't tracked them, throwing will lose those changes. + + move: | + **Move Local Files** + **Usage**: + jv move - Safely rename or move files + jv move auto - Automatically handle local file moves or renames + + **Example**: + jv move old_name.txt new_name.txt + jv move src/old_dir/file.rs src/new_dir/file.rs + jv move auto + + Safe move operations preserve file version history, while auto-move detects and handles all renames. + + export: | + **Export Files to Import Area of Other Sheets** + **Usage**: jv export -m -n + + **Example**: jv export data.csv analytics -m "Export analysis data" -n "analysis_data" + This operation packages the specified files and sends them to the import area of the target sheet. + + Other collaborators can use the jv import command in the target sheet to import these files. + + import: | + **Import Files to Current Sheet** + **Usage**: + jv import - Import files from import area + jv import - Import files from reference sheet + + **Example**: + jv import Player_Import - From import area defined name + jv import ref@Data/Player.csv - From reference sheet path + + Import operation copies files from other sheets or import areas to the current workspace. + + direct: | + **Direct to Specified Upstream Vault and Stain This Workspace** + **Usage**: jv direct + + **Example**: jv direct your_vault.org + This operation connects the current workspace to the specified upstream vault and adds a stain identifier to the workspace. + + After staining, the workspace will only be able to interact with vaults of the specified identifier, ensuring data consistency. + + unstain: | + **Unstain This Workspace** + **Usage**: jv unstain + + **DANGER ZONE**: This operation removes the workspace's stain identifier, after which the workspace will be disconnected from the upstream vault. + + After unstaining, the workspace will no longer be associated with any specific vault and can be reconnected to other vaults. + However, please note that this may cause data synchronization issues, use with caution. + + update: | + **Download Latest Information from Upstream Vault** + **Usage**: jv update + + This operation synchronizes the latest file status, sheet information, and member information from the upstream vault. + + It is recommended to perform an update operation before starting work to ensure you have the latest working environment. + + docs: | + **Query Built-in Documentation** + **Usage**: + jv docs list - List all available documentation + jv docs - View content of specified documentation + jv docs -e - Return temporary path of specific documentation for editor opening + + **Example**: + jv docs get-started + jv docs collaboration -e | nano + + Built-in documentation includes JustEnoughVCS usage guides, collaboration paradigms, and best practices. -- cgit From 1dd3c4abec5a84ae1bd8dd0a93670a5bef601ab3 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Fri, 24 Oct 2025 16:16:45 +0800 Subject: Add cli error handle. --- locales/help_docs/en.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index 6092873..db190e0 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -328,3 +328,49 @@ jv: jv docs collaboration -e | nano Built-in documentation includes JustEnoughVCS usage guides, collaboration paradigms, and best practices. + + fail: + parse: + str_to_sockaddr: | + Could not recognize *`%{str}`* as an IP address + This is a problem with your input syntax! Please check **the content you entered** + + action_operation_fail: + main: | + This error is from the JustEnoughVCS core component + **Error Message**: %{err} + + type_connection: | + Based on the returned error context, this is a **network connection** issue + **Please check**: + 1. Whether your network connection is working properly + 2. Whether you have permission to connect to this address + + type_auth: | + Based on the returned error context, this is a **permission** issue + This indicates you don't have sufficient permissions to perform this operation. + + type_fsio: | + Based on the returned error context, this is a **file read/write** related issue + **Please check**: + 1. Whether your disk has sufficient space and is operating normally + 2. Whether your Local Workspace files are being used by other processes + + type_serialize: | + Based on the returned error context, this is a **serialization or deserialization** related issue + **Please check** + 1. Whether the parameter format you passed meets the requirements for serialization/deserialization + 2. Whether this version of JustEnoughVCS client/server supports this type of serialization + + type_other: | + Unfortunately, based on the returned context information, + this is not an expected error. + Please submit an Issue at the JustEnoughVCS Git Repository + + JustEnoughVCS needs your feedback, which will make this project more "JustEnough" + + info_contact_admin: | + If necessary, please contact the **administrator** of the Upstream Vault. + If you are the **administrator** and confirm this issue affects server operation, please: + 1. Check if your JustEnoughVCS server is up to date + 2. Submit an Issue at the JustEnoughVCS Git Repository -- cgit From 77d162ad9974752c0caa3340b20c91049c69feba Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Fri, 24 Oct 2025 18:26:22 +0800 Subject: Update locales files --- locales/help_docs/en.yml | 55 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 8 deletions(-) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index db190e0..c72754c 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -119,7 +119,7 @@ jvv: footer: | **Among them, %{num} members have registered PubKeys.** - status_key_registered: (PubKey Exists) + status_key_registered: (Registered) service: listen: Listening for client connections in vault `%{path}` ... @@ -147,7 +147,7 @@ jv: jv account as - Switch current account jv account add - Add an account to this computer jv account remove - Delete this account - jv account mvkey - Move private key to specified account + jv account movekey - Move private key to specified account **Information Synchronization**: jv update - Download latest information from upstream workspace @@ -183,7 +183,7 @@ jv: jv account as - Switch current account jv account add - Add an account to this computer jv account remove - Delete this account - jv account mvkey - Move private key to specified account + jv account movekey - Move private key to specified account Accounts are identity identifiers on the local computer, each account can be associated with different private keys. You need to set up accounts before interacting with upstream vaults. @@ -329,11 +329,14 @@ jv: Built-in documentation includes JustEnoughVCS usage guides, collaboration paradigms, and best practices. - fail: - parse: - str_to_sockaddr: | - Could not recognize *`%{str}`* as an IP address - This is a problem with your input syntax! Please check **the content you entered** + fail: + path_not_found: | + The directory `%{path}` cannot be found! + + parse: + str_to_sockaddr: | + Could not recognize *`%{str}`* as an IP address + This is a problem with your input syntax! Please check **the content you entered** action_operation_fail: main: | @@ -374,3 +377,39 @@ jv: If you are the **administrator** and confirm this issue affects server operation, please: 1. Check if your JustEnoughVCS server is up to date 2. Submit an Issue at the JustEnoughVCS Git Repository + + account: + no_user_dir: Cannot find user directory! + add: Failed to add account `%{account}`, please check if the account already exists. + remove: Failed to remove account `%{account}`, please check if the account exists. + list: Failed to get account list! + not_found: Cannot find account `%{account}`! + + init_create_dir_not_empty: | + The current directory is not empty! + If you are certain you want to create here, please use --force to force execution! + + create: Failed to create local workspace! + init: Failed to create workspace here! + get_current_dir: Failed to get current directory! + + workspace_not_found: | + Local workspace not found! Please use this command within a local workspace + If you wish to use this directory as a local workspace, please use jv init + + read_cfg: Failed to read local workspace configuration file! + write_cfg: Failed to write changes to local workspace configuration file! + + success: + account: + as: Successfully switched this workspace's account to `%{account}` + add: Successfully added account `%{account}`! + remove: Successfully removed account `%{account}`! + list: + header: | + **There are %{num} account(s) on this computer:** + + status_has_key: (Registered) + move_key: Successfully moved the private key to the account directory! + create: Successfully created local workspace! + init: Successfully created workspace here! -- cgit From 28bdbb4ba457eb9e0707d2760f5d042ca6b7db68 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Mon, 27 Oct 2025 17:57:24 +0800 Subject: Add output for jvv service listen command results --- locales/help_docs/en.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index c72754c..5dfcb9d 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -61,7 +61,6 @@ jvv: fail: jvcs: "JustEnoughVCS Error: %{err}" - no_vault_here: No vault found here tokio: @@ -80,9 +79,7 @@ jvv: If you wish to use this directory as a vault, please use jvv init --help to view related help vault_init_failed: Failed to initialize vault! - member_ids_failed: Failed to get member IDs! - ref_sheet_not_found: Reference sheet `ref` not found, but it should exist! create: @@ -95,6 +92,11 @@ jvv: register: Failed to create member! Please check if a member with the same name already exists list: Failed to get member ID! + service: + listen_done: | + Server forced to close due to error! + Error message: %{error} + success: here: info: | @@ -122,7 +124,8 @@ jvv: status_key_registered: (Registered) service: - listen: Listening for client connections in vault `%{path}` ... + listen_start: Listening for client connections in vault `%{path}` ... + listen_done: Server shutdown! jv: help: | -- cgit From 189122ad8f0aa8f378a69c921eb2bafb51ae351f Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Mon, 27 Oct 2025 17:57:48 +0800 Subject: Update translation for error messages --- locales/help_docs/en.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index 5dfcb9d..2d4bbdc 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -338,8 +338,7 @@ jv: parse: str_to_sockaddr: | - Could not recognize *`%{str}`* as an IP address - This is a problem with your input syntax! Please check **the content you entered** + *`%{str}`* is not a valid IP address, please check your input! action_operation_fail: main: | @@ -403,6 +402,9 @@ jv: read_cfg: Failed to read local workspace configuration file! write_cfg: Failed to write changes to local workspace configuration file! + create_socket: Failed to create TCP socket! + connection_failed: Failed to connect to target server! + success: account: as: Successfully switched this workspace's account to `%{account}` -- cgit From 40507c8e3b5751cd0488ae0bdcf11909eeff520d Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Wed, 29 Oct 2025 15:27:26 +0800 Subject: Update localization files for new workspace management features - Add common confirmation prompt - Improve service command documentation with port option - Add workspace staining/unstaining functionality - Simplify error messages and improve user guidance - Add success and warning messages for direct/unstain operations --- locales/help_docs/en.yml | 85 ++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 43 deletions(-) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index 2d4bbdc..b886cfa 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -1,3 +1,7 @@ +common: + confirm: | + Confirm to perform the above operation? (Y/n): + jvv: help: | **JustEnoughVCS Upstream Vault Commands** @@ -56,8 +60,9 @@ jvv: service: | **Service Management** **Usage**: - jvv service listen - Start the vault server in the current vault to accept client connections - You can use --no-log to disable log output + jvv service listen - Start the server in the current vault + You can use --port to set the listening port, + use --no-log to disable log output fail: jvcs: "JustEnoughVCS Error: %{err}" @@ -332,53 +337,21 @@ jv: Built-in documentation includes JustEnoughVCS usage guides, collaboration paradigms, and best practices. + confirm: + direct: | + Do you want to direct the current local workspace to the upstream vault %{upstream}? + fail: path_not_found: | The directory `%{path}` cannot be found! parse: str_to_sockaddr: | - *`%{str}`* is not a valid IP address, please check your input! - - action_operation_fail: - main: | - This error is from the JustEnoughVCS core component - **Error Message**: %{err} - - type_connection: | - Based on the returned error context, this is a **network connection** issue - **Please check**: - 1. Whether your network connection is working properly - 2. Whether you have permission to connect to this address - - type_auth: | - Based on the returned error context, this is a **permission** issue - This indicates you don't have sufficient permissions to perform this operation. - - type_fsio: | - Based on the returned error context, this is a **file read/write** related issue - **Please check**: - 1. Whether your disk has sufficient space and is operating normally - 2. Whether your Local Workspace files are being used by other processes - - type_serialize: | - Based on the returned error context, this is a **serialization or deserialization** related issue - **Please check** - 1. Whether the parameter format you passed meets the requirements for serialization/deserialization - 2. Whether this version of JustEnoughVCS client/server supports this type of serialization - - type_other: | - Unfortunately, based on the returned context information, - this is not an expected error. - Please submit an Issue at the JustEnoughVCS Git Repository - - JustEnoughVCS needs your feedback, which will make this project more "JustEnough" - - info_contact_admin: | - If necessary, please contact the **administrator** of the Upstream Vault. - If you are the **administrator** and confirm this issue affects server operation, please: - 1. Check if your JustEnoughVCS server is up to date - 2. Submit an Issue at the JustEnoughVCS Git Repository + Error: %{err} + Cannot recognize *`%{str}`* as a valid address, please check your input! + + from_just_version_control: | + **Error**: `%{err}` (This error is provided by JustEnoughVCS) account: no_user_dir: Cannot find user directory! @@ -405,6 +378,14 @@ jv: create_socket: Failed to create TCP socket! connection_failed: Failed to connect to target server! + unstain: | + The current workspace is not stained, no need to unstain + + warn: + unstain: | + This operation will disconnect the current workspace from the upstream vault `%{upstream}` + If you reconnect to a vault with a mismatched identifier, it will cause serious problems, please operate with caution! + success: account: as: Successfully switched this workspace's account to `%{account}` @@ -418,3 +399,21 @@ jv: move_key: Successfully moved the private key to the account directory! create: Successfully created local workspace! init: Successfully created workspace here! + unstain: | + Successfully unstained! + The current workspace no longer belongs to any upstream vault, please direct to a new upstream vault before working + **Tip**: Use `jv direct ` to redirect to a new upstream vault + + result: + common: + authroize_failed: | + Authentication failed: %{err}! + + direct: + directed_and_stained: | + Successfully directed to upstream vault `%{upstream}`! + Workspace has been **stained**, ready to start working! + + already_stained: | + Current workspace is already stained and cannot be directed to other upstream vaults with different identifiers + Please use `jv unstain` to remove the stain first -- cgit From 3a3f40b2abbaa47063cdc3aeb0149e3d02276c1e Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Thu, 30 Oct 2025 09:38:19 +0800 Subject: Simplify commands and improve jv error handling - Add help command alias for jv - Improve parser error message formatting - Fix code formatting in jvv commands --- locales/help_docs/en.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'locales/help_docs/en.yml') diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml index b886cfa..5a12f8f 100644 --- a/locales/help_docs/en.yml +++ b/locales/help_docs/en.yml @@ -346,6 +346,10 @@ jv: The directory `%{path}` cannot be found! parse: + parser_failed: | + Incorrect command input! + Please use `jv -h` to view help + str_to_sockaddr: | Error: %{err} Cannot recognize *`%{str}`* as a valid address, please check your input! -- cgit