Support CJK text alignment (#2012)

* Add functions for unicode string alignment

* use unicode alignment function to show menu

* Allow table content to support unicode text alignment

1 files changed, 2 insertions, 19 deletions

diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py
index f12d2b73..306c500a 100644
--- a/archinstall/lib/menu/abstract_menu.py
+++ b/archinstall/lib/menu/abstract_menu.py
@@ -1,32 +1,15 @@
 from __future__ import annotations
-import unicodedata
 
 from typing import Callable, Any, List, Iterator, Tuple, Optional, Dict, TYPE_CHECKING
 
 from .menu import Menu, MenuSelectionType
 from ..output import error
+from ..output import unicode_ljust
 from ..translationhandler import TranslationHandler, Language
 
 if TYPE_CHECKING:
 	_: Any
 
-def count_cjk_chars(string):
-	"Count the total number of CJK characters contained in a string"
-	return sum(unicodedata.east_asian_width(c) in 'FW' for c in string)
-
-def cjkljust(string, width, fillbyte=' '):
-	"""Support left alignment of Chinese, Japanese, Korean text
-	>>> cjkljust('Hello', 15, '*')
-	'Hello**********'
-	>>> cjkljust('你好', 15, '*')
-	'你好***********'
-	>>> cjkljust('안녕하세요', 15, '*')
-	'안녕하세요*****'
-	>>> cjkljust('こんにちは', 15, '*')
-	'こんにちは*****'
-	"""
-	return string.ljust(width - count_cjk_chars(string), fillbyte)
-
 class Selector:
 	def __init__(
 		self,
@@ -145,7 +128,7 @@ class Selector:
 
 		if current:
 			padding += 5
-			description = cjkljust(str(self._description), padding, ' ')
+			description = unicode_ljust(str(self._description), padding, ' ')
 			current = current
 		else:
 			description = self._description