Extract text from CLI to enable internationalisation

eth2deposit/cli/existing_mnemonic.py

@@ -10,6 +10,7 @@
 from eth2deposit.utils.constants import (
     WORD_LISTS_PATH,
 )
+from eth2deposit.utils.intl import load_text
 from .generate_keys import (
     generate_keys,
     generate_keys_arguments_decorator,
@@ -20,51 +21,40 @@ def validate_mnemonic(cts: click.Context, param: Any, mnemonic: str) -> str:
     if verify_mnemonic(mnemonic, WORD_LISTS_PATH):
         return mnemonic
     else:
-        raise ValidationError('That is not a valid mnemonic, please check for typos.')
+        raise ValidationError(load_text('en', ['err_invalid_mnemonic']))
 
 
 @click.command(
-    help='Generate (or recover) keys from an existing mnemonic',
+    help=load_text('en', ['arg_existing_mnemonic', 'help']),
 )
 @click.pass_context
 @click.option(
-    '--mnemonic',
+    load_text('en', ['arg_mnemonic', 'argument']),
     callback=validate_mnemonic,
-    help=('The mnemonic that you used to generate your keys. (It is recommended not to use this argument, and wait for '
-          'the CLI to ask you for your mnemonic as otherwise it will appear in your shell history.)'),
-    prompt='Please enter your mnemonic separated by spaces (" ")',
+    help=load_text('en', ['arg_mnemonic', 'help']),
+    prompt=load_text('en', ['arg_mnemonic', 'prompt']),
     required=True,
     type=str,
 )
 @click.password_option(
-    '--mnemonic-password',
+    load_text('en', ['arg_mnemonic_password', 'argument']),
     default='',
-    help=('This is almost certainly not the argument you are looking for: it is for mnemonic passwords, not keystore '
-          'passwords. Providing a password here when you didn\'t use one initially, can result in lost keys (and '
-          'therefore funds)! Also note that if you used this tool to generate your mnemonic intially, then you did not '
-          'use a mnemonic password. However, if you are certain you used a password to "increase" the security of your '
-          'mnemonic, this is where you enter it.'),
+    help=load_text('en', ['arg_mnemonic_password', 'help']),
     prompt=False,
 )
 @click.option(
-    '--validator_start_index',
+    load_text('en', ['arg_validator_start_index', 'argument']),
     confirmation_prompt=True,
     default=0,
-    help=('Enter the index (key number) you wish to start generating more keys from. '
-          'For example, if you\'ve generated 4 keys in the past, you\'d enter 4 here,'),
-    prompt=('Enter the index (key number) you wish to start generating more keys from. '
-            'For example, if you\'ve generated 4 keys in the past, you\'d enter 4 here,'),
+    help=load_text('en', ['arg_validator_start_index', 'help']),
+    prompt=load_text('en', ['arg_validator_start_index', 'prompt']),
     type=click.IntRange(0, 2**32 - 1),
 )
 @generate_keys_arguments_decorator
 def existing_mnemonic(ctx: click.Context, mnemonic: str, mnemonic_password: str, **kwargs: Any) -> None:
     if mnemonic_password != '':
         click.clear()
-        click.confirm(
-            ('Are you absolutely certain that you used a mnemonic password? '
-             '(This is different from a keystore password!) '
-             'Using one when you are not supposed to can result in loss of funds!'),
-            abort=True)
+        click.confirm(load_text('en', ['msg_mnemonic_password_confirm']), abort=True)
 
     ctx.obj = {'mnemonic': mnemonic, 'mnemonic_password': mnemonic_password}
     ctx.forward(generate_keys)

eth2deposit/cli/generate_keys.py

@@ -18,6 +18,7 @@
     DEFAULT_VALIDATOR_KEYS_FOLDER_NAME,
 )
 from eth2deposit.utils.ascii_art import RHINO_0
