| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk/filesystem.py | 10 | ||||
| -rw-r--r-- | archinstall/lib/disk/user_guides.py | 1 |
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index c8a74e3f..4f1b4217 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -83,7 +83,7 @@ class Filesystem: for partition in layout.get('partitions', []): # We don't want to re-add an existing partition (those containing a UUID already) if partition.get('wipe', False) and not partition.get('PARTUUID', None): - print("Adding partition....") + print(_("Adding partition....")) start = partition.get('start') or ( prev_partition and f'{prev_partition["device_instance"].end_sectors}s' or DEFAULT_PARTITION_START) partition['device_instance'] = self.add_partition(partition.get('type', 'primary'), @@ -94,7 +94,7 @@ class Filesystem: # print('Device instance:', partition['device_instance']) elif (partition_uuid := partition.get('PARTUUID')) and (partition_instance := self.blockdevice.get_partition(uuid=partition_uuid)): - print("Re-using partition_instance:", partition_instance) + print(_("Re-using partition instance: {}").format(partition_instance)) partition['device_instance'] = partition_instance else: raise ValueError(f"{self}.load_layout() doesn't know how to continue without a new partition definition or a UUID ({partition.get('PARTUUID')}) on the device ({self.blockdevice.get_partition(uuid=partition.get('PARTUUID'))}).") @@ -113,7 +113,9 @@ class Filesystem: raise ValueError(f"Missing encryption password for {partition['device_instance']}") from ..user_interaction import get_password - storage['arguments']['!encryption-password'] = get_password(f"Enter a encryption password for {partition['device_instance']}") + + prompt = str(_('Enter a encryption password for {}').format(partition['device_instance'])) + storage['arguments']['!encryption-password'] = get_password(prompt) partition['!password'] = storage['arguments']['!encryption-password'] @@ -136,7 +138,7 @@ class Filesystem: while True: partition['filesystem']['format'] = input(f"Enter a valid fs-type for newly encrypted partition {partition['filesystem']['format']}: ").strip() if not partition['filesystem']['format'] or valid_fs_type(partition['filesystem']['format']) is False: - print("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's.") + print(_("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's.")) continue break diff --git a/archinstall/lib/disk/user_guides.py b/archinstall/lib/disk/user_guides.py index 8acb8cd2..90d323c7 100644 --- a/archinstall/lib/disk/user_guides.py +++ b/archinstall/lib/disk/user_guides.py @@ -11,6 +11,7 @@ from ..hardware import has_uefi from ..output import log from ..menu import Menu + def suggest_single_disk_layout(block_device :BlockDevice, default_filesystem :Optional[str] = None, advanced_options :bool = False) -> Dict[str, Any]: |