Merge remote-tracking branch 'origin/master' into disk-config-submenu

archlinux · Oct 30, 2023 · dc2f4ff · dc2f4ff
2 parents d0d18d3 + 2831c97
commit dc2f4ff
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 93 deletions.
diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py
@@ -38,6 +38,8 @@ def _get_values(
 			raise ValueError('Unsupported formatting call')
 		elif hasattr(o, 'table_data'):
 			return o.table_data()
+		elif hasattr(o, 'json'):
+			return o.json()
 		elif is_dataclass(o):
 			return asdict(o)
 		else:

diff --git a/archinstall/locales/README.md b/archinstall/locales/README.md
@@ -32,6 +32,8 @@ msgstr ""
 The `msgid` is the identifier of the string in the code as well as the default text to be displayed, meaning that if no
 translation is provided for a language then this is the text that is going to be shown.
 
+## Perform translations
+
 To perform translations for a language this file can be edited manually or the neat `poedit` can be used (https://poedit.net/).
 If editing the file manually, write the translation in the `msgstr` part
 

diff --git a/archinstall/locales/zh-CN/LC_MESSAGES/base.mo b/archinstall/locales/zh-CN/LC_MESSAGES/base.mo