+from eth2deposit.utils.intl import load_text
 from eth2deposit.settings import (
     ALL_CHAINS,
     MAINNET,
@@ -36,23 +37,23 @@ def validate_password(cts: click.Context, param: Any, password: str) -> str:
     try:
         validate_password_strength(password)
     except ValidationError as e:
-        click.echo(f'Error: {e} Please retype.')
+        click.echo(e)
     else:
         is_valid_password = True
 
     while not is_valid_password:
-        password = get_password(text='Type the password that secures your validator keystore(s)')
+        password = get_password(load_text('en', ['msg_password_prompt']))
         try:
             validate_password_strength(password)
         except ValidationError as e:
-            click.echo(f'Error: {e} Please retype.')
+            click.echo(e)
         else:
             # Confirm password
-            password_confirmation = get_password(text='Repeat for confirmation')
+            password_confirmation = get_password(load_text('en', ['msg_password_confirm']))
             if password == password_confirmation:
                 is_valid_password = True
             else:
-                click.echo('Error: the two entered values do not match. Please retype again.')
+                click.echo(load_text('en', ['err_password_mismatch']))
 
     return password
 
@@ -64,32 +65,30 @@ def generate_keys_arguments_decorator(function: Callable[..., Any]) -> Callable[
     '''
     decorators = [
         click.option(
-            '--num_validators',
-            prompt='Please choose how many validators you wish to run',
-            help='The number of validators keys you want to generate (you can always generate more later)',
+            load_text('en', ['num_validators', 'argument']),
+            help=load_text('en', ['num_validators', 'help']),
+            prompt=load_text('en', ['num_validators', 'prompt']),
             required=True,
             type=click.IntRange(0, 2**32 - 1),
         ),
         click.option(
-            '--folder',
+            load_text('en', ['folder', 'argument']),
             default=os.getcwd(),
-            help='The folder to place the generated keystores and deposit_data.json in',
+            help=load_text('en', ['folder', 'help']),
             type=click.Path(exists=True, file_okay=False, dir_okay=True),
         ),
         click.option(
-            '--chain',
+            load_text('en', ['chain', 'argument']),
             default=MAINNET,
-            help='The version of eth2 you are targeting. use "mainnet" if you are depositing ETH',
-            prompt='Please choose the (mainnet or testnet) network/chain name',
+            help=load_text('en', ['chain', 'help']),
+            prompt=load_text('en', ['chain', 'prompt']),
             type=click.Choice(ALL_CHAINS.keys(), case_sensitive=False),
         ),
         click.password_option(
-            '--keystore_password',
+            load_text('en', ['keystore_password', 'argument']),
             callback=validate_password,
-            help=('The password that will secure your keystores. You will need to re-enter this to decrypt them when '
-                  'you setup your eth2 validators. (It is reccomened not to use this argument, and wait for the CLI '
-                  'to ask you for your mnemonic as otherwise it will appear in your shell history.)'),
-            prompt='Type the password that secures your validator keystore(s)',
+            help=load_text('en', ['keystore_password', 'help']),
+            prompt=load_text('en', ['keystore_password', 'prompt']),
         ),
     ]
     for decorator in reversed(decorators):
@@ -110,7 +109,7 @@ def generate_keys(ctx: click.Context, validator_start_index: int,
         os.mkdir(folder)
     click.clear()
     click.echo(RHINO_0)
-    click.echo('Creating your keys.')
+    click.echo(load_text('en', ['msg_key_creation']))
     credentials = CredentialList.from_mnemonic(
         mnemonic=mnemonic,
         mnemonic_password=mnemonic_password,
@@ -122,8 +121,8 @@ def generate_keys(ctx: click.Context, validator_start_index: int,
     keystore_filefolders = credentials.export_keystores(password=keystore_password, folder=folder)
     deposits_file = credentials.export_deposit_data_json(folder=folder)
     if not credentials.verify_keystores(keystore_filefolders=keystore_filefolders, password=keystore_password):
-        raise ValidationError("Failed to verify the keystores.")
+        raise ValidationError(load_text('en', ['err_verify_keystores']))
     if not verify_deposit_data_json(deposits_file):
-        raise ValidationError("Failed to verify the deposit data JSON files.")
-    click.echo('\nSuccess!\nYour keys can be found at: %s' % folder)
-    click.pause('\n\nPress any key.')
+        raise ValidationError(load_text('en', ['err_verify_deposit']))
+    click.echo(load_text('en', ['msg_creation_success']) + folder)
+    click.pause(load_text('en', ['msg_pause']))

eth2deposit/cli/new_mnemonic.py

@@ -8,6 +8,7 @@
     get_mnemonic,
 )
 from eth2deposit.utils.constants import WORD_LISTS_PATH
+from eth2deposit.utils.intl import load_text
 
 from .generate_keys import (
     generate_keys,
@@ -18,14 +19,14 @@
 
 
 @click.command(
-    help='Generate a new mnemonic and keys',
+    help=load_text('en', ['arg_new_mnemonic', 'help']),
 )
 @click.pass_context
 @click.option(
-    '--mnemonic_language',
-    default='english',
-    help='The language that your mnemonic is in.',
-    prompt='Please choose your mnemonic language',
+    load_text('en', ['arg_mnemonic_language', 'argument']),
+    default=load_text('en', ['arg_mnemonic_language', 'default']),
+    help=load_text('en', ['arg_mnemonic_language', 'help']),
+    prompt=load_text('en', ['arg_mnemonic_language', 'prompt']),
     type=click.Choice(languages, case_sensitive=False),
 )
 @generate_keys_arguments_decorator
@@ -34,12 +35,13 @@ def new_mnemonic(ctx: click.Context, mnemonic_language: str, **kwargs: Any) -> N
     test_mnemonic = ''
     while mnemonic != test_mnemonic:
         click.clear()
+        # ToDo: Figure out why changing this line causes pytest to get stuck collecting.
         click.echo('This is your seed phrase. Write it down and store it safely, it is the ONLY way to retrieve your deposit.')  # noqa: E501
         click.echo('\n\n%s\n\n' % mnemonic)
-        click.pause('Press any key when you have written down your mnemonic.')
+        click.pause(load_text('en', ['msg_press_any_key']))
 
         click.clear()
-        test_mnemonic = click.prompt('Please type your mnemonic (separated by spaces) to confirm you have written it down\n\n')  # noqa: E501
+        test_mnemonic = click.prompt(load_text('en', ['msg_mnemonic_retype_prompt']))
         test_mnemonic = test_mnemonic.lower()
     click.clear()
     # Do NOT use mnemonic_password.

eth2deposit/credentials.py

@@ -19,6 +19,7 @@
     MIN_DEPOSIT_AMOUNT,
 )
 from eth2deposit.utils.crypto import SHA256
+from eth2deposit.utils.intl import load_text
 from eth2deposit.utils.ssz import (
     compute_deposit_domain,
     compute_signing_root,
@@ -135,19 +136,19 @@ def from_mnemonic(cls,
                 f"The number of keys ({num_keys}) doesn't equal to the corresponding deposit amounts ({len(amounts)})."
             )
         key_indices = range(start_index, start_index + num_keys)
-        with click.progressbar(key_indices, label='Creating your keys:\t\t',
+        with click.progressbar(key_indices, label=load_text('en', ['msg_key_creation']),
                                show_percent=False, show_pos=True) as indices:
             return cls([Credential(mnemonic=mnemonic, mnemonic_password=mnemonic_password,
                                    index=index, amount=amounts[index - start_index], chain_setting=chain_setting)
                         for index in indices])
 
     def export_keystores(self, password: str, folder: str) -> List[str]:
-        with click.progressbar(self.credentials, label='Creating your keystores:\t',
+        with click.progressbar(self.credentials, label=load_text('en', ['msg_keystore_creation']),
                                show_percent=False, show_pos=True) as credentials:
             return [credential.save_signing_keystore(password=password, folder=folder) for credential in credentials]
 
     def export_deposit_data_json(self, folder: str) -> str:
-        with click.progressbar(self.credentials, label='Creating your depositdata:\t',
+        with click.progressbar(self.credentials, label=load_text('en', ['msg_depositdata_creation']),
                                show_percent=False, show_pos=True) as credentials:
             deposit_data = [cred.deposit_datum_dict for cred in credentials]
         filefolder = os.path.join(folder, 'deposit_data-%i.json' % time.time())
@@ -158,7 +159,8 @@ def export_deposit_data_json(self, folder: str) -> str:
         return filefolder
 
     def verify_keystores(self, keystore_filefolders: List[str], password: str) -> bool:
-        with click.progressbar(zip(self.credentials, keystore_filefolders), label='Verifying your keystores:\t',
+        with click.progressbar(zip(self.credentials, keystore_filefolders),
+                               label=load_text('en', ['msg_keystore_verification']),
                                length=len(self.credentials), show_percent=False, show_pos=True) as items:
             return all(credential.verify_keystore(keystore_filefolder=filefolder, password=password)
                        for credential, filefolder in items)

eth2deposit/deposit.py

@@ -3,14 +3,15 @@
 
 from eth2deposit.cli.existing_mnemonic import existing_mnemonic
 from eth2deposit.cli.new_mnemonic import new_mnemonic
+from eth2deposit.utils.intl import load_text
 
 
 def check_python_version() -> None:
     '''
     Checks that the python version running is sufficient and exits if not.
     '''
     if sys.version_info < (3, 7):
-        click.pause('Your python version is insufficient, please install version 3.7 or greater.')
+        click.pause(load_text('en', ['err_python_version']))
         sys.exit()
 
 

eth2deposit/intl/en/cli/existing_mnemonic.json

@@ -0,0 +1,27 @@
+{
+    "validate_mnemonic": {
+        "err_invalid_mnemonic": "That is not a valid mnemonic, please check for typos."
+    },
+    "<module>": {
+        "arg_existing_mnemonic": {
+            "help": "Generate (or recover) keys from an existing mnemonic"
+        },
+        "arg_mnemonic": {
+            "argument": "--mnemonic",
+            "help": "The mnemonic that you used to generate your keys. (It is recommended not to use this argument, and wait for the CLI to ask you for your mnemonic as otherwise it will appear in your shell history.)",
+            "prompt": "Please enter your mnemonic separated by spaces (\" \")"
+        },
+        "arg_mnemonic_password": {
+            "argument": "--mnemonic-password",
+            "help": "This is almost certainly not the argument you are looking for: it is for mnemonic passwords, not keystore passwords. Providing a password here when you didn't use one initially, can result in lost keys (and therefore funds)! Also note that if you used this tool to generate your mnemonic intially, then you did not use a mnemonic password. However, if you are certain you used a password to \"increase\" the security of your mnemonic, this is where you enter it."
+        },
+        "arg_validator_start_index": {
+            "argument": "--validator_start_index",
+            "help": "Enter the index (key number) you wish to start generating more keys from. For example, if you've generated 4 keys in the past, you'd enter 4 here.",
+            "prompt": "Enter the index (key number) you wish to start generating more keys from. For example, if you've generated 4 keys in the past, you'd enter 4 here."
+        }
+    },
+    "existing_mnemonic": {
+        "msg_mnemonic_password_confirm": "Are you absolutely certain that you used a mnemonic password? (This is different from a keystore password!) Using one when you are not supposed to can result in loss of funds!"
+    }
+}

eth2deposit/intl/en/cli/generate_keys.json

@@ -0,0 +1,35 @@
+{
+    "validate_password": {
+        "msg_password_prompt": "Type the password that secures your validator keystore(s)",
+        "msg_password_confirm": "Repeat for confirmation",
+        "err_password_mismatch": "Error: the two entered values do not match. Please type again."
+    },
+    "generate_keys_arguments_decorator": {
+        "num_validators": {
+            "argument": "--num_validators",
+            "help": "The number of validators keys you want to generate (you can always generate more later)",
+            "prompt": "Please choose how many validators you wish to run"
+        },
+        "folder": {
+            "argument": "--folder",
+            "help": "The number of validators keys you want to generate (you can always generate more later)"
+        },
+        "chain": {
+            "argument": "--chain",
+            "help": "The version of eth2 you are targeting. Use \"mainnet\" if you are depositing ETH",
+            "prompt": "Please choose the (mainnet or testnet) network/chain name"
+        },
+        "keystore_password": {
+            "argument": "--keystore_password",
+            "help": "The password that will secure your keystores. You will need to re-enter this to decrypt them when you setup your eth2 validators. (It is reccomened not to use this argument, and wait for the CLI to ask you for your mnemonic as otherwise it will appear in your shell history.)",
+            "prompt": "The password that will secure your keystores. You will need to re-enter this to decrypt them when you setup your eth2 validators."
+        }
+    },
+    "generate_keys": {
+        "msg_key_creation": "Creating your keys.",
+        "msg_creation_success": "\nSuccess!\nYour keys can be found at: ",
+        "msg_pause": "\n\nPress any key.",
+        "err_verify_keystores": "Failed to verify the keystores.",
+        "err_verify_deposit": "Failed to verify the deposit data JSON files."
+    }
+}

eth2deposit/intl/en/cli/new_mnemonic.json

@@ -0,0 +1,18 @@
+{
+    "<module>": {
+        "arg_new_mnemonic": {
+            "help": "Generate a new mnemonic and keys"
+        },
+        "arg_mnemonic_language": {
+            "argument": "--mnemonic_language",
+            "default": "english",
+            "help": "The language that your mnemonic is in",
+            "prompt": "Please choose your mnemonic language"
+        }
+    },
+    "new_mnemonic": {
+        "msg_mnemonic_presentation": "This is your mnemonic (seed phrase). Write it down and store it safely, it is the ONLY way to retrieve your deposit.",
+        "msg_press_any_key": "Press any key when you have written down your mnemonic.",
+        "msg_mnemonic_retype_prompt": "Please type your mnemonic (separated by spaces) to confirm you have written it down\n\n"
+    }
+}

eth2deposit/intl/en/credentials.json

@@ -0,0 +1,14 @@
+{
+    "from_mnemonic": {
+        "msg_key_creation": "Creating your keys:\t\t"
+    },
+    "export_keystores": {
+        "msg_keystore_creation": "Creating your keystores:\t"
+    },
+    "export_deposit_data_json": {
+        "msg_depositdata_creation": "Creating your depositdata:\t"
+    },
+    "verify_keystores": {
+        "msg_keystore_verification": "Verifying your keystores:\t"
+    }
+}

eth2deposit/intl/en/deposit.json

@@ -0,0 +1,5 @@
+{
+    "check_python_version": {
+        "err_python_version": "Your python version is insufficient, please install version 3.7 or greater."
+    }
+}

eth2deposit/intl/en/utils/validation.json

@@ -0,0 +1,8 @@
+{
+    "verify_deposit_data_json": {
+        "msg_deposit_verification": "Verifying your deposits:\t"
+    },
+    "validate_password_strength": {
+        "msg_password_length": "The password length should be at least 8. Please retype"
+    }
+}

eth2deposit/utils/constants.py

@@ -13,6 +13,7 @@
 
 
 # File/folder constants
+INTL_CONTENT_PATH = os.path.join('eth2deposit', 'intl')
 WORD_LISTS_PATH = os.path.join('eth2deposit', 'key_handling', 'key_derivation', 'word_lists')
 DEFAULT_VALIDATOR_KEYS_FOLDER_NAME = 'validator_keys'