Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk
diff options
context:
space:
mode:
authorDaniel <blackrabbit256@gmail.com>2022-02-06 21:30:26 +1100
committerGitHub <noreply@github.com>2022-02-06 11:30:26 +0100
commit9fb8d3164ce07e6cd08fe60f2e6f1203ccb8991a (patch)
tree8e525e9d65ab48da74602bec20e68e5cae51d754 /archinstall/lib/disk
parentec73bdab4cf124aba16e10293e5e75a3bc89afb8 (diff)
Update nationalization (#944)
* Update nationalization * Update translations * Finish german translation * Fix errors #943 * Add remaining translations * Fix alignment in menu * Update README * Update translations: * Fix flake8 * Update tz function Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Diffstat (limited to 'archinstall/lib/disk')
-rw-r--r--archinstall/lib/disk/filesystem.py10
-rw-r--r--archinstall/lib/disk/user_guides.py1
2 files changed, 7 insertions, 4 deletions
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]: